summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dns/bind9-dlz/Makefile88
-rw-r--r--dns/bind9-dlz/distinfo2
-rw-r--r--dns/bind9-dlz/files/configure.bind9-dlz74
-rw-r--r--net/bind9-dlz/Makefile88
-rw-r--r--net/bind9-dlz/distinfo2
-rw-r--r--net/bind9-dlz/files/configure.bind9-dlz74
6 files changed, 270 insertions, 58 deletions
diff --git a/dns/bind9-dlz/Makefile b/dns/bind9-dlz/Makefile
index 0f9cf5a325b2..22b233180f77 100644
--- a/dns/bind9-dlz/Makefile
+++ b/dns/bind9-dlz/Makefile
@@ -6,39 +6,65 @@
#
PORTNAME= bind9
-PORTVERSION= ${VERSION_BIND}+${DLZVERSION}
+PORTVERSION= ${ISCVERSION}+${DLZVERSION}
CATEGORIES= net ipv6
-MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bind-dlz
+MASTER_SITES= ${MASTER_SITE_ISC} \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
+ ${MASTER_SITES_DLZ:S/$/:dlz/}
PKGNAMESUFFIX= -dlz
-DISTFILES= bind-9.2.1.tar.gz
-DISTFILES+= DLZ-${DLZVERSION}${EXTRACT_SUFX}
+DISTFILES= bind-${ISCVERSION}.tar.gz \
+ DLZ-${DLZVERSION}${EXTRACT_SUFX}:dlz
MAINTAINER= dinoex@FreeBSD.org
-LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
+MASTER_SITES_DLZ= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= bind-dlz/:dlz
ISCVERSION= 9.2.1
-VERSION_BIND= 9.2.1
+DLZVERSION= 0.3.0
+USE_SUBMAKE= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
+
+.if defined(WITH_POSTGRESQL_DRIVER)
+LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+= --with-dlz-postgres
+.endif
+
+.if defined(WITH_MYSQL_DRIVER)
+LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-dlz-mysql
+.endif
+
+.if defined(WITH_FILESYSTEM_DRIVER)
+CONFIGURE_ARGS+= --with-dlz-filesystem
+.endif
+
+.if defined(WITH_STUB_DRIVER)
+CONFIGURE_ARGS+= --with-dlz-stub
+.endif
+
+WRKSRC= ${WRKDIR}/bind-${ISCVERSION}
EXTRA_PATCHES= ${WRKDIR}/dlz.patch
-EXTRA_PATCHES+= ${.CURDIR}/files/dlz_postgres_driver.c.diff
PLIST= ${WRKDIR}/.PLIST.more
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=/var --disable-linux-caps
-WRKSRC= ${WRKDIR}/bind-${ISCVERSION}
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ CURDIR="${.CURDIR}" \
+ MKDIR="${MKDIR}" \
+ DISTNAME="${DISTNAME}" \
+ BINDDLZ_OPTIONS="${BINDDLZ_OPTIONS}"
DIR= ${WRKSRC}/bin/
-DLZVERSION= 0.2.1
EXTRA_DOCSDIR= share/doc/bind9-dlz
-EXTRA_FIX= ${WRKSRC}/bin/named/Makefile.in
-DOCS= README.txt bind_dlz.txt changelog.txt dlz_interface.txt \
- dlz_postgres_driver.txt dlz_stub_driver.txt \
- sdlz_helper.txt sdlz_interface.txt
+EXTRA_FIX= ${WRKSRC}/configure
+DOCS= README.txt bind_dlz.txt changelog.txt \
+ dlz_filesystem_driver.txt dlz_interface.txt \
+ dlz_mysql_driver.txt dlz_postgres_driver.txt \
+ dlz_stub_driver.txt sdlz_helper.txt sdlz_interface.txt
MAN1= dig.1 host.1
MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -79,17 +105,20 @@ MAN8= dnssec-keygen.8 dnssec-makekeyset.8 dnssec-signkey.8 dnssec-signzone.8 \
lwresd.8 named-checkconf.8 named-checkzone.8 named.8 nsupdate.8 \
rndc-confgen.8 rndc.8
+pre-everything:
+ @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.bind9-dlz
+
pre-patch:
.for FILE in dlz.patch
@ ${MV} ${WRKDIR}/${FILE} ${WRKDIR}/${FILE}.sed
- ${SED} -e "s=bind-9.2.1/==" ${WRKDIR}/${FILE}.sed > ${WRKDIR}/${FILE}
+ ${SED} -e "s=bind-${ISCVERSION}/==" \
+ ${WRKDIR}/${FILE}.sed > ${WRKDIR}/${FILE}
.endfor
post-patch:
@ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed
- ${SED} -e "s=/usr/local/pgsql/include=${LOCALBASE}/include=" \
- -e "s=/usr/local/pgsql/lib=${LOCALBASE}/lib=" \
- ${EXTRA_FIX}.sed > ${EXTRA_FIX}
+ ${SED} -e "s=-lnsl==" ${EXTRA_FIX}.sed > ${EXTRA_FIX}
+ @ ${CHMOD} +x ${EXTRA_FIX}
.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
rndc/rndc.8
@ ${MV} ${DIR}/${FILE} ${DIR}/${FILE}.sed
@@ -127,11 +156,14 @@ post-install:
@cd ${WRKDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${EXTRA_DOCSDIR}/
.endif
+post-clean:
+ @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400014
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.if defined(WITH_OPENSSL)
+.include "${PORTSDIR}/security/openssl/Makefile.ssl"
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.endif
.if ${OSVERSION} > 500030
diff --git a/dns/bind9-dlz/distinfo b/dns/bind9-dlz/distinfo
index 8b10546b1cf9..2ad0b76f5a11 100644
--- a/dns/bind9-dlz/distinfo
+++ b/dns/bind9-dlz/distinfo
@@ -1,2 +1,2 @@
MD5 (bind-9.2.1.tar.gz) = 692cff6f44e006ce6984b2c286949dd1
-MD5 (DLZ-0.2.1.tar.gz) = 5deddec13e818a2e1196035c63525854
+MD5 (DLZ-0.3.0.tar.gz) = 766c02079d279f806e3cc9188333394a
diff --git a/dns/bind9-dlz/files/configure.bind9-dlz b/dns/bind9-dlz/files/configure.bind9-dlz
new file mode 100644
index 000000000000..cf6e0b06b488
--- /dev/null
+++ b/dns/bind9-dlz/files/configure.bind9-dlz
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+if [ "${BATCH}" -o "${BINDDLZ_OPTIONS}" ]; then
+ if [ "${BINDDLZ_OPTIONS}" ]; then
+ set ${BINDDLZ_OPTIONS}
+ else
+ set \"OpenSSL\" \"PostgreSQL\" \"FileSystem\"
+ fi
+else
+ dialog --title "configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 5 \
+OpenSSL "OpenSSL support" ON \
+PostgreSQL "PostgreSQL driver" ON \
+MySQL "MySQL driver" OFF \
+FileSystem "Filesystem driver" OFF \
+Stub "Stub driver" OFF \
+2> /tmp/checklist.tmp.$$
+
+ retval=$?
+ if [ -s /tmp/checklist.tmp.$$ ]; then
+ set `cat /tmp/checklist.tmp.$$`
+ fi
+ rm -f /tmp/checklist.tmp.$$
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+while [ "$1" ]; do
+ case $1 in
+ \"OpenSSL\")
+ echo WITH_OPENSSL=YES
+ ;;
+ \"PostgreSQL\")
+ echo WITH_POSTGRESQL_DRIVER=YES
+ WITH_POSTGRESQL_DRIVER=1
+ ;;
+ \"MySQL\")
+ echo WITH_MYSQL_DRIVER=YES
+ ;;
+ \"FileSystem\")
+ echo WITH_FILESYSTEM_DRIVER=YES
+ ;;
+ \"Stub\")
+ echo WITH_STUB_DRIVER=YES
+ ;;
+ \"nothing\"|true)
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+exec > /dev/stderr
diff --git a/net/bind9-dlz/Makefile b/net/bind9-dlz/Makefile
index 0f9cf5a325b2..22b233180f77 100644
--- a/net/bind9-dlz/Makefile
+++ b/net/bind9-dlz/Makefile
@@ -6,39 +6,65 @@
#
PORTNAME= bind9
-PORTVERSION= ${VERSION_BIND}+${DLZVERSION}
+PORTVERSION= ${ISCVERSION}+${DLZVERSION}
CATEGORIES= net ipv6
-MASTER_SITES= ftp://ftp.isc.org/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.nominum.com/pub/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.nerdc.ufl.edu/pub/mirrors/ftp.isc.org/isc/bind9/${ISCVERSION}/ \
- ftp://ftp.sunet.se/pub/network/isc/bind9/${ISCVERSION}/ \
- ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,}
-MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= bind-dlz
+MASTER_SITES= ${MASTER_SITE_ISC} \
+ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/bind9/${ISCVERSION}/,} \
+ ${MASTER_SITES_DLZ:S/$/:dlz/}
PKGNAMESUFFIX= -dlz
-DISTFILES= bind-9.2.1.tar.gz
-DISTFILES+= DLZ-${DLZVERSION}${EXTRACT_SUFX}
+DISTFILES= bind-${ISCVERSION}.tar.gz \
+ DLZ-${DLZVERSION}${EXTRACT_SUFX}:dlz
MAINTAINER= dinoex@FreeBSD.org
-LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
+MASTER_SITES_DLZ= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= bind-dlz/:dlz
ISCVERSION= 9.2.1
-VERSION_BIND= 9.2.1
+DLZVERSION= 0.3.0
+USE_SUBMAKE= YES
+GNU_CONFIGURE= YES
+CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps
+
+.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
+.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
+.endif
+
+.if defined(WITH_POSTGRESQL_DRIVER)
+LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
+CONFIGURE_ARGS+= --with-dlz-postgres
+.endif
+
+.if defined(WITH_MYSQL_DRIVER)
+LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+CONFIGURE_ARGS+= --with-dlz-mysql
+.endif
+
+.if defined(WITH_FILESYSTEM_DRIVER)
+CONFIGURE_ARGS+= --with-dlz-filesystem
+.endif
+
+.if defined(WITH_STUB_DRIVER)
+CONFIGURE_ARGS+= --with-dlz-stub
+.endif
+
+WRKSRC= ${WRKDIR}/bind-${ISCVERSION}
EXTRA_PATCHES= ${WRKDIR}/dlz.patch
-EXTRA_PATCHES+= ${.CURDIR}/files/dlz_postgres_driver.c.diff
PLIST= ${WRKDIR}/.PLIST.more
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS+= --localstatedir=/var --disable-linux-caps
-WRKSRC= ${WRKDIR}/bind-${ISCVERSION}
+
+SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
+ CURDIR="${.CURDIR}" \
+ MKDIR="${MKDIR}" \
+ DISTNAME="${DISTNAME}" \
+ BINDDLZ_OPTIONS="${BINDDLZ_OPTIONS}"
DIR= ${WRKSRC}/bin/
-DLZVERSION= 0.2.1
EXTRA_DOCSDIR= share/doc/bind9-dlz
-EXTRA_FIX= ${WRKSRC}/bin/named/Makefile.in
-DOCS= README.txt bind_dlz.txt changelog.txt dlz_interface.txt \
- dlz_postgres_driver.txt dlz_stub_driver.txt \
- sdlz_helper.txt sdlz_interface.txt
+EXTRA_FIX= ${WRKSRC}/configure
+DOCS= README.txt bind_dlz.txt changelog.txt \
+ dlz_filesystem_driver.txt dlz_interface.txt \
+ dlz_mysql_driver.txt dlz_postgres_driver.txt \
+ dlz_stub_driver.txt sdlz_helper.txt sdlz_interface.txt
MAN1= dig.1 host.1
MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -79,17 +105,20 @@ MAN8= dnssec-keygen.8 dnssec-makekeyset.8 dnssec-signkey.8 dnssec-signzone.8 \
lwresd.8 named-checkconf.8 named-checkzone.8 named.8 nsupdate.8 \
rndc-confgen.8 rndc.8
+pre-everything:
+ @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/configure.bind9-dlz
+
pre-patch:
.for FILE in dlz.patch
@ ${MV} ${WRKDIR}/${FILE} ${WRKDIR}/${FILE}.sed
- ${SED} -e "s=bind-9.2.1/==" ${WRKDIR}/${FILE}.sed > ${WRKDIR}/${FILE}
+ ${SED} -e "s=bind-${ISCVERSION}/==" \
+ ${WRKDIR}/${FILE}.sed > ${WRKDIR}/${FILE}
.endfor
post-patch:
@ ${MV} ${EXTRA_FIX} ${EXTRA_FIX}.sed
- ${SED} -e "s=/usr/local/pgsql/include=${LOCALBASE}/include=" \
- -e "s=/usr/local/pgsql/lib=${LOCALBASE}/lib=" \
- ${EXTRA_FIX}.sed > ${EXTRA_FIX}
+ ${SED} -e "s=-lnsl==" ${EXTRA_FIX}.sed > ${EXTRA_FIX}
+ @ ${CHMOD} +x ${EXTRA_FIX}
.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
rndc/rndc.8
@ ${MV} ${DIR}/${FILE} ${DIR}/${FILE}.sed
@@ -127,11 +156,14 @@ post-install:
@cd ${WRKDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${EXTRA_DOCSDIR}/
.endif
+post-clean:
+ @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+
.include <bsd.port.pre.mk>
-.if ${OSVERSION} >= 400014
-USE_OPENSSL= yes
-CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
+.if defined(WITH_OPENSSL)
+.include "${PORTSDIR}/security/openssl/Makefile.ssl"
+CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
.endif
.if ${OSVERSION} > 500030
diff --git a/net/bind9-dlz/distinfo b/net/bind9-dlz/distinfo
index 8b10546b1cf9..2ad0b76f5a11 100644
--- a/net/bind9-dlz/distinfo
+++ b/net/bind9-dlz/distinfo
@@ -1,2 +1,2 @@
MD5 (bind-9.2.1.tar.gz) = 692cff6f44e006ce6984b2c286949dd1
-MD5 (DLZ-0.2.1.tar.gz) = 5deddec13e818a2e1196035c63525854
+MD5 (DLZ-0.3.0.tar.gz) = 766c02079d279f806e3cc9188333394a
diff --git a/net/bind9-dlz/files/configure.bind9-dlz b/net/bind9-dlz/files/configure.bind9-dlz
new file mode 100644
index 000000000000..cf6e0b06b488
--- /dev/null
+++ b/net/bind9-dlz/files/configure.bind9-dlz
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+if [ "${BATCH}" -o "${BINDDLZ_OPTIONS}" ]; then
+ if [ "${BINDDLZ_OPTIONS}" ]; then
+ set ${BINDDLZ_OPTIONS}
+ else
+ set \"OpenSSL\" \"PostgreSQL\" \"FileSystem\"
+ fi
+else
+ dialog --title "configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 5 \
+OpenSSL "OpenSSL support" ON \
+PostgreSQL "PostgreSQL driver" ON \
+MySQL "MySQL driver" OFF \
+FileSystem "Filesystem driver" OFF \
+Stub "Stub driver" OFF \
+2> /tmp/checklist.tmp.$$
+
+ retval=$?
+ if [ -s /tmp/checklist.tmp.$$ ]; then
+ set `cat /tmp/checklist.tmp.$$`
+ fi
+ rm -f /tmp/checklist.tmp.$$
+
+ case $retval in
+ 0) if [ -z "$*" ]; then
+ echo "Nothing selected"
+ fi
+ ;;
+ 1) echo "Cancel pressed."
+ exit 1
+ ;;
+ esac
+fi
+
+${MKDIR} ${WRKDIRPREFIX}${CURDIR}
+exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+
+while [ "$1" ]; do
+ case $1 in
+ \"OpenSSL\")
+ echo WITH_OPENSSL=YES
+ ;;
+ \"PostgreSQL\")
+ echo WITH_POSTGRESQL_DRIVER=YES
+ WITH_POSTGRESQL_DRIVER=1
+ ;;
+ \"MySQL\")
+ echo WITH_MYSQL_DRIVER=YES
+ ;;
+ \"FileSystem\")
+ echo WITH_FILESYSTEM_DRIVER=YES
+ ;;
+ \"Stub\")
+ echo WITH_STUB_DRIVER=YES
+ ;;
+ \"nothing\"|true)
+ ;;
+ *)
+ echo "Invalid option(s): $*" > /dev/stderr
+ rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
+ exit 1
+ ;;
+ esac
+ shift
+done
+exec > /dev/stderr