Wed Jul 10 12:59:54 2019 UTC ()
Specify include/qlibs and lib/qlibs paths once, in fehqlibs/buildlink3.mk.


(schmonz)
diff -r1.7 -r1.8 pkgsrc/net/djbdnscurve6/Makefile
diff -r1.3 -r1.4 pkgsrc/net/fehqlibs/buildlink3.mk
diff -r1.33 -r1.34 pkgsrc/net/ucspi-ssl/Makefile
diff -r1.15 -r1.16 pkgsrc/net/ucspi-tcp6/Makefile
cvs diff -r1.7 -r1.8 pkgsrc/net/djbdnscurve6/Makefile (expand / switch to unified diff)

--- pkgsrc/net/djbdnscurve6/Makefile 2019/07/10 11:23:34 1.7
+++ pkgsrc/net/djbdnscurve6/Makefile 2019/07/10 12:59:53 1.8
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.7 2019/07/10 11:23:34 schmonz Exp $ 1# $NetBSD: Makefile,v 1.8 2019/07/10 12:59:53 schmonz Exp $
2 2
3DISTNAME= djbdnscurve6-35 3DISTNAME= djbdnscurve6-35
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= https://www.fehcom.de/ipnet/djbdnscurve6/ 6MASTER_SITES= https://www.fehcom.de/ipnet/djbdnscurve6/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://www.fehcom.de/ipnet/djbdnscurve6.html 10HOMEPAGE= https://www.fehcom.de/ipnet/djbdnscurve6.html
11COMMENT= Fork of djbdns with IPv6 and DNSCurve support 11COMMENT= Fork of djbdns with IPv6 and DNSCurve support
12#LICENSE= # TODO: (see mk/license.mk) 12#LICENSE= # TODO: (see mk/license.mk)
13 13
14CONFLICTS+= djbdns-[0-9]* 14CONFLICTS+= djbdns-[0-9]*
@@ -28,30 +28,24 @@ SUBST_MESSAGE.etc= Fixing prefix. @@ -28,30 +28,24 @@ SUBST_MESSAGE.etc= Fixing prefix.
28SUBST_CLASSES+= sysconfdir 28SUBST_CLASSES+= sysconfdir
29SUBST_STAGE.sysconfdir= do-configure 29SUBST_STAGE.sysconfdir= do-configure
30SUBST_FILES.sysconfdir= src/dnscache-conf.c 30SUBST_FILES.sysconfdir= src/dnscache-conf.c
31SUBST_VARS.sysconfdir= PKG_SYSCONFDIR 31SUBST_VARS.sysconfdir= PKG_SYSCONFDIR
32SUBST_MESSAGE.sysconfdir=Fixing sysconfdir. 32SUBST_MESSAGE.sysconfdir=Fixing sysconfdir.
33 33
34EGDIR= ${PREFIX}/share/examples/${PKGBASE} 34EGDIR= ${PREFIX}/share/examples/${PKGBASE}
35CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global 35CONF_FILES+= ${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
36BUILD_DEFS+= PKG_SYSCONFBASE 36BUILD_DEFS+= PKG_SYSCONFBASE
37 37
38INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \ 38INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
39 share/examples/${PKGBASE} 39 share/examples/${PKGBASE}
40 40
41.include "../../mk/bsd.prefs.mk" 
42 
43CFLAGS+= -I${PREFIX}/include/qlibs 
44CFLAGS+= -I${PREFIX}/include/sodium 
45LDFLAGS+= -L${PREFIX}/lib/qlibs 
46 
47do-install: 41do-install:
48 cd ${WRKSRC}/compile && ./install && ./instcheck 42 cd ${WRKSRC}/compile && ./install && ./instcheck
49 cd ${WRKSRC}/man; for i in 1 5 8; do \ 43 cd ${WRKSRC}/man; for i in 1 5 8; do \
50 for j in *.$$i; do ${INSTALL_MAN} $$j \ 44 for j in *.$$i; do ${INSTALL_MAN} $$j \
51 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \ 45 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man$$i; done \
52 done 46 done
53 47
54.include "../../net/fehqlibs/buildlink3.mk" 48.include "../../net/fehqlibs/buildlink3.mk"
55.include "../../security/libsodium/buildlink3.mk" 49.include "../../security/libsodium/buildlink3.mk"
56.include "../../mk/djbware.mk" 50.include "../../mk/djbware.mk"
57.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/net/fehqlibs/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/net/fehqlibs/buildlink3.mk 2019/07/10 11:20:02 1.3
+++ pkgsrc/net/fehqlibs/buildlink3.mk 2019/07/10 12:59:54 1.4
@@ -1,12 +1,14 @@ @@ -1,12 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.3 2019/07/10 11:20:02 schmonz Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2019/07/10 12:59:54 schmonz Exp $
2 2
3BUILDLINK_TREE+= fehqlibs 3BUILDLINK_TREE+= fehqlibs
4 4
5.if !defined(FEHQLIBS_BUILDLINK3_MK) 5.if !defined(FEHQLIBS_BUILDLINK3_MK)
6FEHQLIBS_BUILDLINK3_MK:= 6FEHQLIBS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10 8BUILDLINK_API_DEPENDS.fehqlibs+=fehqlibs>=0.9.12.10
9BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs 9BUILDLINK_PKGSRCDIR.fehqlibs?= ../../net/fehqlibs
 10BUILDLINK_INCDIRS.fehqlibs+= include/qlibs
 11BUILDLINK_LIBDIRS.fehqlibs+= lib/qlibs
10.endif # FEHQLIBS_BUILDLINK3_MK 12.endif # FEHQLIBS_BUILDLINK3_MK
11 13
12BUILDLINK_TREE+= -fehqlibs 14BUILDLINK_TREE+= -fehqlibs
cvs diff -r1.33 -r1.34 pkgsrc/net/ucspi-ssl/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ucspi-ssl/Makefile 2019/07/10 11:23:35 1.33
+++ pkgsrc/net/ucspi-ssl/Makefile 2019/07/10 12:59:54 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2019/07/10 11:23:35 schmonz Exp $ 1# $NetBSD: Makefile,v 1.34 2019/07/10 12:59:54 schmonz Exp $
2# 2#
3 3
4DISTNAME= ucspi-ssl-0.10.10 4DISTNAME= ucspi-ssl-0.10.10
5PKGNAME= ${DISTNAME:S/-0./-0.999./} 5PKGNAME= ${DISTNAME:S/-0./-0.999./}
6PKGREVISION= 2 6PKGREVISION= 2
7CATEGORIES= net 7CATEGORIES= net
8MASTER_SITES= https://www.fehcom.de/ipnet/ucspi-ssl/ 8MASTER_SITES= https://www.fehcom.de/ipnet/ucspi-ssl/
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= schmonz@NetBSD.org 11MAINTAINER= schmonz@NetBSD.org
12HOMEPAGE= https://www.fehcom.de/ipnet/ucspi-ssl.html 12HOMEPAGE= https://www.fehcom.de/ipnet/ucspi-ssl.html
13COMMENT= Command-line tools for SSL client-server applications 13COMMENT= Command-line tools for SSL client-server applications
14 14
@@ -34,31 +34,26 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR} @@ -34,31 +34,26 @@ MAKE_DIRS+= ${PKG_SYSCONFDIR}
34CONF_FILES+= ${EGDIR}/dh1024.pem ${PKG_SYSCONFDIR}/dh1024.pem 34CONF_FILES+= ${EGDIR}/dh1024.pem ${PKG_SYSCONFDIR}/dh1024.pem
35 35
36DJB_CONFIG_DIR= ${WRKSRC} 36DJB_CONFIG_DIR= ${WRKSRC}
37DJB_CONFIG_CMDS= \ 37DJB_CONFIG_CMDS= \
38 ${ECHO} ${PREFIX}/bin > conf-tcpbin; \ 38 ${ECHO} ${PREFIX}/bin > conf-tcpbin; \
39 ${ECHO} > conf-ssl; \ 39 ${ECHO} > conf-ssl; \
40 ${ECHO} ${SSLDIR}/certs > conf-cadir; \ 40 ${ECHO} ${SSLDIR}/certs > conf-cadir; \
41 ${ECHO} ${PKG_SYSCONFDIR}/dh1024.pem > conf-dhfile; \ 41 ${ECHO} ${PKG_SYSCONFDIR}/dh1024.pem > conf-dhfile; \
42 ${ECHO} ${DEFAULT_MEDIUM_CIPHERS} > conf-ciphers; 42 ${ECHO} ${DEFAULT_MEDIUM_CIPHERS} > conf-ciphers;
43 43
44# from `postconf -d | grep tls_medium_cipherlist` 44# from `postconf -d | grep tls_medium_cipherlist`
45DEFAULT_MEDIUM_CIPHERS= aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH 45DEFAULT_MEDIUM_CIPHERS= aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH
46 46
47.include "../../mk/bsd.prefs.mk" 
48 
49CFLAGS+= -I${PREFIX}/include/qlibs 
50LDFLAGS+= -L${PREFIX}/lib/qlibs 
51 
52INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR} 47INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
53 48
54do-install: do-install-sslperl 49do-install: do-install-sslperl
55. for i in ${SSL_SCRIPTS} 50. for i in ${SSL_SCRIPTS}
56 ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin 51 ${INSTALL_SCRIPT} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
57. endfor 52. endfor
58 53
59. for i in ${SSL_PROGRAMS} 54. for i in ${SSL_PROGRAMS}
60 ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin 55 ${INSTALL_PROGRAM} ${WRKSRC}/command/${i} ${DESTDIR}${PREFIX}/bin
61. endfor 56. endfor
62 57
63. for i in ${SSL_MAN1PAGES} 58. for i in ${SSL_MAN1PAGES}
64 ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 59 ${INSTALL_MAN} ${WRKSRC}/man/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
cvs diff -r1.15 -r1.16 pkgsrc/net/ucspi-tcp6/Makefile (expand / switch to unified diff)

