Wed Jun 19 17:46:39 2019 UTC ()
Keep it simple: libtai does not futz with PKG_SYSCONFSUBDIR.


(schmonz)
diff -r1.63 -r1.64 pkgsrc/mail/qmail/options.mk
cvs diff -r1.63 -r1.64 pkgsrc/mail/qmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/qmail/options.mk 2019/04/10 22:24:57 1.63
+++ pkgsrc/mail/qmail/options.mk 2019/06/19 17:46:39 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.63 2019/04/10 22:24:57 schmonz Exp $ 1# $NetBSD: options.mk,v 1.64 2019/06/19 17:46:39 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls 4PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tai-system-clock tls
5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs 5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs
6PKG_SUGGESTED_OPTIONS+= eai syncdir tls 6PKG_SUGGESTED_OPTIONS+= eai syncdir tls
7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs 7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Meai) 11.if !empty(PKG_OPTIONS:Meai)
12. include "../../devel/libidn2/buildlink3.mk" 12. include "../../devel/libidn2/buildlink3.mk"
13QMAILPATCHES+= eai:${EAI_PATCH} 13QMAILPATCHES+= eai:${EAI_PATCH}
14EAI_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch 14EAI_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch
@@ -79,37 +79,27 @@ SUBST_MESSAGE.load= Setting linker flag @@ -79,37 +79,27 @@ SUBST_MESSAGE.load= Setting linker flag
79.if !empty(PKG_OPTIONS:Mtai-system-clock) 79.if !empty(PKG_OPTIONS:Mtai-system-clock)
80QMAILPATCHES+= taileapsecs:${TAILEAPSECS_PATCH} 80QMAILPATCHES+= taileapsecs:${TAILEAPSECS_PATCH}
81TAILEAPSECS_PATCH= netqmail-1.05-TAI-leapsecs.patch 81TAILEAPSECS_PATCH= netqmail-1.05-TAI-leapsecs.patch
82PATCHFILES+= ${TAILEAPSECS_PATCH} 82PATCHFILES+= ${TAILEAPSECS_PATCH}
83SITES.${TAILEAPSECS_PATCH}= https://su.bze.ro/software/ 83SITES.${TAILEAPSECS_PATCH}= https://su.bze.ro/software/
84PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1 84PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1
85PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \ 85PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
86 ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \ 86 ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
87 < ${TAILEAPSECS_PATCH} 87 < ${TAILEAPSECS_PATCH}
88SUBST_CLASSES+= libtai 88SUBST_CLASSES+= libtai
89SUBST_STAGE.libtai= do-configure 89SUBST_STAGE.libtai= do-configure
90SUBST_FILES.libtai= leapsecs_read.c 90SUBST_FILES.libtai= leapsecs_read.c
91SUBST_SED.libtai= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g' 91SUBST_SED.libtai= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
92DEPENDS_LIBTAI= libtai>=0.60nb5:../../devel/libtai 92DEPENDS+= libtai>=0.60nb5:../../devel/libtai
93DEPENDS+= ${DEPENDS_LIBTAI} 
94. if !defined(PKG_SYSCONFDIR.libtai) 
95PKG_SYSCONFDIR.libtai!= \ 
96 ${PKG_INFO} -Q PKG_SYSCONFDIR \ 
97 ${DEPENDS_LIBTAI:C/:.*$//:Q} 2>/dev/null || \ 
98 ${ECHO} "PKG_SYSCONFDIR.libtai_not_set" 
99. if empty(PKG_SYSCONFDIR.libtai:M*not_set) 
100MAKEVARS+= PKG_SYSCONFDIR.libtai 
101. endif 
102. endif 
103.endif 93.endif
104 94
105PLIST_VARS+= tls 95PLIST_VARS+= tls
106.if !empty(PKG_OPTIONS:Mtls) 96.if !empty(PKG_OPTIONS:Mtls)
107PLIST.tls= yes 97PLIST.tls= yes
108. include "../../security/openssl/buildlink3.mk" 98. include "../../security/openssl/buildlink3.mk"
109CFLAGS+= -DTLS=20190408 # NOTE: match what's _in_ the patch 99CFLAGS+= -DTLS=20190408 # NOTE: match what's _in_ the patch
110USE_TOOLS+= openssl 100USE_TOOLS+= openssl
111SUBST_CLASSES+= tmprsadh 101SUBST_CLASSES+= tmprsadh
112SUBST_STAGE.tmprsadh= do-configure 102SUBST_STAGE.tmprsadh= do-configure
113SUBST_FILES.tmprsadh= update_tmprsadh.sh 103SUBST_FILES.tmprsadh= update_tmprsadh.sh
114SUBST_SED.tmprsadh= -e 's|^export PATH=.*||' 104SUBST_SED.tmprsadh= -e 's|^export PATH=.*||'
115SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |' 105SUBST_SED.tmprsadh+= -e 's|^openssl |${OPENSSL} |'