diff options
author | schmonz <schmonz@pkgsrc.org> | 2007-03-09 12:34:21 +0000 |
---|---|---|
committer | schmonz <schmonz@pkgsrc.org> | 2007-03-09 12:34:21 +0000 |
commit | c258cda48bb2ba1781d05060294bb5f47703967f (patch) | |
tree | 7aff6a49435e86f0f075e7b393e6d579b5c07569 /mail/qmail | |
parent | 60e4d4c5a82f42b8f2a295676fefd3b5bfe0f16b (diff) | |
download | pkgsrc-c258cda48bb2ba1781d05060294bb5f47703967f.tar.gz |
Use PLIST_SUBST rather than appending one-line PLIST.foo to PLIST_SRC,
and remove one-line PLIST.foo files. Quote some paths to appease
pkglint. Update URL to "12 Steps to qmail List Bliss".
Diffstat (limited to 'mail/qmail')
-rw-r--r-- | mail/qmail/Makefile | 10 | ||||
-rw-r--r-- | mail/qmail/PLIST | 4 | ||||
-rw-r--r-- | mail/qmail/PLIST.qregex | 2 | ||||
-rw-r--r-- | mail/qmail/PLIST.tls | 2 | ||||
-rw-r--r-- | mail/qmail/files/README.pkgsrc | 2 | ||||
-rw-r--r-- | mail/qmail/options.mk | 14 |
6 files changed, 15 insertions, 19 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 38150cb7dc5..bdcf0983eef 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2007/01/09 21:35:58 rillig Exp $ +# $NetBSD: Makefile,v 1.53 2007/03/09 12:34:21 schmonz Exp $ # DISTNAME= netqmail-1.05 @@ -48,8 +48,6 @@ FILES_SUBST+= QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q} FILES_SUBST+= VIRUSCAN_SIGS_SRCFILE=${VIRUSCAN_SIGS_SRCFILE:Q} FILES_SUBST+= PKGNAME=${PKGNAME:Q} -PLIST_SRC= ${PKGDIR}/PLIST - SETUP_PROGRAMS= dnsfq dnsip dnsptr hostname install ipmeprint SETUP_SCRIPTS= config config-fast @@ -84,9 +82,9 @@ SUBST_MESSAGE.logging= Setting QUEUE_EXTRA. SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/README.pkgsrc -SUBST_SED.paths+= -e 's,@PKGNAME@,${PKGNAME},g' -SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO},g' -SUBST_SED.paths+= -e 's,@GREP@,${GREP},g' +SUBST_SED.paths+= -e 's,@PKGNAME@,${PKGNAME:Q},g' +SUBST_SED.paths+= -e 's,@PKG_INFO@,${PKG_INFO:Q},g' +SUBST_SED.paths+= -e 's,@GREP@,${GREP:Q},g' SUBST_STAGE.paths= post-patch SUBST_FILES.djbware+= cdb_seek.c dns.c diff --git a/mail/qmail/PLIST b/mail/qmail/PLIST index efec5fca05b..59b100365e9 100644 --- a/mail/qmail/PLIST +++ b/mail/qmail/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2004/08/22 00:10:51 schmonz Exp $ +@comment $NetBSD: PLIST,v 1.11 2007/03/09 12:34:22 schmonz Exp $ bin/bouncesaying bin/condredirect bin/datemail @@ -43,6 +43,7 @@ bin/qsmhook bin/sendmail bin/splogger bin/tcp-env +${QMAIL_TLS}bin/update_tmprsadh man/cat1/bouncesaying.0 man/cat1/condredirect.0 man/cat1/except.0 @@ -163,6 +164,7 @@ share/doc/qmail/PIC.relaybad share/doc/qmail/PIC.relaygood share/doc/qmail/PIC.rem2local share/doc/qmail/README.pkgsrc +${QMAIL_QREGEX}share/doc/qmail/README.qregex share/doc/qmail/REMOVE.binmail share/doc/qmail/REMOVE.sendmail share/doc/qmail/SENDMAIL${DARWINSUFX} diff --git a/mail/qmail/PLIST.qregex b/mail/qmail/PLIST.qregex deleted file mode 100644 index 958d5934ccd..00000000000 --- a/mail/qmail/PLIST.qregex +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.qregex,v 1.1 2004/08/22 00:10:52 schmonz Exp $ -share/doc/qmail/README.qregex diff --git a/mail/qmail/PLIST.tls b/mail/qmail/PLIST.tls deleted file mode 100644 index 9568b48162a..00000000000 --- a/mail/qmail/PLIST.tls +++ /dev/null @@ -1,2 +0,0 @@ -@comment $NetBSD: PLIST.tls,v 1.1 2004/08/22 00:10:52 schmonz Exp $ -bin/update_tmprsadh diff --git a/mail/qmail/files/README.pkgsrc b/mail/qmail/files/README.pkgsrc index 87eb6c53ac1..91c8d4cac31 100644 --- a/mail/qmail/files/README.pkgsrc +++ b/mail/qmail/files/README.pkgsrc @@ -27,4 +27,4 @@ installation, your request for help is likely to be better received. It is highly recommended that you read Charles Cazabon's "12 Steps to qmail List Bliss" before posting to the list: -<URL:http://www.qcc.ca/~charlesc/writings/12-steps-to-qmail-list-bliss.html> +<URL:http://pyropus.ca/personal/writings/12-steps-to-qmail-list-bliss.html> diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 531adce9f64..df41d9a3d60 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.25 2007/02/22 19:26:42 wiz Exp $ +# $NetBSD: options.mk,v 1.26 2007/03/09 12:34:22 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_SUPPORTED_OPTIONS+= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns @@ -25,16 +25,14 @@ SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/ PATCH_DIST_STRIP.${BIGDNS_PATCH}= -p1 .endif +PLIST_SUBST+= DARWINSUFX="" .if !empty(PKG_OPTIONS:Mdarwin) DARWIN_PATCH= panther.patch PATCHFILES+= ${DARWIN_PATCH} SITES.${DARWIN_PATCH}= http://http.netdevice.com:9080/qmail/patch/ PATCH_DIST_STRIP.${DARWIN_PATCH}= -p1 -DARWINSUFX= .doc -.else -DARWINSUFX= # empty +PLIST_SUBST+= DARWINSUFX=".doc" .endif -PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q} .if !empty(PKG_OPTIONS:Mqmail-netqmail) NETQMAIL_PATCH= netqmail-1.05.tar.gz @@ -50,12 +48,13 @@ PATCHFILES+= ${OUTGOINGIP_PATCH} SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ .endif +PLIST_SUBST+= QMAIL_QREGEX="@comment " .if !empty(PKG_OPTIONS:Mqmail-qregex) QREGEX_PATCH= qregex-20060423.patch PATCHFILES+= ${QREGEX_PATCH} SITES.${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/ PATCH_DIST_STRIP.${QREGEX_PATCH}= -p3 -PLIST_SRC+= ${PKGDIR}/PLIST.qregex +PLIST_SUBST+= QMAIL_QREGEX="" .endif .if !empty(PKG_OPTIONS:Mqmail-realrcptto) @@ -65,6 +64,7 @@ SITES.${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/ PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1 .endif +PLIST_SUBST+= QMAIL_TLS="@comment " .if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls) . if empty(PKG_OPTIONS:Msasl) PKG_OPTIONS+= sasl @@ -77,7 +77,7 @@ SITES.${TLSSASL_PATCH}= http://shupp.org/patches/ CFLAGS+= -DTLS=20060104 # NOTE: update according to the patch DJB_INSTALL_TARGETS= cert tmprsadh USE_TOOLS+= gmake -PLIST_SRC+= ${PKGDIR}/PLIST.tls +PLIST_SUBST+= QMAIL_TLS="" . endif .endif |