Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/avifile/PKGBUILD
	community/blackbox/PKGBUILD
	community/blobby2/PKGBUILD
	community/chmsee/PKGBUILD
	community/extrema/PKGBUILD
	community/floyd/PKGBUILD
	community/gnash/PKGBUILD
	community/gq/PKGBUILD
	community/gsql/PKGBUILD
	community/haddock/PKGBUILD
	community/hashcash/PKGBUILD
	community/kvpnc/PKGBUILD
	community/uptimed/PKGBUILD
	community/wol/PKGBUILD
	core/jfsutils/PKGBUILD
	core/reiserfsprogs/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/libcroco/PKGBUILD
	extra/libffado/PKGBUILD
	extra/librsvg/PKGBUILD
	extra/lua/PKGBUILD
	extra/mesa/PKGBUILD
	extra/valgrind/PKGBUILD
	extra/xorg-server/PKGBUILD
	libre/audacious-plugins-libre/PKGBUILD
	libre/texlive-bin-libre/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine_gecko/PKGBUILD

1 files changed, 12 insertions, 13 deletions

diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD
index 8389f3206..94cf43c5c 100644
--- a/extra/proftpd/PKGBUILD
+++ b/extra/proftpd/PKGBUILD
@@ -1,29 +1,30 @@
-# $Id: PKGBUILD 138532 2011-09-27 03:18:03Z eric $
+# $Id: PKGBUILD 142778 2011-11-15 04:26:53Z eric $
 # Maintainer:
-# Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=proftpd
-pkgver=1.3.3f
+pkgver=1.3.4a
 pkgrel=1
+epoch=1
 pkgdesc="A high-performance, scalable FTP server"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.proftpd.org"
 license=('GPL')
 depends=('libldap' 'libmysqlclient' 'postgresql-libs')
 backup=('etc/proftpd.conf' 'etc/conf.d/proftpd')
-source=("ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2"
+source=(ftp://ftp.proftpd.org/distrib/source/${pkgname}-${pkgver}.tar.bz2{,.asc}
         'proftpd' 'proftpd.logrotate' 'proftpd.conf.d')
-md5sums=('e9416d2aa7ac1246af4fc8a80fd73f27'
-         '99f6f9a989e70e3fa50809fc2bbbbb0a'
-         'ddb09eb13131becdf0e081eef413116b'
-         '71d5932b0461c318ed68c2c0c2660736')
+sha1sums=('18ea33d8b9f858b6e735cc81af900f0eebee8d25'
+          '195b06e28e503f5e5ef355c3332884cc5e7954a9'
+          'b7819d725817e55b69c73e2572c21a05db48cc86'
+          '83c38ec40efb7cc09d9824b98e65cd948a195cc6'
+          'f34f60cb4fb1f4af7be7aca427cbad3cad22bbb9')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
-    --mandir=/usr/share/man \
+    --libexecdir=/usr/lib \
     --disable-pam \
     --with-modules=mod_quotatab:mod_quotatab_sql:mod_quotatab_file:mod_tls:mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres \
     --sysconfdir=/etc \
@@ -41,12 +42,10 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   make DESTDIR="${pkgdir}" install
+  sed -i 's|nogroup|nobody|g' "${pkgdir}/etc/proftpd.conf"
+
   install -Dm644 ../proftpd.logrotate "${pkgdir}/etc/logrotate.d/proftpd"
   install -Dm644 ../proftpd.conf.d "${pkgdir}/etc/conf.d/proftpd"
   install -Dm755 ../proftpd "${pkgdir}/etc/rc.d/proftpd"
   install -Dm755 contrib/xferstats.holger-preiss "${pkgdir}/usr/bin/ftpstats"
-
-  cd "${pkgdir}/etc"
-  sed -i 's|nogroup|nobody|g' proftpd.conf
-  rmdir "${pkgdir}/usr/libexec"
 }