Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/solfege/PKGBUILD
	core/udev/PKGBUILD
	testing/moc/PKGBUILD
	testing/mod_perl/PKGBUILD
	testing/pidgin/PKGBUILD

1 files changed, 18 insertions, 15 deletions

diff --git a/core/net-tools/PKGBUILD b/core/net-tools/PKGBUILD
index 366c710b2..9cec6c2be 100644
--- a/core/net-tools/PKGBUILD
+++ b/core/net-tools/PKGBUILD
@@ -1,18 +1,16 @@
-# $Id: PKGBUILD 38718 2009-05-10 07:37:29Z tpowa $
+# $Id: PKGBUILD 126212 2011-06-02 16:50:35Z bisson $
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=net-tools
 pkgver=1.60
-pkgrel=14
+pkgrel=16
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64 'mips64el')
 license=('GPL')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
-groups=('base')
 depends=('glibc')
-backup=('etc/conf.d/nisdomainname')
 source=(http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2
   net-tools.patch gcc340.patch net-tools-1.60-2.6-compilefix.patch
-  net-tools-1.60-miiioctl.patch nisdomainname.conf.d
+  net-tools-1.60-miiioctl.patch
   net-tools-1.60-nameif.patch
   net-tools-1.60-nameif_strncpy.patch)
 options=(!makeflags)
@@ -21,20 +19,25 @@ md5sums=('888774accab40217dde927e21979c165'
          'b52d899cba9956bb0055150506f41ac1' 
 	 '51de6eabe2d6d6dc860f72c41cee636b'
          'c16109863bc63f3dad4ef35305a340bb' 
-	 'af3eef5d4837939f7858eec692aa4671'
          '29a32617382fab1735acba4d920f1fcd' 
 	 'e66466b9304dac85eb42b32f1ec3b284')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np1 -i ../net-tools.patch || return 1
-  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch || return 1
-  patch -Np1 -i ../net-tools-1.60-miiioctl.patch || return 1
-  patch -Np1 -i ../gcc340.patch || return 1
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch || return 1
-  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch || return 1
-  yes "" | make || return 1
+  patch -Np1 -i ../net-tools.patch
+  patch -Np1 -i ../net-tools-1.60-2.6-compilefix.patch
+  patch -Np1 -i ../net-tools-1.60-miiioctl.patch
+  patch -Np1 -i ../gcc340.patch
+  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif.patch
+  patch -Np1 -i ${srcdir}/net-tools-1.60-nameif_strncpy.patch
+  yes "" | make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make BASEDIR=$pkgdir update
-  install -D -m644 ../nisdomainname.conf.d \
-    $pkgdir/etc/conf.d/nisdomainname
+
+  # the following is provided by yp-tools and coreutils
+  rm "${pkgdir}"/bin/{{,dns,nis,yp}domainname,hostname}
+  rm "${pkgdir}"/usr/share/man/man1/{{,dns,nis,yp}domainname,hostname}.1
 }