[pkgsrc/trunk]: pkgsrc/net Specify include/qlibs and lib/qlibs paths once, in...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/31fea509292c
branches:  trunk
changeset: 398102:31fea509292c
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Jul 10 12:59:53 2019 +0000

description:
Specify include/qlibs and lib/qlibs paths once, in fehqlibs/buildlink3.mk.

diffstat:

 net/djbdnscurve6/Makefile  |  8 +-------
 net/fehqlibs/buildlink3.mk |  4 +++-
 net/ucspi-ssl/Makefile     |  7 +------
 net/ucspi-tcp6/Makefile    |  5 +----
 4 files changed, 6 insertions(+), 18 deletions(-)

diffs (80 lines):

diff -r c5c27a91bcc2 -r 31fea509292c net/djbdnscurve6/Makefile
--- a/net/djbdnscurve6/Makefile Wed Jul 10 12:56:50 2019 +0000
+++ b/net/djbdnscurve6/Makefile Wed Jul 10 12:59:53 2019 +0000
@@ -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 @@
 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                            \
diff -r c5c27a91bcc2 -r 31fea509292c net/fehqlibs/buildlink3.mk
--- a/net/fehqlibs/buildlink3.mk        Wed Jul 10 12:56:50 2019 +0000
+++ b/net/fehqlibs/buildlink3.mk        Wed Jul 10 12:59:53 2019 +0000
@@ -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 @@
 
 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
diff -r c5c27a91bcc2 -r 31fea509292c net/ucspi-ssl/Makefile
--- a/net/ucspi-ssl/Makefile    Wed Jul 10 12:56:50 2019 +0000
+++ b/net/ucspi-ssl/Makefile    Wed Jul 10 12:59:53 2019 +0000
@@ -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 @@
 # 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
diff -r c5c27a91bcc2 -r 31fea509292c net/ucspi-tcp6/Makefile
--- a/net/ucspi-tcp6/Makefile   Wed Jul 10 12:56:50 2019 +0000
+++ b/net/ucspi-tcp6/Makefile   Wed Jul 10 12:59:53 2019 +0000
@@ -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_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: