[pkgsrc/trunk]: pkgsrc/mail/queue-repair Don't remove top-level symlink to qu...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7f3a64babb10
branches:  trunk
changeset: 310775:7f3a64babb10
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Tue Jul 24 08:23:00 2018 +0000

description:
Don't remove top-level symlink to queue (as found in mail/qmail). Run
under Python 3. Honor mk.conf paths, users, and groups for qmail. Set
LICENSE. Bump PKGREVISION.

diffstat:

 mail/queue-repair/MESSAGE  |   8 --------
 mail/queue-repair/Makefile |  39 ++++++++++++++++++++++++++++++++++++---
 mail/queue-repair/distinfo |   6 +++++-
 3 files changed, 41 insertions(+), 12 deletions(-)

diffs (84 lines):

diff -r 6ee5cf2c103f -r 7f3a64babb10 mail/queue-repair/MESSAGE
--- a/mail/queue-repair/MESSAGE Tue Jul 24 08:02:10 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2006/12/29 06:44:00 schmonz Exp $
-
-This package is incompatible with mail/qmail, as it does not follow
-symlinks properly. Use it only with non-pkgsrc qmail installations.
-Otherwise, try mail/queue-fix instead.
-
-===========================================================================
diff -r 6ee5cf2c103f -r 7f3a64babb10 mail/queue-repair/Makefile
--- a/mail/queue-repair/Makefile        Tue Jul 24 08:02:10 2018 +0000
+++ b/mail/queue-repair/Makefile        Tue Jul 24 08:23:00 2018 +0000
@@ -1,18 +1,51 @@
-# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2018/07/24 08:23:00 schmonz Exp $
 #
 
 DISTNAME=              queue-repair-0.9.0
-PKGREVISION=           6
+PKGREVISION=           7
 CATEGORIES=            mail
 MASTER_SITES=          ${HOMEPAGE}
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://pyropus.ca/software/queue-repair/
 COMMENT=               Check or correct most corruptions of the queue in qmail
+LICENSE=               gnu-gpl-v2
+
+SYMLINK3_PATCH=                queue-repair-0.9.0-symlink3-20180724.patch
+PATCHFILES+=           ${SYMLINK3_PATCH}
+SITES.${SYMLINK3_PATCH}=https://schmonz.com/qmail/queuerepairsymlink3/
+
+REPLACE_PYTHON=                queue_repair.py
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     do-configure
+SUBST_FILES.paths=     queue_repair.py
+SUBST_SED.paths=       -e "s|'/var/qmail'|'${QMAILDIR}'|g"
+
+SUBST_CLASSES+=                users
+SUBST_STAGE.users=     do-configure
+SUBST_FILES.users=     queue_repair.py
+SUBST_SED.users=       -e "s|'alias'|'${QMAIL_ALIAS_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmaild'|'${QMAIL_DAEMON_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmaill'|'${QMAIL_LOG_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmailp'|'${QMAIL_PASSWD_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmailq'|'${QMAIL_QUEUE_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmailr'|'${QMAIL_REMOTE_USER}'|g"
+SUBST_SED.users+=      -e "s|'qmails'|'${QMAIL_SEND_USER}'|g"
+
+SUBST_CLASSES+=                groups
+SUBST_STAGE.groups=    do-configure
+SUBST_FILES.groups=    queue_repair.py
+SUBST_SED.groups=      -e "s|'qmail'|'${QMAIL_QMAIL_GROUP}'|g"
+SUBST_SED.groups+=     -e "s|'nofiles'|'${QMAIL_NOFILES_GROUP}'|g"
+
+BUILD_DEFS+=           QMAILDIR QMAIL_ALIAS_USER QMAIL_DAEMON_USER
+BUILD_DEFS+=           QMAIL_LOG_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
+BUILD_DEFS+=           QMAIL_REMOTE_USER QMAIL_SEND_USER
+BUILD_DEFS+=           QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP
 
 NO_BUILD=              YES
 
-REPLACE_PYTHON=        queue_repair.py
 INSTALLATION_DIRS=     bin
 
 do-install:
diff -r 6ee5cf2c103f -r 7f3a64babb10 mail/queue-repair/distinfo
--- a/mail/queue-repair/distinfo        Tue Jul 24 08:02:10 2018 +0000
+++ b/mail/queue-repair/distinfo        Tue Jul 24 08:23:00 2018 +0000
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.2 2015/11/03 23:27:18 agc Exp $
+$NetBSD: distinfo,v 1.3 2018/07/24 08:23:00 schmonz Exp $
 
+SHA1 (queue-repair-0.9.0-symlink3-20180724.patch) = 621db690a83497967e04631e6e1017b361c167bb
+RMD160 (queue-repair-0.9.0-symlink3-20180724.patch) = 39682df382ebbdd2a5a88a0422dbeb0f1604949e
+SHA512 (queue-repair-0.9.0-symlink3-20180724.patch) = 89277a341341a8dfe8f6c5a440f8414c68a5515d8134bf826acad38d84757285fd358be44ca311995bf3a388db0c5ddb48ed82c31084f24630e1045ca99b0ed1
+Size (queue-repair-0.9.0-symlink3-20180724.patch) = 10205 bytes
 SHA1 (queue-repair-0.9.0.tar.gz) = 123a9034c2fbbda7ca7c193153d67c4837909e56
 RMD160 (queue-repair-0.9.0.tar.gz) = 7634105825299e5d2314c819d7eb3260a3bdb2b3
 SHA512 (queue-repair-0.9.0.tar.gz) = b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f