Received: by mail.netbsd.org (Postfix, from userid 605) id 394FF85085; Mon, 30 Jul 2018 00:04:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C937C84D77 for ; Sun, 29 Jul 2018 23:59:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id RomkFzCg0iv3 for ; Sun, 29 Jul 2018 23:59:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 150A784D35 for ; Sun, 29 Jul 2018 23:59:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0ECF4FBEC; Sun, 29 Jul 2018 23:59:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1532908767123230" MIME-Version: 1.0 Date: Sun, 29 Jul 2018 23:59:27 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/net/djbdns-run To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20180729235927.0ECF4FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1532908767123230 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sun Jul 29 23:59:26 UTC 2018 Modified Files: pkgsrc/net/djbdns-run: Makefile Added Files: pkgsrc/net/djbdns-run: options.mk Log Message: Add 'inet6' option to control dependency on ucspi-tcp{6,}, even though net/djbdns itself still doesn't support the 'inet6' option. Bump version. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/djbdns-run/Makefile cvs rdiff -u -r0 -r1.1 pkgsrc/net/djbdns-run/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1532908767123230 Content-Disposition: inline Content-Length: 1559 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/djbdns-run/Makefile diff -u pkgsrc/net/djbdns-run/Makefile:1.29 pkgsrc/net/djbdns-run/Makefile:1.30 --- pkgsrc/net/djbdns-run/Makefile:1.29 Wed Jul 25 16:32:34 2018 +++ pkgsrc/net/djbdns-run/Makefile Sun Jul 29 23:59:26 2018 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.29 2018/07/25 16:32:34 schmonz Exp $ +# $NetBSD: Makefile,v 1.30 2018/07/29 23:59:26 schmonz Exp $ # -DISTNAME= djbdns-run-20180725 +DISTNAME= djbdns-run-20180730 CATEGORIES= net MASTER_SITES= # empty DISTFILES= # empty @@ -13,7 +13,6 @@ LICENSE= 2-clause-bsd DEPENDS_DJBDNS= djbdns>=1.05nb5:../../net/djbdns DEPENDS+= ${DEPENDS_DJBDNS} DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools -DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 WRKSRC= ${WRKDIR} NO_BUILD= yes @@ -58,6 +57,8 @@ MAKEVARS+= PKG_SYSCONFDIR.djbdns-run . endif .endif +.include "options.mk" + do-install: ${INSTALL_DATA} ${FILESDIR}/README.pkgsrc ${DESTDIR}${PREFIX}/share/doc/djbdns-run Added files: Index: pkgsrc/net/djbdns-run/options.mk diff -u /dev/null pkgsrc/net/djbdns-run/options.mk:1.1 --- /dev/null Sun Jul 29 23:59:27 2018 +++ pkgsrc/net/djbdns-run/options.mk Sun Jul 29 23:59:26 2018 @@ -0,0 +1,12 @@ +# $NetBSD: options.mk,v 1.1 2018/07/29 23:59:26 schmonz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns-run +PKG_SUPPORTED_OPTIONS+= inet6 + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Minet6) +DEPENDS+= ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6 +.else +DEPENDS+= ucspi-tcp-[0-9]*:../../net/ucspi-tcp +.endif --_----------=_1532908767123230--