[arch-commits] Commit in bftpd/repos (3 files)

[Thomas Bächler]

    Date: Saturday, December 13, 2008 @ 04:41:50
  Author: thomas
Revision: 21438

Merged revisions 356,21436 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/bftpd/trunk

........
  r356 | aaron | 2008-04-19 00:56:27 +0200 (Sa, 19 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r21436 | thomas | 2008-12-13 10:40:39 +0100 (Sa, 13 Dez 2008) | 1 line
  
  upgpkg: bftpd 2.3-1
........

Added:
  bftpd/repos/extra-i686/bftpd.install
    (from rev 21436, bftpd/trunk/bftpd.install)
Modified:
  bftpd/repos/extra-i686/	(properties)
  bftpd/repos/extra-i686/PKGBUILD

---------------+
 PKGBUILD      |   27 +++++++++++++++------------
 bftpd.install |   10 ++++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)


Property changes on: bftpd/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /bftpd/trunk:1
   + /bftpd/trunk:1-21437

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-13 09:41:07 UTC (rev 21437)
+++ extra-i686/PKGBUILD	2008-12-13 09:41:50 UTC (rev 21438)
@@ -2,33 +2,36 @@
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 
 pkgname=bftpd
-pkgver=2.1
+pkgver=2.3
 pkgrel=1
 pkgdesc="A very configurable (and secure) Linux FTP server"
 arch=(i686 x86_64)
 url="http://bftpd.sourceforge.net/"
 license=('GPL')
 depends=('glibc' 'pam')
+install=bftpd.install
 backup=(etc/bftpd.conf etc/logrotate.d/bftpd etc/pam.d/bftpd var/log/bftpd.log)
 source=(http://downloads.sourceforge.net/sourceforge/bftpd/bftpd-$pkgver.tar.gz
         bftpd.rc bftpd.logrotate bftpd.pam)
-md5sums=('8f53ff650be1a10aa03ce5c4789c31bb'
+md5sums=('4ab1eb33135fa5eaaf050e6d3dd0b319'
          '56a1bf7738a6db2b2cff89e611f4f11a'
          '853680dad0df39d0b4d2fb43d4be430a'
          '96f82c38f3f540b53f3e5144900acf17')
 
 build() {
-  cd $startdir/src/$pkgname
+  cd ${srcdir}/$pkgname
   # install fixes
   sed -i -e 's| /var| $(DESTDIR)/var|g' Makefile.in
-  ./configure --prefix=/usr --enable-pam
+  ./configure --prefix=/usr --enable-pam --mandir=/usr/share/man
   make || return 1
-  install -d -m755 $startdir/pkg/usr/{sbin,man/man8}
-  install -d -m755 $startdir/pkg/var/run/bftpd
-  install -d -m755 $startdir/pkg/var/log
-  install -D -m644 $startdir/src/bftpd.logrotate $startdir/pkg/etc/logrotate.d/bftpd || return 1
-  install -D -m755 $startdir/src/bftpd.rc $startdir/pkg/etc/rc.d/bftpd || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  mkdir -p $startdir/pkg/etc/pam.d
-  cp $startdir/src/bftpd.pam $startdir/pkg/etc/pam.d/bftpd || return 1
+  install -d -m755 ${pkgdir}/usr/{sbin,share/man/man8}
+  install -d -m755 ${pkgdir}/var/run/bftpd
+  install -d -m755 ${pkgdir}/var/log
+  install -D -m644 ${srcdir}/bftpd.logrotate ${pkgdir}/etc/logrotate.d/bftpd || return 1
+  install -D -m755 ${srcdir}/bftpd.rc ${pkgdir}/etc/rc.d/bftpd || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  rm -f ${pkgdir}/var/log/bftpd.log
+  rmdir ${pkgdir}/var/log
+  mkdir -p ${pkgdir}/etc/pam.d
+  cp ${srcdir}/bftpd.pam ${pkgdir}/etc/pam.d/bftpd || return 1
 }

Copied: bftpd/repos/extra-i686/bftpd.install (from rev 21436, bftpd/trunk/bftpd.install)
===================================================================
--- extra-i686/bftpd.install	                        (rev 0)
+++ extra-i686/bftpd.install	2008-12-13 09:41:50 UTC (rev 21438)
@@ -0,0 +1,10 @@
+# arg 1:  the new package version
+# arg 2:  the old package version
+
+post_install () {
+  [ ! -f /var/log/bftpd.log ] && touch /var/log/bftpd.log
+}
+
+post_upgrade() {
+  post_install $1
+}