From owner-cvs-all@FreeBSD.ORG Sat May 29 16:55:09 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5757D16A4CE; Sat, 29 May 2004 16:55:09 -0700 (PDT) Received: from aker.isnic.is (ns.xn--grble123-v3a.is [193.4.58.91]) by mx1.FreeBSD.org (Postfix) with ESMTP id 032AA43D31; Sat, 29 May 2004 16:55:09 -0700 (PDT) (envelope-from oli@aker.isnic.is) Received: by aker.isnic.is (Postfix, from userid 1000) id 371B4942C7; Sat, 29 May 2004 23:54:48 +0000 (GMT) Date: Sat, 29 May 2004 23:54:48 +0000 From: Olafur Osvaldsson To: Pav Lucistnik Message-ID: <20040529235447.GA59450@isnic.is> References: <200405291223.i4TCNuKj090593@repoman.freebsd.org> <20040529123526.GA76182@xor.obsecurity.org> <1085834301.41463.15.camel@hood.oook.cz> <20040529233424.GB57868@isnic.is> <1085873818.41463.46.camel@hood.oook.cz> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline In-Reply-To: <1085873818.41463.46.camel@hood.oook.cz> User-Agent: Mutt/1.4.1i cc: cvs-ports@FreeBSD.org cc: ports-committers@FreeBSD.org cc: cvs-all@FreeBSD.org cc: Kris Kennaway Subject: Re: cvs commit: ports/dns/nsd Makefile pkg-message pkg-plist ports/dns/nsd/files nsd.sh.tmpl X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 May 2004 23:55:09 -0000 --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Pav, On Sun, 30 May 2004, Pav Lucistnik wrote: > Usual way to name options is WITH_FOO and WITHOUT_FOO. OK, I've attached a patch to fix this, apply at your own discretion. /Oli -- Olafur Osvaldsson Systems Administrator Internet a Islandi hf. Tel: +354 525-5291 Email: oli@isnic.is --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="nsd.diff" diff -ruN nsd.orig/Makefile nsd/Makefile --- nsd.orig/Makefile Sat May 29 12:23:56 2004 +++ nsd/Makefile Sat May 29 23:52:19 2004 @@ -7,7 +7,7 @@ PORTNAME= nsd PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/ \ ftp://ftp.rhnet.is/pub/nsd/ @@ -30,31 +30,31 @@ --with-namedxfer=${NSDXFER} \ --with-libwrap -.if defined(DISABLE_IPV6) +.if defined(WITHOUT_IPV6) CONFIGURE_ARGS+= --disable-ipv6 .endif -.if defined(DISABLE_AXFR) +.if defined(WITHOUT_AXFR) CONFIGURE_ARGS+= --disable-axfr .endif -.if defined(ENABLE_PLUGINS) +.if defined(WITH_PLUGINS) CONFIGURE_ARGS+= --enable-plugins .endif -.if defined(ENABLE_BIND8_STATS) +.if defined(WITH_BIND8_STATS) CONFIGURE_ARGS+= --enable-bind8-stats .endif -.if defined(ENABLE_DNSSEC) +.if defined(WITH_DNSSEC) CONFIGURE_ARGS+= --enable-dnssec .endif -.if defined(ENABLE_ROOT_SERVER) +.if defined(WITH_ROOT_SERVER) CONFIGURE_ARGS+= --enable-root-server .endif -.if defined(ENABLE_MMAP) +.if defined(WITH_MMAP) CONFIGURE_ARGS+= --enable-mmap .endif @@ -71,15 +71,15 @@ @${ECHO_MSG} "" @${ECHO_MSG} "nsd has the following tunables:" @${ECHO_MSG} "" - @${ECHO_MSG} " DISABLE_IPV6 Disables IPv6 support" - @${ECHO_MSG} " DISABLE_AXFR Disables AXFR" + @${ECHO_MSG} " WITHOUT_IPV6 Disables IPv6 support" + @${ECHO_MSG} " WITHOUT_AXFR Disables AXFR" @${ECHO_MSG} "" - @${ECHO_MSG} " ENABLE_PLUGINS Enable plugin support" - @${ECHO_MSG} " ENABLE_BIND8_STATS Enables BIND8 like NSTATS & XSTATS" - @${ECHO_MSG} " ENABLE_DNSSEC Enable experimental DNSSEC support" + @${ECHO_MSG} " WITH_PLUGINS Enable plugin support" + @${ECHO_MSG} " WITH_BIND8_STATS Enables BIND8 like NSTATS & XSTATS" + @${ECHO_MSG} " WITH_DNSSEC Enable experimental DNSSEC support" @${ECHO_MSG} " according to the latest drafts" - @${ECHO_MSG} " ENABLE_ROOT_SERVER Configure NSD as a root server" - @${ECHO_MSG} " ENABLE_MMAP Configure NSD to load the database using mmap(2)" + @${ECHO_MSG} " WITH_ROOT_SERVER Configure NSD as a root server" + @${ECHO_MSG} " WITH_MMAP Configure NSD to load the database using mmap(2)" @${ECHO_MSG} "" pre-build: --5mCyUwZo2JvN/JJP--