[arch-commits] Commit in net-tools/trunk (PKGBUILD nisdomainname.conf.d)

[Gaetan Bisson]

    Date: Thursday, June 2, 2011 @ 10:36:53
  Author: bisson
Revision: 126196

move domainname to yp-tools, move hostname to coreutils, remove conf.d/nisdomainname (deprecated in initscripts)

Modified:
  net-tools/trunk/PKGBUILD
Deleted:
  net-tools/trunk/nisdomainname.conf.d

----------------------+
 PKGBUILD             |   29 ++++++++++++++++-------------
 nisdomainname.conf.d |    3 ---
 2 files changed, 16 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-02 14:34:54 UTC (rev 126195)
+++ PKGBUILD	2011-06-02 14:36:53 UTC (rev 126196)
@@ -2,16 +2,15 @@
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=net-tools
 pkgver=1.60
-pkgrel=14
+pkgrel=15
 pkgdesc="Configuration tools for Linux networking"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.tazenda.demon.co.uk/phil/net-tools"
 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)
@@ -20,20 +19,24 @@
          '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}
 }

Deleted: nisdomainname.conf.d
===================================================================
--- nisdomainname.conf.d	2011-06-02 14:34:54 UTC (rev 126195)
+++ nisdomainname.conf.d	2011-06-02 14:36:53 UTC (rev 126196)
@@ -1,3 +0,0 @@
-# Set your NIS domain name here
-NISDOMAINNAME=""
-