From 0fc1870f2eadde8cb06004be1cbe8d1a4333aa69 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 16 Aug 2012 00:02:36 +0000
Subject: Thu Aug 16 00:02:36 UTC 2012

---
 core/net-tools/Makefile.patch | 17 +++++++++++++++++
 core/net-tools/PKGBUILD       | 30 +++++++++++++-----------------
 2 files changed, 30 insertions(+), 17 deletions(-)
 create mode 100644 core/net-tools/Makefile.patch

(limited to 'core/net-tools')

diff --git a/core/net-tools/Makefile.patch b/core/net-tools/Makefile.patch
new file mode 100644
index 000000000..aaacd6b78
--- /dev/null
+++ b/core/net-tools/Makefile.patch
@@ -0,0 +1,17 @@
+--- Makefile.old	2012-08-07 22:07:58.235437087 +0200
++++ Makefile	2012-08-07 22:10:21.192104345 +0200
+@@ -239,12 +239,12 @@
+ 	install -m 0755 -d ${BASEDIR}/bin
+ 	install -m 0755 arp        ${BASEDIR}/sbin
+ 	install -m 0755 hostname   ${BASEDIR}/bin
+-	install -m 0755 ifconfig   ${BASEDIR}/bin
++	install -m 0755 ifconfig   ${BASEDIR}/sbin
+ 	install -m 0755 nameif     ${BASEDIR}/sbin
+ 	install -m 0755 netstat    ${BASEDIR}/bin
+ 	install -m 0755 plipconfig $(BASEDIR)/sbin
+ 	install -m 0755 rarp       ${BASEDIR}/sbin
+-	install -m 0755 route      ${BASEDIR}/bin
++	install -m 0755 route      ${BASEDIR}/sbin
+ 	install -m 0755 slattach   $(BASEDIR)/sbin
+ ifeq ($(HAVE_IP_TOOLS),1)
+ 	install -m 0755 ipmaddr    $(BASEDIR)/sbin
diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 605620a09..3bd848408 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,37 +1,33 @@
-# $Id: PKGBUILD 142384 2011-11-08 22:05:28Z ronald $
+# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=net-tools
-pkgver=1.60.20110819cvs
-pkgrel=3
+pkgver=1.60.20120804git
+pkgrel=2
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64)
 license=('GPL2')
-url="http://www.tazenda.demon.co.uk/phil/net-tools"
+url="http://net-tools.sourceforge.net/"
 depends=('glibc')
 
 # http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use cvs checkout instead
-source=(ftp://ftp.archlinux.org/other/net-tools/net-tools-1.60.20110819cvs.tar.bz2
-  net-tools-1.60-miiioctl.patch
-  net-tools-1.60-nameif_strncpy.patch)
+# use git checkout instead
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
+	Makefile.patch)
 options=(!makeflags)
 install=net-tools.install
-sha1sums=('02946449191ff279f9f0f7fd7bc65ae21059a2bf'
-          '654a96bc6575efb4a2e04b49de45d448d240eb6e'
-          '7888000d8fe867e58b5b00fe2bcf6c3041d716b4')
-
+sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
+          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools-1.60-miiioctl.patch
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 -i ${srcdir}/Makefile.patch
   yes "" | make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make BASEDIR=$pkgdir update
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make BASEDIR=${pkgdir} update
 
   # the following is provided by yp-tools
   rm "${pkgdir}"/bin/{nis,yp}domainname
-- 
cgit v1.2.3-54-g00ecf