Sun Mar 24 20:10:31 2013 UTC ()
qmail-smtpd-viruscan-logging.patch disappeared (reported by Nathan
Arthur). Put a copy up on ${MASTER_SITE_LOCAL}.


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

--- pkgsrc/mail/qmail/options.mk 2011/06/07 02:53:42 1.31
+++ pkgsrc/mail/qmail/options.mk 2013/03/24 20:10:31 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.31 2011/06/07 02:53:42 schmonz Exp $ 1# $NetBSD: options.mk,v 1.32 2013/03/24 20:10:31 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_OPTIONS_OPTIONAL_GROUPS= rcpt 4PKG_OPTIONS_OPTIONAL_GROUPS= rcpt
5PKG_OPTIONS_GROUP.rcpt= qmail-badrcptto qmail-qregex qmail-realrcptto 5PKG_OPTIONS_GROUP.rcpt= qmail-badrcptto qmail-qregex qmail-realrcptto
6PKG_SUPPORTED_OPTIONS+= sasl syncdir tls qmail-bigdns qmail-netqmail 6PKG_SUPPORTED_OPTIONS+= sasl syncdir tls qmail-bigdns qmail-netqmail
7PKG_SUPPORTED_OPTIONS+= qmail-outgoingip qmail-viruscan 7PKG_SUPPORTED_OPTIONS+= qmail-outgoingip qmail-viruscan
8 8
9.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
10 10
11.if !empty(PKG_OPTIONS:Mqmail-badrcptto) 11.if !empty(PKG_OPTIONS:Mqmail-badrcptto)
12BADRCPTTO_PATCH= badrcptto.patch 12BADRCPTTO_PATCH= badrcptto.patch
13PATCHFILES+= ${BADRCPTTO_PATCH} 13PATCHFILES+= ${BADRCPTTO_PATCH}
14SITES.${BADRCPTTO_PATCH}= http://patch.be/qmail/ 14SITES.${BADRCPTTO_PATCH}= http://patch.be/qmail/
@@ -72,24 +72,24 @@ SUBST_STAGE.load= do-configure @@ -72,24 +72,24 @@ SUBST_STAGE.load= do-configure
72SUBST_FILES.load= make-load.sh 72SUBST_FILES.load= make-load.sh
73SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|' 73SUBST_SED.load= -e '$$s|$$| ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.syncdir}/lib -L${BUILDLINK_PREFIX.syncdir}/lib \-lsyncdir|'
74. if ${OPSYS} == "Darwin" 74. if ${OPSYS} == "Darwin"
75SUBST_SED.load+= -e '$$s|$$| -bind_at_load|' 75SUBST_SED.load+= -e '$$s|$$| -bind_at_load|'
76. endif 76. endif
77SUBST_MESSAGE.load= Setting linker flags for syncdir. 77SUBST_MESSAGE.load= Setting linker flags for syncdir.
78.endif 78.endif
79 79
80.if !empty(PKG_OPTIONS:Mqmail-viruscan) 80.if !empty(PKG_OPTIONS:Mqmail-viruscan)
81VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch 81VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch
82VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch 82VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch
83PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH} 83PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
84SITES.${VIRUSCAN_PATCH}= http://www.qmail.org/ 84SITES.${VIRUSCAN_PATCH}= http://www.qmail.org/
85SITES.${VIRUSCAN_LOG_PATCH}= http://scriptkitchen.com/qmail/ 85SITES.${VIRUSCAN_LOG_PATCH}= ${MASTER_SITE_LOCAL}
86PATCH_DIST_STRIP.${VIRUSCAN_PATCH}= -p1 86PATCH_DIST_STRIP.${VIRUSCAN_PATCH}= -p1
87PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}= -p1 87PATCH_DIST_STRIP.${VIRUSCAN_LOG_PATCH}= -p1
88SUBST_CLASSES+= viruscan 88SUBST_CLASSES+= viruscan
89SUBST_STAGE.viruscan= do-configure 89SUBST_STAGE.viruscan= do-configure
90SUBST_FILES.viruscan= qmail-smtpd.c 90SUBST_FILES.viruscan= qmail-smtpd.c
91SUBST_SED.viruscan= -e 's|qmail-smtpd: ||g' 91SUBST_SED.viruscan= -e 's|qmail-smtpd: ||g'
92VIRUSCAN_SIGS_SRCFILE= ${DISTDIR}/${VIRUSCAN_PATCH} 92VIRUSCAN_SIGS_SRCFILE= ${DISTDIR}/${VIRUSCAN_PATCH}
93.else 93.else
94VIRUSCAN_SIGS_SRCFILE= # undefined 94VIRUSCAN_SIGS_SRCFILE= # undefined
95.endif 95.endif