CVS commit: pkgsrc/mail/qmail

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Dec  4 17:01:39 UTC 2018

Modified Files:
        pkgsrc/mail/qmail: DEINSTALL INSTALL Makefile

Log Message:
Take responsibility from qmail-run for creating and removing the basic
config files and aliases. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/mail/qmail/DEINSTALL
cvs rdiff -u -r1.13 -r1.14 pkgsrc/mail/qmail/INSTALL
cvs rdiff -u -r1.103 -r1.104 pkgsrc/mail/qmail/Makefile

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/DEINSTALL
diff -u pkgsrc/mail/qmail/DEINSTALL:1.6 pkgsrc/mail/qmail/DEINSTALL:1.7
--- pkgsrc/mail/qmail/DEINSTALL:1.6     Wed Nov 14 16:43:17 2018
+++ pkgsrc/mail/qmail/DEINSTALL Tue Dec  4 17:01:39 2018
@@ -1,6 +1,7 @@
-# $NetBSD: DEINSTALL,v 1.6 2018/11/14 16:43:17 schmonz Exp $
+# $NetBSD: DEINSTALL,v 1.7 2018/12/04 17:01:39 schmonz Exp $
 
 QMAILDIR=@QMAILDIR@
+QMAIL_QUEUE_EXTRA=@QMAIL_QUEUE_EXTRA@
 
 VAR_QMAIL_DIRS="alias bin boot control doc man queue users"
 
@@ -8,9 +9,12 @@ case "${STAGE}" in
 
 DEINSTALL)
        cd ${PKG_SYSCONFDIR}
-       for i in postmaster mailer-daemon root; do
-               [ -s alias/.qmail-${i} ] \
-                       || ${RM} -f alias/.qmail-${i}
+       for i in mailer-daemon postmaster root ${QMAIL_QUEUE_EXTRA}; do
+               contents=$(${CAT} alias/.qmail-${i})
+               if [ "${contents}" = '# pkgsrc says: replace this comment with your config' ] \
+                       || [ "${contents}" = '' ]; then
+                       ${RM} -f alias/.qmail-${i}
+               fi
        done
        for i in defaultdomain locals me plusdomain rcpthosts; do
                ${CMP} -s control/${i} .pkgsrc-defaults-do-not-edit/${i} \

Index: pkgsrc/mail/qmail/INSTALL
diff -u pkgsrc/mail/qmail/INSTALL:1.13 pkgsrc/mail/qmail/INSTALL:1.14
--- pkgsrc/mail/qmail/INSTALL:1.13      Sun Nov 25 16:15:53 2018
+++ pkgsrc/mail/qmail/INSTALL   Tue Dec  4 17:01:39 2018
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.13 2018/11/25 16:15:53 schmonz Exp $
+# $NetBSD: INSTALL,v 1.14 2018/12/04 17:01:39 schmonz Exp $
 
 DOCDIR=@DOCDIR@
 EGDIR=@EGDIR@
@@ -109,17 +109,26 @@ EOF
                exit 1
        fi
 
-       if ! [ -z ${QMAIL_QUEUE_EXTRA} ]; then
-               ${CAT} <<EOF
-===========================================================================
+       cd ${PREFIX}/share/qmail/setup && ./config-fast-pkgsrc `./hostname`
 
-NOTE: Before using qmail, create a .qmail file corresponding with the local
-user or alias "${QMAIL_QUEUE_EXTRA}" that meets the requirements for
-QUEUE_EXTRA.
+       cd ${PKG_SYSCONFDIR}/.pkgsrc-defaults-do-not-edit
+       for i in locals rcpthosts; do
+               ${SORT} -u ${i} > ${i}.tmp && ${MV} ${i}.tmp ${i}
+       done
 
-===========================================================================
-EOF
-       fi
+       cd ${PKG_SYSCONFDIR}
+       for i in defaultdomain locals me plusdomain rcpthosts; do
+               [ -f control/${i} ] \
+                       || ${CP} .pkgsrc-defaults-do-not-edit/${i} control
+       done
+
+       cd ${PKG_SYSCONFDIR}/alias
+       for i in mailer-daemon postmaster root ${QMAIL_QUEUE_EXTRA}; do
+               [ -s .qmail-${i} ] \
+                       || ${ECHO} '# pkgsrc says: replace this comment with your config' \
+                       > .qmail-${i}
+               ${CHMOD} 644 .qmail-${i}
+       done
 
        ;;
 

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.103 pkgsrc/mail/qmail/Makefile:1.104
--- pkgsrc/mail/qmail/Makefile:1.103    Wed Nov 14 16:43:17 2018
+++ pkgsrc/mail/qmail/Makefile  Tue Dec  4 17:01:39 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.103 2018/11/14 16:43:17 schmonz Exp $
+# $NetBSD: Makefile,v 1.104 2018/12/04 17:01:39 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
 PKGNAME=               qmail-1.03
-PKGREVISION=           41
+PKGREVISION=           42
 CATEGORIES=            mail
 MASTER_SITES=          http://qmail.org/