Module Name: src
Committed By: christos
Date: Tue Nov 1 21:56:13 UTC 2016
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/bin/delv: Makefile
src/external/bsd/bind/bin/dig: Makefile
src/external/bsd/bind/bin/dnssec: Makefile.inc
src/external/bsd/bind/bin/host: Makefile
src/external/bsd/bind/bin/named: Makefile
src/external/bsd/bind/bin/nslookup: Makefile
src/external/bsd/bind/bin/nsupdate: Makefile
src/external/bsd/bind/bin/rndc: Makefile
src/external/bsd/bind/bin/tools: Makefile.inc
src/external/bsd/bind/lib/libbind9: Makefile
Log Message:
rebuild if the version file changes, so binaries report the right version.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bin/delv/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/dig/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/dnssec/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/host/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/bin/named/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bin/nslookup/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/bin/nsupdate/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/rndc/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/bind/bin/tools/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/bind/lib/libbind9/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.23 src/external/bsd/bind/Makefile.inc:1.24
--- src/external/bsd/bind/Makefile.inc:1.23 Wed Jun 29 13:52:28 2016
+++ src/external/bsd/bind/Makefile.inc Tue Nov 1 17:56:11 2016
@@ -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 @@ IDIST= ${NETBSDSRCDIR}/external/bsd/bin
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
Index: src/external/bsd/bind/bin/delv/Makefile
diff -u src/external/bsd/bind/bin/delv/Makefile:1.2 src/external/bsd/bind/bin/delv/Makefile:1.3
--- src/external/bsd/bind/bin/delv/Makefile:1.2 Tue Jul 8 15:08:43 2014
+++ src/external/bsd/bind/bin/delv/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ DIST=${IDIST}/bin/delv
CPPFLAGS+= -I${DIST}/include -I${IDIST}/lib/irs/include
LDADD+= -lirs -lisccfg
+delv.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/dig/Makefile
diff -u src/external/bsd/bind/bin/dig/Makefile:1.1 src/external/bsd/bind/bin/dig/Makefile:1.2
--- src/external/bsd/bind/bin/dig/Makefile:1.1 Sat Apr 11 23:46:05 2009
+++ src/external/bsd/bind/bin/dig/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ BINDIR= /usr/bin
DIST=${IDIST}/bin/dig
CPPFLAGS+= -I${DIST}/include
+dig.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/dnssec/Makefile.inc
diff -u src/external/bsd/bind/bin/dnssec/Makefile.inc:1.1 src/external/bsd/bind/bin/dnssec/Makefile.inc:1.2
--- src/external/bsd/bind/bin/dnssec/Makefile.inc:1.1 Sat Apr 11 23:46:05 2009
+++ src/external/bsd/bind/bin/dnssec/Makefile.inc Tue Nov 1 17:56:12 2016
@@ -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 @@ DNSSEC=${IDIST}/bin/dnssec
PROG=${BASE}
SRCS=${BASE}.c dnssectool.c
MAN=${BASE}.8
+${BASE}.o: ${VERSIONFILE}
Index: src/external/bsd/bind/bin/host/Makefile
diff -u src/external/bsd/bind/bin/host/Makefile:1.1 src/external/bsd/bind/bin/host/Makefile:1.2
--- src/external/bsd/bind/bin/host/Makefile:1.1 Sat Apr 11 23:46:06 2009
+++ src/external/bsd/bind/bin/host/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ BINDIR= /usr/bin
DIST=${IDIST}/bin/dig
CPPFLAGS+= -I${DIST}/include
+host.o: ${VERSIONFILE}
+
.PATH: ${DIST}
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/named/Makefile
diff -u src/external/bsd/bind/bin/named/Makefile:1.9 src/external/bsd/bind/bin/named/Makefile:1.10
--- src/external/bsd/bind/bin/named/Makefile:1.9 Sun Jan 25 10:51:53 2015
+++ src/external/bsd/bind/bin/named/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ SRCS= builtin.c client.c config.c contro
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>
Index: src/external/bsd/bind/bin/nslookup/Makefile
diff -u src/external/bsd/bind/bin/nslookup/Makefile:1.2 src/external/bsd/bind/bin/nslookup/Makefile:1.3
--- src/external/bsd/bind/bin/nslookup/Makefile:1.2 Mon Jun 4 20:38:45 2012
+++ src/external/bsd/bind/bin/nslookup/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ CPPFLAGS+= -I${DIST}/include
DPADD+=${LIBEDIT} ${LIBTERMINFO}
LDADD+=-ledit -lterminfo
+nslookup.o: ${VERSIONFILE}
+
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/nsupdate/Makefile
diff -u src/external/bsd/bind/bin/nsupdate/Makefile:1.2 src/external/bsd/bind/bin/nsupdate/Makefile:1.3
--- src/external/bsd/bind/bin/nsupdate/Makefile:1.2 Mon Jun 4 20:38:45 2012
+++ src/external/bsd/bind/bin/nsupdate/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ DIST=${IDIST}/bin/nsupdate
DPADD+=${LIBEDIT} ${LIBTERMINFO}
LDADD+=-ledit -lterminfo
+nsupdate.o: ${VERSIONFILE}
+
.include <bsd.prog.mk>
Index: src/external/bsd/bind/bin/rndc/Makefile
diff -u src/external/bsd/bind/bin/rndc/Makefile:1.1 src/external/bsd/bind/bin/rndc/Makefile:1.2
--- src/external/bsd/bind/bin/rndc/Makefile:1.1 Sat Apr 11 23:46:06 2009
+++ src/external/bsd/bind/bin/rndc/Makefile Tue Nov 1 17:56:12 2016
@@ -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 @@ CPPFLAGS+= -I${DIST}/include \
-DRNDC_CONFFILE=\"${SYSCONFDIR}/rndc.conf\" \
-DRNDC_KEYFILE=\"${SYSCONFDIR}/rndc.key\" \
+rndc.o: ${VERSIONFILE}
.PATH: ${DIST}
Index: src/external/bsd/bind/bin/tools/Makefile.inc
diff -u src/external/bsd/bind/bin/tools/Makefile.inc:1.1 src/external/bsd/bind/bin/tools/Makefile.inc:1.2
--- src/external/bsd/bind/bin/tools/Makefile.inc:1.1 Sun Sep 11 14:55:24 2011
+++ src/external/bsd/bind/bin/tools/Makefile.inc Tue Nov 1 17:56:13 2016
@@ -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 @@ TOOLS=${IDIST}/bin/tools
PROG=${BASE}
SRCS=${BASE}.c
+${BASE}.o: ${VERSIONFILE}
.if exists(${TOOLS}/${BASE}.8)
BINDIR=/usr/sbin
MAN=${BASE}.8
Index: src/external/bsd/bind/lib/libbind9/Makefile
diff -u src/external/bsd/bind/lib/libbind9/Makefile:1.2 src/external/bsd/bind/lib/libbind9/Makefile:1.3
--- src/external/bsd/bind/lib/libbind9/Makefile:1.2 Wed Sep 11 19:04:10 2013
+++ src/external/bsd/bind/lib/libbind9/Makefile Tue Nov 1 17:56:13 2016
@@ -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 @@ LIBDPLIBS+= isc ${.CURDIR}/../libisc \
dns ${.CURDIR}/../libdns \
isccfg ${.CURDIR}/../libisccfg \
+version.o version.go version.pico version.po : ${VERSIONFILE}
+
.include <bsd.lib.mk>
