[arch-commits] Commit in dhcpcd/repos/testing-x86_64 (PKGBUILD)

[Ronald van Haren]

    Date: Wednesday, January 27, 2010 @ 17:19:27
  Author: ronald
Revision: 65329

fix svn merge error

Modified:
  dhcpcd/repos/testing-x86_64/PKGBUILD

----------+
 PKGBUILD |   21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-27 22:13:26 UTC (rev 65328)
+++ PKGBUILD	2010-01-27 22:19:27 UTC (rev 65329)
@@ -4,8 +4,8 @@
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.1.4
-pkgrel=2
+pkgver=5.1.5git20100127
+pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/dhcpcd/"
 arch=('i686' 'x86_64')
@@ -14,18 +14,15 @@
 depends=('glibc' 'sh')
 backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
-source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
-        'dhcpcd.conf.d' 'fs17838.patch')
-md5sums=('d18afc66efbea9a28e541e9b10fd284f'
-         '372d33485556982b64a97f301e17c5dd'
-         'bc07eb80a90972f70fc37131aabc56a3')
+#"http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
+source=(http://dev.archlinux.org/~ronald/source/$pkgname-$pkgver.tar.bz2
+        'dhcpcd.conf.d')
+md5sums=('25a587e64f3cbbbfe820fa9a9db99311'
+         '372d33485556982b64a97f301e17c5dd')
 
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}
 
-  # fix FS#17838
-  patch -Np1 -i ${srcdir}/fs17838.patch || return 1
-
   # configure variables
   ./configure --libexecdir=/usr/lib/dhcpcd --dbdir=/var/lib/dhcpcd
 
@@ -42,7 +39,7 @@
 
   # Install License
   install -d $pkgdir/usr/share/licenses/$pkgname || return 1
-  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}-${pkgver}/configure.h \
+  awk '{if(FNR<27)print $0}' ${srcdir}/${pkgname}/configure.h \
 	>> ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE || return 1
 
   # Set Options in /etc/dhcpcd.conf