Date: Sat, 16 Nov 2002 13:53:40 +0300 From: Sergey Matveychuk <sem@ciam.ru> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/45332: Update port net/bind9-dlz Message-ID: <E18D0a4-000EQ5-00@mail.ciam.ru>
next in thread | raw e-mail | index | archive | help
>Number: 45332
>Category: ports
>Synopsis: Update port net/bind9-dlz
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Nov 16 03:00:03 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Sergey Matveychuk
>Release: FreeBSD 4.7-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD sem-home.ciam.ru 4.7-RELEASE-p1 FreeBSD 4.7-RELEASE-p1 #0: Tue Nov 12 22:23:02 MSK 2002 root@sem-home.ciam.ru:/usr/src/sys/compile/SEM-HOME i386
>Description:
Update DLZ to 0.3.0
MySQL and filesystem driver added
interactive driver select ability
use MASTER_SITE_ISC
SED -> REINPLACE_CMD
change version number to satisfy portlint
more reorganize to make portlint happy
removed file: files/dlz_postgres_driver.c.diff
added file: scripts/configure.bind9-dlz
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/bind9-dlz/Makefile bind9-dlz/Makefile
--- /usr/ports/net/bind9-dlz/Makefile Thu Nov 7 00:38:59 2002
+++ bind9-dlz/Makefile Sat Nov 16 03:32:28 2002
@@ -6,39 +6,64 @@
#
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
+USE_REINPLACE= 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}"
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
+ dlz_stub_driver.txt sdlz_helper.txt sdlz_interface.txt \
+ dlz_filesystem_driver.txt dlz_mysql_driver.txt \
+ dlz_postgres_driver.txt
MAN1= dig.1 host.1
MAN3= lwres.3 lwres_addr_parse.3 lwres_buffer.3 lwres_buffer_add.3 \
@@ -79,23 +104,21 @@
lwresd.8 named-checkconf.8 named-checkzone.8 named.8 nsupdate.8 \
rndc-confgen.8 rndc.8
+pre-everything:
+ @ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/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}
+ ${REINPLACE_CMD} -e "s=bind-${ISCVERSION}/==" ${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}
+ ${REINPLACE_CMD} -e "s=-lnsl==" ${WRKSRC}/configure
.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.8 \
rndc/rndc.8
- @ ${MV} ${DIR}/${FILE} ${DIR}/${FILE}.sed
- ${SED} -e 's#/etc/named.conf#${PREFIX}/etc/named.conf#g' \
+ ${REINPLACE_CMD} -e 's#/etc/named.conf#${PREFIX}/etc/named.conf#g' \
-e 's#/etc/rndc.conf#${PREFIX}/etc/rndc.conf#g' \
- ${DIR}/${FILE}.sed > ${DIR}/${FILE}
+ ${DIR}/${FILE}
.endfor
pre-configure:
@@ -126,6 +149,9 @@
${MKDIR} ${PREFIX}/${EXTRA_DOCSDIR}
@cd ${WRKDIR} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/${EXTRA_DOCSDIR}/
.endif
+
+post-clean:
+ @ ${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
.include <bsd.port.pre.mk>
diff -urN /usr/ports/net/bind9-dlz/distinfo bind9-dlz/distinfo
--- /usr/ports/net/bind9-dlz/distinfo Fri Aug 30 19:53:28 2002
+++ bind9-dlz/distinfo Sat Nov 16 03:32:28 2002
@@ -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 -urN /usr/ports/net/bind9-dlz/scripts/configure.bind9-dlz bind9-dlz/scripts/configure.bind9-dlz
--- /usr/ports/net/bind9-dlz/scripts/configure.bind9-dlz Thu Jan 1 03:00:00 1970
+++ bind9-dlz/scripts/configure.bind9-dlz Sat Nov 16 03:33:14 2002
@@ -0,0 +1,66 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then
+ exit
+fi
+
+if [ "${BATCH}" ]; then
+ set \"WITH_POSTGRESQL_DRIVER\" \"WITH_MYSQL_DRIVER\"
+else
+ dialog --title "configuration options" --clear \
+ --checklist "\n\
+Please select desired options:" -1 -1 4 \
+WITH_POSTGRESQL_DRIVER "PostgreSQL driver" ON \
+WITH_MYSQL_DRIVER "MySQL driver" ON \
+WITH_FILESYSTEM_DRIVER "Filesystem driver" OFF \
+WITH_STUB_DRIVER "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
+ \"WITH_POSTGRESQL_DRIVER\")
+ echo WITH_POSTGRESQL_DRIVER=YES
+ WITH_POSTGRESQL_DRIVER=1
+ ;;
+ \"WITH_MYSQL_DRIVER\")
+ echo WITH_MYSQL_DRIVER=YES
+ ;;
+ \"WITH_FILESYSTEM_DRIVER\")
+ echo WITH_FILESYSTEM_DRIVER=YES
+ ;;
+ \"WITH_STUB_DRIVER\")
+ 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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E18D0a4-000EQ5-00>