[arch-commits] Commit in dhcp/repos (extra-x86_64 extra-x86_64/PKGBUILD)

[Eric Belanger]

    Date: Sunday, August 10, 2008 @ 22:04:40
  Author: eric
Revision: 8421

Merged revisions 2-8420 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/dhcp/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r8235 | kevin | 2008-08-09 13:55:49 -0400 (Sat, 09 Aug 2008) | 1 line
  
  upgpkg: dhcp 3.1.1-1
........
  r8420 | eric | 2008-08-10 22:04:26 -0400 (Sun, 10 Aug 2008) | 2 lines
  
  upgpkg: dhcp 3.1.1-1
      FHS man pages
........

Modified:
  dhcp/repos/extra-x86_64/	(properties)
  dhcp/repos/extra-x86_64/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)


Property changes on: dhcp/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dhcp/trunk:1
   + /dhcp/trunk:1-8420

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-11 02:04:26 UTC (rev 8420)
+++ extra-x86_64/PKGBUILD	2008-08-11 02:04:40 UTC (rev 8421)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=dhcp
-pkgver=3.1.0
+pkgver=3.1.1
 pkgrel=1
 pkgdesc="A DHCP server, client, and relay agent"
 arch=(i686 x86_64)
@@ -10,30 +10,31 @@
 depends=('glibc')
 backup=('etc/dhcpd.conf' 'etc/dhclient.conf')
 install=dhcp.install
-source=(ftp://ftp.isc.org/isc/dhcp/dhcp-$pkgver.tar.gz dhcp-3.0.3-tr.c.patch \
+source=(http://ftp.isc.org/isc/dhcp/dhcp-$pkgver.tar.gz dhcp-3.0.3-tr.c.patch \
         dhcpd)
-md5sums=('27d179a3c3fbef576566b456a1168246'
-         '39866416303b674df08b66b2d094e523'
-	 '025b8fe98b6c0814428b671b1819a810')
+md5sums=('fcc19330a9c3a0efb5620409214652a9' '39866416303b674df08b66b2d094e523'\
+         '025b8fe98b6c0814428b671b1819a810')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
   patch -p1 -i ../dhcp-3.0.3-tr.c.patch || return 1
   ./configure
   make || return 1
-  make DESTDIR=$startdir/pkg INCDIR=/usr/include LIBDIR=/usr/lib install
+  make DESTDIR=$startdir/pkg INCDIR=/usr/include LIBDIR=/usr/lib \
+    USRMANDIR=/usr/share/man/man1 LIBMANDIR=/usr/share/man/man3 \
+    FFMANDIR=/usr/share/man/man5 ADMMANDIR=/usr/share/man/man8 install
   install -D -m644 server/dhcpd.conf $startdir/pkg/etc/dhcpd.conf
   #install -D -m644 client/dhclient.conf $startdir/pkg/etc/dhclient.conf
   install -D -m755 ../dhcpd $startdir/pkg/etc/rc.d/dhcpd
   touch $startdir/pkg/var/state/dhcp/dhcpd.leases
-  chmod -R 644 $startdir/pkg/usr/man/*
-  chmod 755 $startdir/pkg/usr/man/man{1,3,5,8}
+  chmod -R 644 $startdir/pkg/usr/share/man/*
+  chmod 755 $startdir/pkg/usr/share/man/man{1,3,5,8}
   #sed -i 's|etc/dhclient-script|sbin/dhclient-script|g' \
   #$startdir/pkg/etc/dhclient.conf
   rm -f $startdir/pkg/var/state/dhcp/dhcpd.leases
   rm -f ${startdir}/pkg/sbin/{dhclient,dhclient-script}
-  rm -f ${startdir}/pkg/usr/man/man{5,8}/dhclient*
+  rm -f ${startdir}/pkg/usr/share/man/man{5,8}/dhclient*
   # install licenses
   install -m644 -D $startdir/src/$pkgname-$pkgver/LICENSE \
-                     $startdir/pkg/usr/share/licenses/dhcp/LICENSE
+                   $startdir/pkg/usr/share/licenses/dhcp/LICENSE
 }