From 4a5da2a935eda27d53839a3813bdec2ea2ad25a3 Mon Sep 17 00:00:00 2001 From: schmonz Date: Fri, 30 May 2014 21:35:04 +0000 Subject: Improve binary package: * Reduce potential patch conflicts by switching more DESTDIR support to sed * Enable `qmail-netqmail` by default * Install `qmail-viruscan` signatures via CONF_FILES * With `tls` option, don't generate cert, instruct the user at INSTALL time That last change also fixes the source build with `tls` enabled on systems that don't already have a /var/qmail/control, as reported by Thomas Lazar on pkgsrc-users@. While here, add a comment with the new location of the qregex patch. Since it's named strangely, I've also placed a traditionally-named copy on ftp.n.o. Bump PKGREVISION. --- mail/qmail/INSTALL | 27 +++++++++++++++-------- mail/qmail/Makefile | 16 +++++++++----- mail/qmail/PLIST | 3 ++- mail/qmail/distinfo | 4 ++-- mail/qmail/options.mk | 32 ++++++++++++++++++++++----- mail/qmail/patches/patch-Makefile | 46 ++++++--------------------------------- 6 files changed, 66 insertions(+), 62 deletions(-) (limited to 'mail/qmail') diff --git a/mail/qmail/INSTALL b/mail/qmail/INSTALL index 80dadac1ef9..89b4a5dcd66 100644 --- a/mail/qmail/INSTALL +++ b/mail/qmail/INSTALL @@ -1,12 +1,12 @@ -# $NetBSD: INSTALL,v 1.5 2011/06/07 02:53:42 schmonz Exp $ +# $NetBSD: INSTALL,v 1.6 2014/05/30 21:35:04 schmonz Exp $ DOCDIR=@DOCDIR@ EGDIR=@EGDIR@ +OPENSSL=@OPENSSL@ PKGMANDIR=@PKGMANDIR@ QMAILDIR=@QMAILDIR@ QMAIL_QUEUE_DIR=@QMAIL_QUEUE_DIR@ QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@ -VIRUSCAN_SIGS_SRCFILE=@VIRUSCAN_SIGS_SRCFILE@ VAR_QMAIL_DIRS="alias bin boot control doc man queue users" @@ -65,14 +65,23 @@ QUEUE_EXTRA. =========================================================================== EOF fi - if ! [ -z ${VIRUSCAN_SIGS_SRCFILE} ] && \ - ! [ -s ${PKG_SYSCONFDIR}/control/signatures ]; then - ${SED} -e '1,15d' -e '34,$d' \ - < ${VIRUSCAN_SIGS_SRCFILE} \ - > ${PKG_SYSCONFDIR}/control/signatures - ${CHMOD} 644 ${PKG_SYSCONFDIR}/control/signatures - fi + SERVERCERT=${PKG_SYSCONFDIR}/control/servercert.pem + if ! [ -z ${OPENSSL} ] && ! [ -s ${SERVERCERT} ]; then + ${CAT} < ${WRKSRC}/signatures + ${CHMOD} 644 ${WRKSRC}/signatures +post-install-viruscan: + ${INSTALL_DATA} ${WRKSRC}/signatures ${DESTDIR}/${EGDIR}/control +. for i in control/signatures +CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/${i} +. endfor .else -VIRUSCAN_SIGS_SRCFILE= # undefined +post-extract-viruscan: + ${DO_NADA} +post-install-viruscan: + ${DO_NADA} .endif diff --git a/mail/qmail/patches/patch-Makefile b/mail/qmail/patches/patch-Makefile index 7b83da9c127..07c835b43b8 100644 --- a/mail/qmail/patches/patch-Makefile +++ b/mail/qmail/patches/patch-Makefile @@ -1,12 +1,12 @@ -$NetBSD: patch-Makefile,v 1.1 2013/08/15 15:43:48 schmonz Exp $ +$NetBSD: patch-Makefile,v 1.2 2014/05/30 21:35:04 schmonz Exp $ DESTDIR support. --- Makefile.orig 1998-06-15 10:53:16.000000000 +0000 +++ Makefile -@@ -78,6 +78,14 @@ auto_break.o: \ - compile auto_break.c - ./compile auto_break.c +@@ -4,6 +4,14 @@ SHELL=/bin/sh + + default: it +auto_destdir.c: \ +auto-str conf-destdir @@ -16,38 +16,6 @@ DESTDIR support. +compile auto_destdir.c + ./compile auto_destdir.c + - auto_patrn.c: \ - auto-int8 conf-patrn - ./auto-int8 auto_patrn `head -1 conf-patrn` > auto_patrn.c -@@ -740,15 +748,15 @@ seek.h fork.h - ./compile idedit.c - - install: \ --load install.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ -+load install.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ - strerr.a substdio.a open.a error.a str.a fs.a -- ./load install fifo.o hier.o auto_qmail.o auto_split.o \ -+ ./load install fifo.o hier.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a - - install-big: \ --load install-big.o fifo.o install.o auto_qmail.o auto_split.o \ -+load install-big.o fifo.o install.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a open.a error.a str.a fs.a -- ./load install-big fifo.o install.o auto_qmail.o \ -+ ./load install-big fifo.o install.o auto_destdir.o \ - auto_split.o auto_uids.o strerr.a substdio.a open.a error.a \ - str.a fs.a - -@@ -763,9 +771,9 @@ exit.h - ./compile install.c - - instcheck: \ --load instcheck.o fifo.o hier.o auto_qmail.o auto_split.o auto_uids.o \ -+load instcheck.o fifo.o hier.o auto_destdir.o auto_split.o auto_uids.o \ - strerr.a substdio.a error.a str.a fs.a -- ./load instcheck fifo.o hier.o auto_qmail.o auto_split.o \ -+ ./load instcheck fifo.o hier.o auto_destdir.o auto_split.o \ - auto_uids.o strerr.a substdio.a error.a str.a fs.a - - instcheck.o: \ + addresses.0: \ + addresses.5 + nroff -man addresses.5 > addresses.0 -- cgit v1.2.3