Tue Jul 24 08:23:00 2018 UTC ()
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.


(schmonz)
diff -r1.1 -r0 pkgsrc/mail/queue-repair/MESSAGE
diff -r1.10 -r1.11 pkgsrc/mail/queue-repair/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/queue-repair/distinfo
File Deleted: pkgsrc/mail/queue-repair/Attic/MESSAGE
cvs diff -r1.10 -r1.11 pkgsrc/mail/queue-repair/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/queue-repair/Makefile 2014/05/17 16:10:46 1.10
+++ pkgsrc/mail/queue-repair/Makefile 2018/07/24 08:23:00 1.11
@@ -1,23 +1,56 @@ @@ -1,23 +1,56 @@
1# $NetBSD: Makefile,v 1.10 2014/05/17 16:10:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.11 2018/07/24 08:23:00 schmonz Exp $
2# 2#
3 3
4DISTNAME= queue-repair-0.9.0 4DISTNAME= queue-repair-0.9.0
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${HOMEPAGE} 7MASTER_SITES= ${HOMEPAGE}
8 8
9MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
10HOMEPAGE= http://pyropus.ca/software/queue-repair/ 10HOMEPAGE= http://pyropus.ca/software/queue-repair/
11COMMENT= Check or correct most corruptions of the queue in qmail 11COMMENT= Check or correct most corruptions of the queue in qmail
 12LICENSE= gnu-gpl-v2
 13
 14SYMLINK3_PATCH= queue-repair-0.9.0-symlink3-20180724.patch
 15PATCHFILES+= ${SYMLINK3_PATCH}
 16SITES.${SYMLINK3_PATCH}=https://schmonz.com/qmail/queuerepairsymlink3/
 17
 18REPLACE_PYTHON= queue_repair.py
 19
 20SUBST_CLASSES+= paths
 21SUBST_STAGE.paths= do-configure
 22SUBST_FILES.paths= queue_repair.py
 23SUBST_SED.paths= -e "s|'/var/qmail'|'${QMAILDIR}'|g"
 24
 25SUBST_CLASSES+= users
 26SUBST_STAGE.users= do-configure
 27SUBST_FILES.users= queue_repair.py
 28SUBST_SED.users= -e "s|'alias'|'${QMAIL_ALIAS_USER}'|g"
 29SUBST_SED.users+= -e "s|'qmaild'|'${QMAIL_DAEMON_USER}'|g"
 30SUBST_SED.users+= -e "s|'qmaill'|'${QMAIL_LOG_USER}'|g"
 31SUBST_SED.users+= -e "s|'qmailp'|'${QMAIL_PASSWD_USER}'|g"
 32SUBST_SED.users+= -e "s|'qmailq'|'${QMAIL_QUEUE_USER}'|g"
 33SUBST_SED.users+= -e "s|'qmailr'|'${QMAIL_REMOTE_USER}'|g"
 34SUBST_SED.users+= -e "s|'qmails'|'${QMAIL_SEND_USER}'|g"
 35
 36SUBST_CLASSES+= groups
 37SUBST_STAGE.groups= do-configure
 38SUBST_FILES.groups= queue_repair.py
 39SUBST_SED.groups= -e "s|'qmail'|'${QMAIL_QMAIL_GROUP}'|g"
 40SUBST_SED.groups+= -e "s|'nofiles'|'${QMAIL_NOFILES_GROUP}'|g"
 41
 42BUILD_DEFS+= QMAILDIR QMAIL_ALIAS_USER QMAIL_DAEMON_USER
 43BUILD_DEFS+= QMAIL_LOG_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
 44BUILD_DEFS+= QMAIL_REMOTE_USER QMAIL_SEND_USER
 45BUILD_DEFS+= QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP
12 46
13NO_BUILD= YES 47NO_BUILD= YES
14 48
15REPLACE_PYTHON= queue_repair.py 
16INSTALLATION_DIRS= bin 49INSTALLATION_DIRS= bin
17 50
18do-install: 51do-install:
19 ${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py \ 52 ${INSTALL_SCRIPT} ${WRKSRC}/queue_repair.py \
20 ${DESTDIR}${PREFIX}/bin/queue_repair 53 ${DESTDIR}${PREFIX}/bin/queue_repair
21 54
22.include "../../lang/python/application.mk" 55.include "../../lang/python/application.mk"
23.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/mail/queue-repair/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/queue-repair/distinfo 2015/11/03 23:27:18 1.2
+++ pkgsrc/mail/queue-repair/distinfo 2018/07/24 08:23:00 1.3
@@ -1,6 +1,10 @@ @@ -1,6 +1,10 @@
1$NetBSD: distinfo,v 1.2 2015/11/03 23:27:18 agc Exp $ 1$NetBSD: distinfo,v 1.3 2018/07/24 08:23:00 schmonz Exp $
2 2
 3SHA1 (queue-repair-0.9.0-symlink3-20180724.patch) = 621db690a83497967e04631e6e1017b361c167bb
 4RMD160 (queue-repair-0.9.0-symlink3-20180724.patch) = 39682df382ebbdd2a5a88a0422dbeb0f1604949e
 5SHA512 (queue-repair-0.9.0-symlink3-20180724.patch) = 89277a341341a8dfe8f6c5a440f8414c68a5515d8134bf826acad38d84757285fd358be44ca311995bf3a388db0c5ddb48ed82c31084f24630e1045ca99b0ed1
 6Size (queue-repair-0.9.0-symlink3-20180724.patch) = 10205 bytes
3SHA1 (queue-repair-0.9.0.tar.gz) = 123a9034c2fbbda7ca7c193153d67c4837909e56 7SHA1 (queue-repair-0.9.0.tar.gz) = 123a9034c2fbbda7ca7c193153d67c4837909e56
4RMD160 (queue-repair-0.9.0.tar.gz) = 7634105825299e5d2314c819d7eb3260a3bdb2b3 8RMD160 (queue-repair-0.9.0.tar.gz) = 7634105825299e5d2314c819d7eb3260a3bdb2b3
5SHA512 (queue-repair-0.9.0.tar.gz) = b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f 9SHA512 (queue-repair-0.9.0.tar.gz) = b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f
6Size (queue-repair-0.9.0.tar.gz) = 13913 bytes 10Size (queue-repair-0.9.0.tar.gz) = 13913 bytes