Tue Jun 4 00:27:56 PDT 2013

2 files changed, 19 insertions, 30 deletions

diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 3bd848408..dc1a16197 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,39 +1,40 @@
-# $Id: PKGBUILD 165285 2012-08-14 20:44:40Z ronald $
+# $Id: PKGBUILD 187035 2013-06-03 11:15:26Z allan $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=net-tools
-pkgver=1.60.20120804git
-pkgrel=2
+pkgver=1.60.20130531git
+pkgrel=1
 pkgdesc="Configuration tools for Linux networking"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://net-tools.sourceforge.net/"
 depends=('glibc')
-
-# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
-# use git checkout instead
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	Makefile.patch)
+makedepends=('git')
+# use git snapshot currently prefered over release
+source=("net-tools::git://git.code.sf.net/p/net-tools/code#commit=6a14c03f")
 options=(!makeflags)
-install=net-tools.install
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
-          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
+sha1sums=('SKIP')
+
+prepare() {
+  sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile
+  sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np0 -i ${srcdir}/Makefile.patch
+  cd ${srcdir}/${pkgname}
   yes "" | make
 }
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make BASEDIR=${pkgdir} update
+  cd ${srcdir}/${pkgname}
+  make DESTDIR=${pkgdir}/usr update
 
   # the following is provided by yp-tools
-  rm "${pkgdir}"/bin/{nis,yp}domainname
+  rm "${pkgdir}"/usr/bin/{nis,yp}domainname
   rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1
 
   # hostname is provided by inetutils
-  rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname}
+  rm "${pkgdir}"/usr/bin/{hostname,dnsdomainname,domainname}
   rm -rf "${pkgdir}"/usr/share/man/man1
 }
diff --git a/core/net-tools/net-tools.install b/core/net-tools/net-tools.install
deleted file mode 100644
index 9eee9e51b..000000000
--- a/core/net-tools/net-tools.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then
-    echo "hostname and {,yp,nis}domainname has moved:"
-    echo "----------"
-    echo "hostname is now in coreutils"
-    echo "domainname is now in yp-tools"
-    echo "their functionality might have changed slightly"
-    echo ""
-    echo "dnsdomainname remains in net-tools"
-    echo "----------"
-  fi
-}