[arch-commits] Commit in dhclient/trunk (PKGBUILD site.conf)

[daniel at archlinux.org]

    Date: Sunday, July 19, 2009 @ 14:06:58
  Author: daniel
Revision: 46695

configuration for paths

Added:
  dhclient/trunk/site.conf
Modified:
  dhclient/trunk/PKGBUILD

-----------+
 PKGBUILD  |   33 +++++++++++++++------------------
 site.conf |   12 ++++++++++++
 2 files changed, 27 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-07-19 18:06:50 UTC (rev 46694)
+++ PKGBUILD	2009-07-19 18:06:58 UTC (rev 46695)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Mirko Messer <mirk at chao.ch>
 pkgname=dhclient 
-pkgver=3.0.6
-pkgrel=2
+pkgver=3.1.2p1
+pkgrel=1
 pkgdesc="dhclient is standalone client from the dhcp package"
 arch=(i686 x86_64)
 url="http://www.isc.org/index.pl?/sw/dhcp/"
@@ -11,30 +11,27 @@
 depends=('bash')
 options=('!makeflags')
 source=(ftp://ftp.isc.org/isc/dhcp/dhcp-${pkgver}.tar.gz \
-	arch-nm.patch
-	fix-broken-resolvconf.patch
-	fix-mac80211-wireless.patch)
-md5sums=('724bad21ad8b638abadd5fcc07df1a0f'
-         'c3ad862567cb63ae6589a0754aa685b3'
-         '115ce66ffe0acda2042905612a2680a7'
-         'c64dfcbb0f0f1a3328ec6a907c0239eb')
-                           
+	site.conf)
+md5sums=('787b2924a1965f0d8558521b36dca73d'
+         '2e6a845b18bcd188caeead3e47e91151')
 
 build() {
   cd ${startdir}/src/dhcp-${pkgver}
-  patch -Np1 -i ${startdir}/src/arch-nm.patch || return 1
-  patch -Np1 -i ${startdir}/src/fix-broken-resolvconf.patch || return 1
-  patch -Np1 -i ${startdir}/src/fix-mac80211-wireless.patch || return 1
+
+  cp ${srcdir}/site.conf .
   ./configure
-  cd work*/minires && make || return 1
-  cd ../dst && make || return 1
-  cd ../omapip && make || return 1
-  cd ../common && make || return 1
-  cd ../client
+
+  #only building dhclient, no server
+  sed -i -e 's/\(server\|relay\|dhcpctl\)/ /g' work.*/Makefile
+
+  make || return 1
   make DESTDIR=${startdir}/pkg install
   mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
   install -m644 ${startdir}/src/dhcp-${pkgver}/LICENSE \
                 ${startdir}/pkg/usr/share/licenses/${pkgname}/
 
   install -m755 -d ${startdir}/pkg/var/lib/dhclient
+
+  #not needed after fresh install
+  rm -f ${pkgdir}/var/lib/dhclient/dhcpd.leases
 }

Added: site.conf
===================================================================
--- site.conf	                        (rev 0)
+++ site.conf	2009-07-19 18:06:58 UTC (rev 46695)
@@ -0,0 +1,12 @@
+LIBDIR = /usr/lib
+INCDIR = /usr/include
+VARDB = /var/lib/dhclient
+ADMMANDIR = /usr/share/man/man8
+ADMMANEXT = .8
+FFMANDIR = /usr/share/man/man5
+FFMANEXT = .5
+LIBMANDIR = /usr/share/man/man3
+LIBMANEXT = .3
+USRMANDIR = /usr/share/man/man1
+USRMANEXT = .1
+MANCAT = man