[arch-commits] Commit in dhcp/trunk (PKGBUILD)

[Allan McRae]

    Date: Friday, May 31, 2013 @ 05:28:04
  Author: allan
Revision: 186751

upgpkg: dhcp 4.2.5.p1-1

upstream update, /usr move

Modified:
  dhcp/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 03:07:32 UTC (rev 186750)
+++ PKGBUILD	2013-05-31 03:28:04 UTC (rev 186751)
@@ -5,8 +5,8 @@
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.5
-_pkgver=4.2.5
+pkgver=4.2.5.p1
+_pkgver=4.2.5-P1
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:isc-dhcp')
@@ -16,8 +16,8 @@
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
         dhcp-4.2.5-client_script-1.patch
         dhcp-4.2.5-missing_ipv6-1.patch)
-md5sums=('6489e919ac093d17249270ee9be1020e'
-         '022bc7038b3061cfb31da4736e7ab8a8'
+md5sums=('f68e3c1f00a9af5742bc5e71d567cf93'
+         'SKIP'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
@@ -26,7 +26,8 @@
          '9e4dcf90beec15bfcb6631809cdcc780'
          'da655f02f1cf4d95b4708e84e69edbc8')
 
-build() {
+
+prepare() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"
 
   # Define _GNU_SOURCE to fix IPV6.
@@ -36,8 +37,11 @@
   patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
   # Make dhcp client script suck less.
   patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
+}
 
-  ./configure --prefix=/usr --sysconfdir=/etc \
+build() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}"
+  ./configure --prefix=/usr --sbindir=/usr/bin --sysconfdir=/etc \
       --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
       --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \
       --with-cli-lease-file=/var/lib/dhclient/dhclient.leases \
@@ -86,7 +90,7 @@
   install -d "${pkgdir}/var/lib/dhclient"
 
   # install dhclient linux script
-  install -m755 -D client/scripts/linux "${pkgdir}/sbin/dhclient-script"
+  install -m755 client/scripts/linux "${pkgdir}/usr/bin/dhclient-script"
 
   # install license
   install -m644 -D LICENSE "${pkgdir}/usr/share/licenses/dhclient/LICENSE"