[arch-commits] Commit in bind/trunk (01-remove-tools.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Thursday, May 30, 2013 @ 19:40:43
  Author: seblu
Revision: 91984

upgpkg: bind 9.9.3-1

Modified:
  bind/trunk/PKGBUILD
Deleted:
  bind/trunk/01-remove-tools.patch

-----------------------+
 01-remove-tools.patch |   12 ------------
 PKGBUILD              |   15 +++++++--------
 2 files changed, 7 insertions(+), 20 deletions(-)

Deleted: 01-remove-tools.patch
===================================================================
--- 01-remove-tools.patch	2013-05-30 17:40:11 UTC (rev 91983)
+++ 01-remove-tools.patch	2013-05-30 17:40:43 UTC (rev 91984)
@@ -1,12 +0,0 @@
-diff -aur old/bin/Makefile.in new/bin/Makefile.in
---- old/bin/Makefile.in	2009-10-05 05:07:08.000000000 -0700
-+++ new/bin/Makefile.in	2011-08-28 19:14:17.025674400 -0700
-@@ -19,7 +19,7 @@
- VPATH =		@srcdir@
- top_srcdir =	@top_srcdir@
- 
--SUBDIRS =	named rndc dig dnssec tests tools nsupdate \
-+SUBDIRS =	named rndc dnssec tests tools nsupdate \
- 		check confgen @PYTHON_TOOLS@ @PKCS11_TOOLS@
- TARGETS =
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-30 17:40:11 UTC (rev 91983)
+++ PKGBUILD	2013-05-30 17:40:43 UTC (rev 91984)
@@ -5,9 +5,9 @@
 # Contributor: Mario Vazquez <mario_vazq at hotmail.com>
 
 pkgname=bind
-_pkgver=9.9.2-P2
+_pkgver=9.9.3
 pkgver=${_pkgver//-/.}
-pkgrel=3
+pkgrel=1
 pkgdesc='The ISC BIND nameserver'
 url='http://www.isc.org/software/bind/'
 license=('custom:ISC')
@@ -25,20 +25,19 @@
         'named.service'
         'named.logrotate'
         'localhost.zone'
-        '127.0.0.zone'
-        '01-remove-tools.patch')
-sha1sums=('3aadeaf64164a31a1cf22737ff2eea706792b68d'
+        '127.0.0.zone')
+sha1sums=('0d770a68ccdb98db7930951cf380d5c7ed9b5b67'
           '029f89c49550c40ec7a95116b6a33f0e5a041094'
           'c5a2bcd9b0f009ae71f3a03fbdbe012196962a11'
           'c71a7fc02d4bf0d55e8e29d1e014607ac1d58726'
           'cb2e81b4cbf9efafb3e81e3752f0154e779cc7ec'
           '3fe1f0b5c1a51dc1db9ebe5e173d18c52c97169b'
           '76a0d4cd1b913db177a5a375bebc47e5956866ec'
-          '53be0f1437ebe595240d8dbdd819939582b97fb9'
-          '14264affa71bcfe7703d0fb7c3556c4c47efaa8b')
+          '53be0f1437ebe595240d8dbdd819939582b97fb9')
 
 prepare() {
-  patch -p1 -d bind-$_pkgver < 01-remove-tools.patch
+  # remove dig to avoid conflict with dnsutils
+  sed -i 's/dig//' $pkgname-$_pkgver/bin/Makefile.in
 }
 
 build() {