From owner-svn-src-head@FreeBSD.ORG Mon Jun 1 21:58:59 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3ADC1065670; Mon, 1 Jun 2009 21:58:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B128C8FC08; Mon, 1 Jun 2009 21:58:59 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n51Lwxj3093816; Mon, 1 Jun 2009 21:58:59 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n51Lwxu0093806; Mon, 1 Jun 2009 21:58:59 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200906012158.n51Lwxu0093806@svn.freebsd.org> From: Doug Barton Date: Mon, 1 Jun 2009 21:58:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193280 - in head: lib/bind share/mk tools/build/options usr.bin/dig usr.sbin/named X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Jun 2009 21:59:00 -0000 Author: dougb Date: Mon Jun 1 21:58:59 2009 New Revision: 193280 URL: http://svn.freebsd.org/changeset/base/193280 Log: Add support for the build options that are currently in the port: WITH_BIND_IDN WITH_BIND_LARGE_FILE WITH_BIND_SIGCHASE WITH_BIND_XML Added: head/tools/build/options/WITH_BIND_IDN (contents, props changed) head/tools/build/options/WITH_BIND_LARGE_FILE (contents, props changed) head/tools/build/options/WITH_BIND_SIGCHASE (contents, props changed) head/tools/build/options/WITH_BIND_XML (contents, props changed) Replaced: head/tools/build/options/WITH_BIND_LIBS (contents, props changed) Modified: head/lib/bind/config.mk head/share/mk/bsd.own.mk head/usr.bin/dig/Makefile head/usr.sbin/named/Makefile Modified: head/lib/bind/config.mk ============================================================================== --- head/lib/bind/config.mk Mon Jun 1 21:54:59 2009 (r193279) +++ head/lib/bind/config.mk Mon Jun 1 21:58:59 2009 (r193280) @@ -70,6 +70,19 @@ ISC_ATOMIC_ARCH= x86_32 ISC_ATOMIC_ARCH= ${MACHINE_ARCH} .endif +# Optional features +.if ${MK_BIND_LARGE_FILE} == "yes" +CFLAGS+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +.endif +.if ${MK_BIND_SIGCHASE} == "yes" +CFLAGS+= -DDIG_SIGCHASE +.endif +.if ${MK_BIND_XML} == "yes" +CFLAGS+= -DHAVE_LIBXML2 +CFLAGS+= -I/usr/local/include -I/usr/local/include/libxml2 +CFLAGS+= -L/usr/local/lib -lxml2 -lz -liconv -lm +.endif + # Link against BIND libraries .if ${MK_BIND_LIBS} == "no" LIBBIND9= ${LIB_BIND_REL}/bind9/libbind9.a Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Mon Jun 1 21:54:59 2009 (r193279) +++ head/share/mk/bsd.own.mk Mon Jun 1 21:58:59 2009 (r193280) @@ -402,7 +402,11 @@ MK_${var}:= yes # MK_* options which default to "no". # .for var in \ + BIND_IDN \ + BIND_LARGE_FILE \ BIND_LIBS \ + BIND_SIGCHASE \ + BIND_XML \ GNU_CPIO \ HESIOD \ IDEA Added: head/tools/build/options/WITH_BIND_IDN ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_IDN Mon Jun 1 21:58:59 2009 (r193280) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to enable IDN support for dig, host, and nslookup. +This requires ports/dns/idnkit to be installed in /usr/local. Added: head/tools/build/options/WITH_BIND_LARGE_FILE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_LARGE_FILE Mon Jun 1 21:58:59 2009 (r193280) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to enable 64-bit file support. Added: head/tools/build/options/WITH_BIND_LIBS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_LIBS Mon Jun 1 21:58:59 2009 (r193280) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to install BIND libraries and include files. Added: head/tools/build/options/WITH_BIND_SIGCHASE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_SIGCHASE Mon Jun 1 21:58:59 2009 (r193280) @@ -0,0 +1,2 @@ +.\" $FreeBSD$ +Set to enable DNSSEC validation support for dig, host, and nslookup. Added: head/tools/build/options/WITH_BIND_XML ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/build/options/WITH_BIND_XML Mon Jun 1 21:58:59 2009 (r193280) @@ -0,0 +1,3 @@ +.\" $FreeBSD$ +Set to enable the http statistics interface for named. +This requires ports/textproc/libxml2 to be installed in /usr/local. Modified: head/usr.bin/dig/Makefile ============================================================================== --- head/usr.bin/dig/Makefile Mon Jun 1 21:54:59 2009 (r193279) +++ head/usr.bin/dig/Makefile Mon Jun 1 21:58:59 2009 (r193280) @@ -15,6 +15,11 @@ SRCS+= dig.c dighost.c CFLAGS+= -I${SRCDIR}/include CFLAGS+= -I${BIND_DIR}/lib/isc/${ISC_ATOMIC_ARCH}/include +.if ${MK_BIND_IDN} == "yes" +CFLAGS+= -DWITH_IDN -I/usr/local/include +CFLAGS+= -L/usr/local/lib -lidnkit -R/usr/local/lib -liconv +.endif + DPADD+= ${BIND_DPADD} ${CRYPTO_DPADD} ${PTHREAD_DPADD} LDADD+= ${BIND_LDADD} ${CRYPTO_LDADD} ${PTHREAD_LDADD} Modified: head/usr.sbin/named/Makefile ============================================================================== --- head/usr.sbin/named/Makefile Mon Jun 1 21:54:59 2009 (r193279) +++ head/usr.sbin/named/Makefile Mon Jun 1 21:58:59 2009 (r193280) @@ -9,7 +9,25 @@ SRCDIR= ${BIND_DIR}/bin/named PROG= named -CONFIGARGS='--prefix=/usr' '--without-libxml2' '--without-idn' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--enable-threads' '--disable-ipv6' '--enable-getifaddrs' '--disable-linux-caps' '--with-openssl=/usr' '--with-randomdev=/dev/random' +CONFIGARGS='--prefix=/usr' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--enable-threads' '--disable-ipv6' '--enable-getifaddrs' '--disable-linux-caps' '--with-openssl=/usr' '--with-randomdev=/dev/random' + +# Optional features +.if ${MK_BIND_LARGE_FILE} == "yes" +CONFIGARGS+='--enable-largefile' +.endif +.if ${MK_BIND_SIGCHASE} == "yes" +CONFIGARGS+='STD_CDEFINES=-DDIG_SIGCHASE=1' +.endif +.if ${MK_BIND_IDN} == "yes" +CONFIGARGS+='--with-idn=/usr/local' +.else +CONFIGARGS+='--without-idn' +.endif +.if ${MK_BIND_XML} == "yes" +CONFIGARGS+='--with-libxml2=/usr/local' +.else +CONFIGARGS+='--without-libxml2' +.endif .PATH: ${SRCDIR}/unix SRCS+= os.c