Skip to content
Permalink
Browse files

Specify include/qlibs and lib/qlibs paths once, in fehqlibs/buildlink…

…3.mk.
  • Loading branch information...
schmonz committed Jul 10, 2019
1 parent 788bb3a commit 20a36febeb65f27cb74a68508476d86147c00723
Showing with 6 additions and 18 deletions.
  1. +1 −7 net/djbdnscurve6/Makefile
  2. +3 −1 net/fehqlibs/buildlink3.mk
  3. +1 −6 net/ucspi-ssl/Makefile
  4. +1 −4 net/ucspi-tcp6/Makefile
@@ -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 \
@@ -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
@@ -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
@@ -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:

0 comments on commit 20a36fe

Please sign in to comment.
You can’t perform that action at this time.