CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Thu Jan 17 22:49:12 UTC 2019

Modified Files:
        pkgsrc/mail/qmail: Makefile options.mk

Log Message:
Apply the "tai-leapsecs" patch iff the 'tai-system-clock' option is set
(off by default). Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.61 -r1.62 pkgsrc/mail/qmail/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.108 pkgsrc/mail/qmail/Makefile:1.109
--- pkgsrc/mail/qmail/Makefile:1.108    Wed Jan  9 19:32:07 2019
+++ pkgsrc/mail/qmail/Makefile  Thu Jan 17 22:49:12 2019
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.108 2019/01/09 19:32:07 schmonz Exp $
+# $NetBSD: Makefile,v 1.109 2019/01/17 22:49:12 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           43
+PKGREVISION=           44
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/
 
@@ -13,8 +13,6 @@ COMMENT=              Secure, reliable, efficient, s
 LICENSE=               public-domain
 
 DEPENDS+=              daemontools-[0-9]*:../../sysutils/daemontools
-DEPENDS_LIBTAI=                libtai>=0.60nb5:../../devel/libtai
-DEPENDS+=              ${DEPENDS_LIBTAI}
 
 CONFLICTS+=            courier-maildirmake-[0-9]*
 CONFLICTS+=            courier-mta-[0-9]*
@@ -78,19 +76,6 @@ INSTALLATION_DIRS+=  ${EGDIR}/users
 
 .include "../../mk/bsd.prefs.mk"
 
-# Detect the PKG_SYSCONFDIR of the installed libtai, so we can find
-# its leapsecs.dat.
-
-.if !defined(PKG_SYSCONFDIR.libtai)
-PKG_SYSCONFDIR.libtai!=                                                        \
-       ${PKG_INFO} -Q PKG_SYSCONFDIR                                   \
-               ${DEPENDS_LIBTAI:C/:.*$//:Q} 2>/dev/null ||             \
-       ${ECHO} "PKG_SYSCONFDIR.libtai_not_set"
-.  if empty(PKG_SYSCONFDIR.libtai:M*not_set)
-MAKEVARS+=     PKG_SYSCONFDIR.libtai
-.  endif
-.endif
-
 BUILD_DEFS+=           QMAILDIR QMAILPATCHES QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
 BUILD_DEFS+=           QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
 BUILD_DEFS+=           QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
@@ -137,11 +122,6 @@ SUBST_STAGE.paths= do-configure
 SUBST_FILES.paths=     README.*
 SUBST_VARS.paths=      PKGNAME PKG_INFO PREFIX GREP
 
-SUBST_CLASSES+=                libtai
-SUBST_STAGE.libtai=    do-configure
-SUBST_FILES.libtai=    leapsecs_read.c
-SUBST_SED.libtai=      -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
-
 SUBST_FILES.djbware+=  cdb_seek.c dns.c
 
 PKG_USERS_VARS+=       QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
@@ -220,15 +200,6 @@ PATCH_DIST_CAT.${SPP_PATCH}=       ${TAR} -C $
 PATCH_DIST_STRIP.${SPP_PATCH}= -p1
 LICENSE+=                      AND gnu-gpl-v2
 
-QMAILPATCHES+=                 taileapsecs:${TAILEAPSECS_PATCH}
-TAILEAPSECS_PATCH=             netqmail-1.05-TAI-leapsecs.patch
-PATCHFILES+=                   ${TAILEAPSECS_PATCH}
-SITES.${TAILEAPSECS_PATCH}=    https://su.bze.ro/software/
-PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1
-PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
-                               ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
-                               < ${TAILEAPSECS_PATCH}
-
 post-extract:
        for i in ${READMES}; do                                         \
                ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE};             \

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.61 pkgsrc/mail/qmail/options.mk:1.62
--- pkgsrc/mail/qmail/options.mk:1.61   Wed Jan  9 19:32:07 2019
+++ pkgsrc/mail/qmail/options.mk        Thu Jan 17 22:49:12 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.61 2019/01/09 19:32:07 schmonz Exp $
+# $NetBSD: options.mk,v 1.62 2019/01/17 22:49:12 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
-PKG_SUPPORTED_OPTIONS+=                eai inet6 pam syncdir tls
+PKG_SUPPORTED_OPTIONS+=                eai inet6 pam syncdir tai-system-clock tls
 PKG_SUPPORTED_OPTIONS+=                qmail-customerror qmail-srs
 PKG_SUGGESTED_OPTIONS+=                eai syncdir tls
 PKG_SUGGESTED_OPTIONS+=                qmail-customerror qmail-srs
@@ -76,6 +76,32 @@ SUBST_SED.load+=             -e '$$s|$$| -bind_at_l
 SUBST_MESSAGE.load=            Setting linker flags for syncdir.
 .endif
 
+.if !empty(PKG_OPTIONS:Mtai-system-clock)
+QMAILPATCHES+=                 taileapsecs:${TAILEAPSECS_PATCH}
+TAILEAPSECS_PATCH=             netqmail-1.05-TAI-leapsecs.patch
+PATCHFILES+=                   ${TAILEAPSECS_PATCH}
+SITES.${TAILEAPSECS_PATCH}=    https://su.bze.ro/software/
+PATCH_DIST_STRIP.${TAILEAPSECS_PATCH}=-p1
+PATCH_DIST_CAT.${TAILEAPSECS_PATCH}= \
+                               ${SED} -e 's|"/etc/leapsecs.dat"|"@PKG_SYSCONFDIR@/leapsecs.dat"|' \
+                               < ${TAILEAPSECS_PATCH}
+SUBST_CLASSES+=                        libtai
+SUBST_STAGE.libtai=            do-configure
+SUBST_FILES.libtai=            leapsecs_read.c
+SUBST_SED.libtai=              -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR.libtai}|g'
+DEPENDS_LIBTAI=                        libtai>=0.60nb5:../../devel/libtai
+DEPENDS+=                      ${DEPENDS_LIBTAI}
+.  if !defined(PKG_SYSCONFDIR.libtai)
+PKG_SYSCONFDIR.libtai!=                                                        \
+       ${PKG_INFO} -Q PKG_SYSCONFDIR                                   \
+               ${DEPENDS_LIBTAI:C/:.*$//:Q} 2>/dev/null ||             \
+       ${ECHO} "PKG_SYSCONFDIR.libtai_not_set"
+.    if empty(PKG_SYSCONFDIR.libtai:M*not_set)
+MAKEVARS+=     PKG_SYSCONFDIR.libtai
+.    endif
+.  endif
+.endif
+
 PLIST_VARS+=                   tls
 .if !empty(PKG_OPTIONS:Mtls)
 PLIST.tls=                     yes
@@ -99,9 +125,9 @@ DEPENDS+=                    ucspi-ssl-[0-9]*:../../net/u
 .else
 BUILDLINK_TRANSFORM+=          rm:-lssl
 BUILDLINK_TRANSFORM+=          rm:-lcrypto
-.if !empty(PKG_OPTIONS:Minet6)
+.  if !empty(PKG_OPTIONS:Minet6)
 DEPENDS+=                      ucspi-tcp6-[0-9]*:../../net/ucspi-tcp6
-.else
+.  else
 DEPENDS+=                      {ucspi-tcp6-[0-9]*,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
-.endif
+.  endif
 .endif