[src/trunk]: src/external/bsd/bind rebuild if the version file changes, so bi...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f7b29df7701
branches:  trunk
changeset: 348670:1f7b29df7701
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Nov 01 21:56:11 2016 +0000

description:
rebuild if the version file changes, so binaries report the right version.

diffstat:

 external/bsd/bind/Makefile.inc            |  5 +++--
 external/bsd/bind/bin/delv/Makefile       |  4 +++-
 external/bsd/bind/bin/dig/Makefile        |  4 +++-
 external/bsd/bind/bin/dnssec/Makefile.inc |  3 ++-
 external/bsd/bind/bin/host/Makefile       |  4 +++-
 external/bsd/bind/bin/named/Makefile      |  4 +++-
 external/bsd/bind/bin/nslookup/Makefile   |  4 +++-
 external/bsd/bind/bin/nsupdate/Makefile   |  4 +++-
 external/bsd/bind/bin/rndc/Makefile       |  3 ++-
 external/bsd/bind/bin/tools/Makefile.inc  |  3 ++-
 external/bsd/bind/lib/libbind9/Makefile   |  4 +++-
 11 files changed, 30 insertions(+), 12 deletions(-)

diffs (187 lines):

diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/Makefile.inc    Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.23 2016/06/29 17:52:28 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.24 2016/11/01 21:56:11 christos Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -29,7 +29,8 @@
 BIND_SRCDIR=   ${NETBSDSRCDIR}/external/bsd/bind
 BIND_HTMLDIR=  /usr/share/doc/reference/ref8/bind9
 
-.include "${IDIST}/version"
+VERSIONFILE=${IDIST}/version
+.include "${VERSIONFILE}"
 
 VERSION=${MAJORVER}.${MINORVER}.${PATCHVER}${RELEASETYPE}${RELEASEVER}
 SYSCONFDIR=/etc
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/delv/Makefile
--- a/external/bsd/bind/bin/delv/Makefile       Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/delv/Makefile       Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2014/07/08 19:08:43 martin Exp $
+#      $NetBSD: Makefile,v 1.3 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -12,6 +12,8 @@
 CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include
 LDADD+=    -lirs -lisccfg
 
+delv.o: ${VERSIONFILE}
+
 .PATH: ${DIST}
 
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/dig/Makefile
--- a/external/bsd/bind/bin/dig/Makefile        Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/dig/Makefile        Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:05 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,8 @@
 DIST=${IDIST}/bin/dig
 CPPFLAGS+= -I${DIST}/include
 
+dig.o: ${VERSIONFILE}
+
 .PATH: ${DIST}
 
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/dnssec/Makefile.inc
--- a/external/bsd/bind/bin/dnssec/Makefile.inc Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/dnssec/Makefile.inc Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2009/04/12 03:46:05 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -12,3 +12,4 @@
 PROG=${BASE}
 SRCS=${BASE}.c dnssectool.c
 MAN=${BASE}.8
+${BASE}.o: ${VERSIONFILE}
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/host/Makefile
--- a/external/bsd/bind/bin/host/Makefile       Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/host/Makefile       Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:06 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,8 @@
 DIST=${IDIST}/bin/dig
 CPPFLAGS+= -I${DIST}/include
 
+host.o: ${VERSIONFILE}
+
 .PATH: ${DIST}
 
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/named/Makefile
--- a/external/bsd/bind/bin/named/Makefile      Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/named/Makefile      Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2015/01/25 15:51:53 christos Exp $
+#      $NetBSD: Makefile,v 1.10 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -36,6 +36,8 @@
        pfilter.c tkeyconf.c tsigconf.c \
        update.c xfrout.c zoneconf.c ${SRCS_UNIX}
 
+main.o: ${VERSIONFILE}
+
 LDADD+=-lblacklist
 DPADD+=${LIBBLACKLIST}
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/nslookup/Makefile
--- a/external/bsd/bind/bin/nslookup/Makefile   Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/nslookup/Makefile   Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2012/06/05 00:38:45 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -16,4 +16,6 @@
 DPADD+=${LIBEDIT} ${LIBTERMINFO}
 LDADD+=-ledit -lterminfo
 
+nslookup.o: ${VERSIONFILE}
+
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/nsupdate/Makefile
--- a/external/bsd/bind/bin/nsupdate/Makefile   Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/nsupdate/Makefile   Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2012/06/05 00:38:45 christos Exp $
+#      $NetBSD: Makefile,v 1.3 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -14,4 +14,6 @@
 DPADD+=${LIBEDIT} ${LIBTERMINFO}
 LDADD+=-ledit -lterminfo
 
+nsupdate.o: ${VERSIONFILE}
+
 .include <bsd.prog.mk>
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/rndc/Makefile
--- a/external/bsd/bind/bin/rndc/Makefile       Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/rndc/Makefile       Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2009/04/12 03:46:06 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2016/11/01 21:56:12 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -14,6 +14,7 @@
         -DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
        -DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
 
+rndc.o: ${VERSIONFILE}
 
 .PATH: ${DIST}
 
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/bin/tools/Makefile.inc
--- a/external/bsd/bind/bin/tools/Makefile.inc  Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/bin/tools/Makefile.inc  Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2011/09/11 18:55:24 christos Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2016/11/01 21:56:13 christos Exp $
 
 .include <bsd.own.mk>
 
@@ -10,6 +10,7 @@
 
 PROG=${BASE}
 SRCS=${BASE}.c
+${BASE}.o: ${VERSIONFILE}
 .if exists(${TOOLS}/${BASE}.8)
 BINDIR=/usr/sbin
 MAN=${BASE}.8
diff -r 7fd28df44a95 -r 1f7b29df7701 external/bsd/bind/lib/libbind9/Makefile
--- a/external/bsd/bind/lib/libbind9/Makefile   Tue Nov 01 21:55:51 2016 +0000
+++ b/external/bsd/bind/lib/libbind9/Makefile   Tue Nov 01 21:56:11 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/09/11 23:04:10 joerg Exp $
+#      $NetBSD: Makefile,v 1.3 2016/11/01 21:56:13 christos Exp $
 
 LIB=bind9
 
@@ -17,4 +17,6 @@
                dns     ${.CURDIR}/../libdns \
                isccfg  ${.CURDIR}/../libisccfg \
 
+version.o version.go version.pico version.po : ${VERSIONFILE}
+
 .include <bsd.lib.mk>