Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/fdm/PKGBUILD
	community/milkytracker/PKGBUILD
	community/tinyxml/PKGBUILD
	extra/llvm/PKGBUILD

3 files changed, 19 insertions, 69 deletions

diff --git a/community/fdm/GNUmakefile.patch b/community/fdm/GNUmakefile.patch
deleted file mode 100644
index 8320b9af5..000000000
--- a/community/fdm/GNUmakefile.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- fdm-1,6/GNUmakefile	2008-12-22 21:50:05.000000000 +0530
-+++ fdm-1.6/GNUmakefile	2009-05-09 19:07:21.000000000 +0530
-@@ -8,10 +8,7 @@
- 
- #DEBUG= 1
- 
--PREFIX?= /usr/local
--
--BIN_OWNER= bin
--BIN_GROUP= root
-+PREFIX?= /usr
- 
- CC= gcc
- 
-@@ -27,8 +24,8 @@
- endif
- 
- INSTALLDIR= install -d
--INSTALLBIN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 555
--INSTALLMAN= install -g $(BIN_OWNER) -o $(BIN_GROUP) -m 444
-+INSTALLBIN= install -m 0755
-+INSTALLMAN= install -m 0644
- 
- SRCS= fdm.c \
-       attach.c buffer.c cleanup.c command.c connect.c io.c log.c netrc.c \
-@@ -72,7 +69,7 @@
- endif
- 
- OBJS= $(patsubst %.c,%.o,$(SRCS))
--CPPFLAGS+= $(DEFS) -I. -I- $(INCDIRS)
-+CPPFLAGS+= $(DEFS) -I. -iquote. $(INCDIRS)
- ifdef DEBUG
- CFLAGS+= -g -ggdb -DDEBUG
- LDFLAGS+= -rdynamic
-@@ -115,10 +112,10 @@
- install:
- 	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/bin
- 	$(INSTALLBIN) $(PROG) $(DESTDIR)$(PREFIX)/bin/$(PROG)
--	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man1
--	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/man/man1/$(PROG).1
--	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/man/man5
--	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/man/man5/$(PROG).conf.5
-+	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man1
-+	$(INSTALLMAN) $(PROG).1 $(DESTDIR)$(PREFIX)/share/man/man1/$(PROG).1
-+	$(INSTALLDIR) $(DESTDIR)$(PREFIX)/share/man/man5
-+	$(INSTALLMAN) $(PROG).conf.5 $(DESTDIR)$(PREFIX)/share/man/man5/$(PROG).conf.5
- 
- clean:
- 	rm -f $(CLEANFILES)
diff --git a/community/fdm/PKGBUILD b/community/fdm/PKGBUILD
index ebe0fa4bb..c02b55953 100644
--- a/community/fdm/PKGBUILD
+++ b/community/fdm/PKGBUILD
@@ -1,34 +1,35 @@
-# $Id: PKGBUILD 55396 2011-09-11 20:59:09Z bisson $
+# $Id: PKGBUILD 88671 2013-04-21 20:30:45Z jlichtblau $
+# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Grigorios Bouzakis <grbzks@gmail.com>
 
 pkgname=fdm
-pkgver=1.6
-pkgrel=3.2
+pkgver=1.7
+pkgrel=1
 pkgdesc='Program to fetch and deliver mail'
+arch=('i686' 'x86_64' 'mips64el')
 url='http://fdm.sourceforge.net/'
 license=('BSD')
-arch=('i686' 'x86_64' 'mips64el')
-options=('!makeflags')
 depends=('openssl' 'tdb' 'zlib')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz"
-	'GNUmakefile.patch')
-sha1sums=('fb8042f2355062848ff142c9604069b6657e6a82'
-          '0bddf0b0403ccee62190355f43fae84932c37436')
+makedepends=('patch' 'sed')
+options=('!makeflags')
+source=(http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.gz)
+sha256sums=('484474094f124ce438c89dfab05519fe7b3aa8c8346d00f790a512ab950cef2a')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../GNUmakefile.patch
-        sed -i 's/LIBS+= -lssl -ltdb -lz/LIBS+= -lssl -lcrypto -ltdb -lz/' GNUmakefile
-	make
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  ./configure
+  make PREFIX=/usr MANDIR=/usr/share/man
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd ${srcdir}/${pkgname}-${pkgver}
+  
+  make DESTDIR=${pkgdir} PREFIX=/usr MANDIR=/usr/share/man install
 
-	install -d "${pkgdir}"/usr/share/{doc,licenses}/"${pkgname}"
-	sed '3,17p;d' fdm.c > "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	mv examples "${pkgdir}/usr/share/doc/${pkgname}"
+  install -d ${pkgdir}/usr/share/{doc,licenses}/${pkgname}
+  sed '3,17p;d' fdm.c > ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  mv examples ${pkgdir}/usr/share/doc/${pkgname}
 }
diff --git a/community/fdm/fdm.conf b/community/fdm/fdm.conf
deleted file mode 100644
index ad58f3606..000000000
--- a/community/fdm/fdm.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default system-wide configuration file for fdm.
-# You probably want to make a ~/.fdm.conf, and not edit this file.