Received: by mail.netbsd.org (Postfix, from userid 605) id 85B4D84D48; Wed, 10 Jul 2019 12:59:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 09D1D84D43 for ; Wed, 10 Jul 2019 12:59:55 +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 GfmuRbaSNzEm for ; Wed, 10 Jul 2019 12:59:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 76FBB84C85 for ; Wed, 10 Jul 2019 12:59:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70E80FBF4; Wed, 10 Jul 2019 12:59:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156276359431630" MIME-Version: 1.0 Date: Wed, 10 Jul 2019 12:59:54 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/net To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20190710125954.70E80FBF4@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. --_----------=_156276359431630 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Wed Jul 10 12:59:54 UTC 2019 Modified Files: pkgsrc/net/djbdnscurve6: Makefile pkgsrc/net/fehqlibs: buildlink3.mk pkgsrc/net/ucspi-ssl: Makefile pkgsrc/net/ucspi-tcp6: Makefile Log Message: Specify include/qlibs and lib/qlibs paths once, in fehqlibs/buildlink3.mk. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/djbdnscurve6/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/fehqlibs/buildlink3.mk cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/ucspi-ssl/Makefile cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/ucspi-tcp6/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156276359431630 Content-Disposition: inline Content-Length: 3086 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/djbdnscurve6/Makefile diff -u pkgsrc/net/djbdnscurve6/Makefile:1.7 pkgsrc/net/djbdnscurve6/Makefile:1.8 --- pkgsrc/net/djbdnscurve6/Makefile:1.7 Wed Jul 10 11:23:34 2019 +++ pkgsrc/net/djbdnscurve6/Makefile Wed Jul 10 12:59:53 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2019/07/10 11:23:34 schmonz Exp $ +# $NetBSD: Makefile,v 1.8 2019/07/10 12:59:53 schmonz Exp $ DISTNAME= djbdnscurve6-35 PKGREVISION= 2 @@ -38,12 +38,6 @@ BUILD_DEFS+= PKG_SYSCONFBASE INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ share/examples/${PKGBASE} -.include "../../mk/bsd.prefs.mk" - -CFLAGS+= -I${PREFIX}/include/qlibs -CFLAGS+= -I${PREFIX}/include/sodium -LDFLAGS+= -L${PREFIX}/lib/qlibs - do-install: cd ${WRKSRC}/compile && ./install && ./instcheck cd ${WRKSRC}/man; for i in 1 5 8; do \ Index: pkgsrc/net/fehqlibs/buildlink3.mk diff -u pkgsrc/net/fehqlibs/buildlink3.mk:1.3 pkgsrc/net/fehqlibs/buildlink3.mk:1.4 --- pkgsrc/net/fehqlibs/buildlink3.mk:1.3 Wed Jul 10 11:20:02 2019 +++ pkgsrc/net/fehqlibs/buildlink3.mk Wed Jul 10 12:59:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2019/07/10 11:20:02 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2019/07/10 12:59:54 schmonz Exp $ BUILDLINK_TREE+= fehqlibs @@ -7,6 +7,8 @@ FEHQLIBS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10 BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs +BUILDLINK_INCDIRS.fehqlibs+= include/qlibs +BUILDLINK_LIBDIRS.fehqlibs+= lib/qlibs .endif # FEHQLIBS_BUILDLINK3_MK BUILDLINK_TREE+= -fehqlibs Index: pkgsrc/net/ucspi-ssl/Makefile diff -u pkgsrc/net/ucspi-ssl/Makefile:1.33 pkgsrc/net/ucspi-ssl/Makefile:1.34 --- pkgsrc/net/ucspi-ssl/Makefile:1.33 Wed Jul 10 11:23:35 2019 +++ pkgsrc/net/ucspi-ssl/Makefile Wed Jul 10 12:59:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2019/07/10 11:23:35 schmonz Exp $ +# $NetBSD: Makefile,v 1.34 2019/07/10 12:59:54 schmonz Exp $ # DISTNAME= ucspi-ssl-0.10.10 @@ -44,11 +44,6 @@ DJB_CONFIG_CMDS= \ # from `postconf -d | grep tls_medium_cipherlist` DEFAULT_MEDIUM_CIPHERS= aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH -.include "../../mk/bsd.prefs.mk" - -CFLAGS+= -I${PREFIX}/include/qlibs -LDFLAGS+= -L${PREFIX}/lib/qlibs - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR} do-install: do-install-sslperl Index: pkgsrc/net/ucspi-tcp6/Makefile diff -u pkgsrc/net/ucspi-tcp6/Makefile:1.15 pkgsrc/net/ucspi-tcp6/Makefile:1.16 --- pkgsrc/net/ucspi-tcp6/Makefile:1.15 Wed Jul 10 11:23:34 2019 +++ pkgsrc/net/ucspi-tcp6/Makefile Wed Jul 10 12:59:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2019/07/10 11:23:34 schmonz Exp $ +# $NetBSD: Makefile,v 1.16 2019/07/10 12:59:54 schmonz Exp $ DISTNAME= ucspi-tcp6-1.10.6 PKGREVISION= 2 @@ -18,9 +18,6 @@ DJB_SLASHPACKAGE= yes DJB_RESTRICTED= no DJB_CONFIG_DIR= ${WRKSRC} -CPPFLAGS+= -I${PREFIX}/include/qlibs -LDFLAGS+= -L${PREFIX}/lib/qlibs - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 post-configure: --_----------=_156276359431630--