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

[Allan McRae]

    Date: Friday, May 31, 2013 @ 03:43:32
  Author: allan
Revision: 186744

upgpkg: net-tools 1.60.20130531git-1

/usr move, new git snapshot that builds...

Modified:
  net-tools/trunk/PKGBUILD

----------+
 PKGBUILD |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 01:35:24 UTC (rev 186743)
+++ PKGBUILD	2013-05-31 01:43:32 UTC (rev 186744)
@@ -3,37 +3,38 @@
 # Contributor: judd <jvinet at 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')
+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)
+sha1sums=('SKIP')
 
-# 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)
-options=(!makeflags)
-sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82'
-          '4191ca56dc01d6aebe26c36c7cc060c638d5ebca')
+prepare() {
+  sed -i "s#/sbin#/bin#" ${srcdir}/${pkgname}/Makefile
+  sed -i "s#/usr##" ${srcdir}/${pkgname}/man/Makefile
+}
+
 build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i -e '/Token/s/y$/n/' config.in
-  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
 }