1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

Add a hook to be able to build dns/bind-tools with dns/bind9-devel.

While there, fixup patches.
This commit is contained in:
Mathieu Arnold 2020-05-11 16:00:53 +00:00
parent 19040fa690
commit 8f7615b355
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=534920
4 changed files with 66 additions and 27 deletions

View File

@ -1,13 +1,17 @@
# $FreeBSD$
# Define PORTREVISION in ${MASTERDIR}
.ifdef BIND_TOOLS_DEVEL
MASTERDIR= ${.CURDIR}/../../dns/bind9-devel
PLIST= ${.CURDIR}/pkg-plist-devel
.else
MASTERDIR= ${.CURDIR}/../../dns/bind916
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
.endif
DESCR= ${.CURDIR}/pkg-descr
BIND_TOOLS_SLAVE= YES
INSTALL_WRKSRC= ${WRKSRC}/bin
.include "${MASTERDIR}/Makefile"

View File

@ -0,0 +1,49 @@
bin/arpaname
bin/delv
bin/dig
bin/host
bin/mdig
bin/named-rrchecker
bin/nslookup
bin/nsupdate
man/man1/arpaname.1.gz
man/man1/delv.1.gz
man/man1/dig.1.gz
@comment man/man1/dnstap-read.1.gz
man/man1/host.1.gz
man/man1/mdig.1.gz
man/man1/named-rrchecker.1.gz
man/man1/nslookup.1.gz
man/man1/nsupdate.1.gz
@comment man/man5/named.conf.5.gz
@comment man/man5/rndc.conf.5.gz
@comment man/man8/ddns-confgen.8.gz
man/man8/dnssec-cds.8.gz
man/man8/dnssec-dsfromkey.8.gz
man/man8/dnssec-importkey.8.gz
man/man8/dnssec-keyfromlabel.8.gz
man/man8/dnssec-keygen.8.gz
man/man8/dnssec-revoke.8.gz
man/man8/dnssec-settime.8.gz
man/man8/dnssec-signzone.8.gz
man/man8/dnssec-verify.8.gz
@comment man/man8/filter-aaaa.8.gz
@comment man/man8/named-checkconf.8.gz
@comment man/man8/named-checkzone.8.gz
man/man8/named-journalprint.8.gz
@comment man/man8/named-nzd2nzf.8.gz
@comment man/man8/named.8.gz
man/man8/nsec3hash.8.gz
@comment man/man8/rndc-confgen.8.gz
@comment man/man8/rndc.8.gz
sbin/dnssec-cds
sbin/dnssec-dsfromkey
sbin/dnssec-importkey
sbin/dnssec-keyfromlabel
sbin/dnssec-keygen
sbin/dnssec-revoke
sbin/dnssec-settime
sbin/dnssec-signzone
sbin/dnssec-verify
sbin/named-journalprint
sbin/nsec3hash

View File

@ -90,9 +90,9 @@ CONFLICTS= bind911 bind912 bind913 bind914 bind916
MAKE_JOBS_UNSAFE= yes
OPTIONS_DEFAULT= DLZ_FILESYSTEM GSSAPI_NONE IDN JSON LMDB MANPAGES \
PYTHON SIGCHASE TCP_FASTOPEN
SIGCHASE TCP_FASTOPEN
OPTIONS_DEFINE= DNSTAP DOCS FIXED_RRSET GEOIP IDN JSON LARGE_FILE LMDB \
MANPAGES OVERRIDECACHE PORTREVISION PYTHON QUERYTRACE \
MANPAGES OVERRIDECACHE PORTREVISION QUERYTRACE \
SIGCHASE START_LATE TCP_FASTOPEN TUNING_LARGE
OPTIONS_RADIO= CRYPTO
@ -109,8 +109,6 @@ OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
OPTIONS_EXCLUDE= ${OPTIONS_GROUP_DLZ} DNSTAP DOCS GEOIP LMDB \
OVERRIDECACHE PORTREVISION QUERYTRACE START_LATE \
TCP_FASTOPEN TUNING_LARGE
.else
OPTIONS_EXCLUDE= PYTHON
.endif # BIND_TOOLS_SLAVE
OPTIONS_SUB= yes
@ -134,7 +132,6 @@ LMDB_DESC= Use LMDB for zone management
OVERRIDECACHE_DESC= Use the override-cache patch
NATIVE_PKCS11_DESC= Use PKCS\#11 native API (**READ HELP**)
PORTREVISION_DESC= Show PORTREVISION in the version string
PYTHON_DESC= Build with Python utilities
QUERYTRACE_DESC= Enable the very verbose query tracelogging
SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation
START_LATE_DESC= Start BIND late in the boot process (see help)
@ -199,11 +196,6 @@ OVERRIDECACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl
NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11
PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD}
PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR}
PYTHON_USES= python
QUERYTRACE_CONFIGURE_ENABLE= querytrace
SIGCHASE_CONFIGURE_ON= STD_CDEFINES="-DDIG_SIGCHASE=1"
@ -283,9 +275,11 @@ post-install-DOCS-on:
${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
.else
# Can't use USE_PYTHON=autoplist
post-install-PYTHON-on:
@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
do-install:
for dir in bin doc/man; do \
(cd ${INSTALL_WRKSRC}/$$dir && ${SETENV} ${MAKE_ENV} ${FAKEROOT} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}) ; \
done
.endif # BIND_TOOLS_SLAVE
.include <bsd.port.post.mk>

View File

@ -2,21 +2,13 @@ Only select the "tools" part of bind for building.
--- Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ Makefile.am
@@ -1,13 +1,9 @@
include $(top_srcdir)/Makefile.top
-SUBDIRS = . libltdl lib doc bin
+SUBDIRS = . libltdl lib bin
BUILT_SOURCES = bind.keys.h
CLEANFILES = bind.keys.h
@@ -8,6 +8,4 @@ CLEANFILES = bind.keys.h
bind.keys.h: bind.keys Makefile
${PERL} ${top_srcdir}/util/bindkeys.pl < ${top_srcdir}/bind.keys > $@
-
-dist_sysconf_DATA = bind.keys
-
-.PHONY: doc
.PHONY: doc
--- bin/Makefile.am.orig 2020-05-10 23:44:14 UTC
+++ bin/Makefile.am
@@ -1,4 +1,4 @@