--- pkgsrc/net/ucspi-tcp6/Makefile 2019/07/10 11:23:34 1.15
+++ pkgsrc/net/ucspi-tcp6/Makefile 2019/07/10 12:59:54 1.16
@@ -1,36 +1,33 @@ @@ -1,36 +1,33 @@
1# $NetBSD: Makefile,v 1.15 2019/07/10 11:23:34 schmonz Exp $ 1# $NetBSD: Makefile,v 1.16 2019/07/10 12:59:54 schmonz Exp $
2 2
3DISTNAME= ucspi-tcp6-1.10.6 3DISTNAME= ucspi-tcp6-1.10.6
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= https://www.fehcom.de/ipnet/ucspi-tcp6/ 6MASTER_SITES= https://www.fehcom.de/ipnet/ucspi-tcp6/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= https://www.fehcom.de/ipnet/ucspi-tcp6.html 10HOMEPAGE= https://www.fehcom.de/ipnet/ucspi-tcp6.html
11COMMENT= Command-line tools for building TCP client-server applications 11COMMENT= Command-line tools for building TCP client-server applications
12LICENSE= public-domain 12LICENSE= public-domain
13 13
14CONFLICTS+= ucspi-tcp-[0-9]* 14CONFLICTS+= ucspi-tcp-[0-9]*
15 15
16WRKSRC= ${WRKDIR}/net/${PKGBASE}/${DISTNAME} 16WRKSRC= ${WRKDIR}/net/${PKGBASE}/${DISTNAME}
17DJB_SLASHPACKAGE= yes 17DJB_SLASHPACKAGE= yes
18DJB_RESTRICTED= no 18DJB_RESTRICTED= no
19DJB_CONFIG_DIR= ${WRKSRC} 19DJB_CONFIG_DIR= ${WRKSRC}
20 20
21CPPFLAGS+= -I${PREFIX}/include/qlibs 
22LDFLAGS+= -L${PREFIX}/lib/qlibs 
23 
24INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 21INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5
25 22
26post-configure: 23post-configure:
27 ${RUN}cd ${DJB_CONFIG_DIR}; \ 24 ${RUN}cd ${DJB_CONFIG_DIR}; \
28 ${MKDIR} compile; \ 25 ${MKDIR} compile; \
29 ${ECHO} ${DJB_CONFIG_PREFIX}/bin > compile/home 26 ${ECHO} ${DJB_CONFIG_PREFIX}/bin > compile/home
30 27
31do-install: 28do-install:
32 cd ${WRKSRC}; \ 29 cd ${WRKSRC}; \
33 for i in addcr argv0 delcr fixcrio mconnect-io rblsmtpd \ 30 for i in addcr argv0 delcr fixcrio mconnect-io rblsmtpd \
34 recordio tcpclient tcprules tcprulescheck tcpserver; do \ 31 recordio tcpclient tcprules tcprulescheck tcpserver; do \
35 ${INSTALL_PROGRAM} command/$${i} ${DESTDIR}${PREFIX}/bin; \ 32 ${INSTALL_PROGRAM} command/$${i} ${DESTDIR}${PREFIX}/bin; \
36 done; \ 33 done; \