Update to 1.15. From the changelog:

* added a man page in v1.14
* more support for bigtodo (like mediatemple provisions)

pkgsrc changes:

- Substitute configured qmail users

5 files changed, 82 insertions, 62 deletions

diff --git a/mail/qmqtool/Makefile b/mail/qmqtool/Makefile
index c872e10a894..225ee9c50e3 100644
--- a/mail/qmqtool/Makefile
+++ b/mail/qmqtool/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 06:38:31 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2017/04/04 08:27:56 schmonz Exp $
 #
 
-DISTNAME=		qmqtool-1.14
-PKGREVISION=		2
+DISTNAME=		qmqtool-1.15
 CATEGORIES=		mail
 MASTER_SITES=		${HOMEPAGE}/files/
 EXTRACT_SUFX=		.tgz
@@ -23,15 +22,21 @@ CONFIGURE_ARGS+=	--scriptdir=${PREFIX:Q}/sbin
 BUILD_TARGET=		qmqtool
 
 SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	${WRKSRC}/src/qmqtool
+SUBST_STAGE.paths=	pre-configure
+SUBST_FILES.paths=	src/qmqtool
 SUBST_SED.paths+=	-e 's,@PS@,${PS},g'
 SUBST_SED.paths+=	-e 's,@GREP@,${GREP},g'
 SUBST_SED.paths+=	-e 's,@RCD_SCRIPTS_DIR@,${RCD_SCRIPTS_DIR},g'
-SUBST_STAGE.paths=	pre-configure
+
+SUBST_CLASSES+=		users
+SUBST_STAGE.users=	pre-configure
+SUBST_FILES.users=	src/qmqtool
+SUBST_SED.users=	-e 's,@QMAIL_SEND_USER@,${QMAIL_SEND_USER:Q},g'
+SUBST_SED.users+=	-e 's,@QMAIL_QUEUE_USER@,${QMAIL_QUEUE_USER:Q},g'
 
 INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin
 INSTALLATION_DIRS+=	share/doc/qmqtool share/examples/qmqtool
-BUILD_DEFS+=		QMAILDIR
+BUILD_DEFS+=		QMAILDIR QMAIL_QUEUE_USER QMAIL_SEND_USER
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qmqtool ${DESTDIR}${PREFIX}/sbin
diff --git a/mail/qmqtool/PLIST b/mail/qmqtool/PLIST
index 354a940289a..b8f009f340a 100644
--- a/mail/qmqtool/PLIST
+++ b/mail/qmqtool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/06/02 14:09:20 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/04/04 08:27:56 schmonz Exp $
 man/man8/qmqtool.8
 sbin/qmqtool
 share/doc/qmqtool/Artistic
@@ -10,3 +10,4 @@ share/examples/qmqtool/contrib/argus/config
 share/examples/qmqtool/contrib/cricket/Defaults
 share/examples/qmqtool/contrib/cricket/README
 share/examples/qmqtool/contrib/cricket/Targets
+share/examples/qmqtool/contrib/net-snmp/snmpd.local.conf
diff --git a/mail/qmqtool/distinfo b/mail/qmqtool/distinfo
index cb873e0c9e8..9d9b66e3c92 100644
--- a/mail/qmqtool/distinfo
+++ b/mail/qmqtool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/11/03 23:27:18 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/04/04 08:27:56 schmonz Exp $
 
-SHA1 (qmqtool-1.14.tgz) = a15ea167137697665d770574aae19f98c8caa44d
-RMD160 (qmqtool-1.14.tgz) = 020abb26fe17f10448bb6a1619f408e4899845cf
-SHA512 (qmqtool-1.14.tgz) = 0da56b98c2d849f4068ee3727bf7818a81017d2a3291bbcc73d2a88a784fc6f7423f99302a0fa05090f2a5f31c0aae3173347da48a7398beff2e2c59d297945e
-Size (qmqtool-1.14.tgz) = 25357 bytes
-SHA1 (patch-aa) = e80d247f9637889ae4bc2d4fe19a918dbbf58205
-SHA1 (patch-configure) = 01ae176043aa25107bf698c355132158885569e0
+SHA1 (qmqtool-1.15.tgz) = 06e665852c3f2c98d351b3162bf34a48d03df1b2
+RMD160 (qmqtool-1.15.tgz) = 089f5584352c573308b09a29a92d5b1e42aa6640
+SHA512 (qmqtool-1.15.tgz) = 613499629c9a651636fb5146c6a0faf41b183dbd0aacdb48227811ebb84401a9916fb66a3157f2521c36bc8b4326f3524b2db32e7b2f23250acac6adc251d29f
+Size (qmqtool-1.15.tgz) = 25884 bytes
+SHA1 (patch-aa) = a214cea1fa1dccdb3f4f35bb7d41d79e0d20dc05
+SHA1 (patch-configure) = 90a0a3ade3591957c8b76546ed7e414d6a57c019
diff --git a/mail/qmqtool/patches/patch-aa b/mail/qmqtool/patches/patch-aa
index 59b2fd68c12..21bb2387b9f 100644
--- a/mail/qmqtool/patches/patch-aa
+++ b/mail/qmqtool/patches/patch-aa
@@ -1,56 +1,70 @@
-$NetBSD: patch-aa,v 1.2 2014/06/02 14:09:20 schmonz Exp $
+$NetBSD: patch-aa,v 1.3 2017/04/04 08:27:56 schmonz Exp $
 
 Use pkgsrc-preferred tools.
 
---- src/qmqtool.orig	2009-01-24 04:25:44.000000000 +0000
+--- src/qmqtool.orig	2016-06-11 16:26:52.000000000 +0000
 +++ src/qmqtool
 @@ -10,7 +10,7 @@ use Getopt::Std;
  
  my $qmail = '__QMAILDIR__';
- # keep ps dynamic - one nfs homed script can work on any arch
+ # keep ps/bigtodo dynamic - one nfs homed script can work on any arch
 -my $ps = ($^O eq 'solaris') ? '/usr/ucb/ps auxww' : 'ps auxww';
 +my $ps = '@PS@ auxww';
- my $bigtodo=0; # hardly implemented, no demand.
+ my $bigtodo = ( -d "${qmail}/queue/todo/0" ) ? 1 : 0; # more implemented, little demand.
  
- my %opt;
-@@ -161,6 +161,7 @@ if($opt{l}){
- 		}
- 		unless($opt{Q}){
- 			print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
-+			print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
- 		}
- 	}else{
- 		syntax();
-@@ -421,6 +422,7 @@ sub check_daemons {
- 				next if(/multilog\s+/); # some log to /var/log/qmail/qmail-send/
- 				die "you must stop qmail-send and qmail-smtpd before this program can continue (PID [$1] running).\n",
- 				    "for a LWQ installation, run: svc -d /service/qmail-send /service/qmail-smtpd\n",
-+				    "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend stop; @RCD_SCRIPTS_DIR@/qmailsmtpd stop\n",
- 				    "others may be able to run: kill -9 `$ps | awk '/qmail-send|qmail-smtpd/ { print \$1 }'`\n";
- 			}
- 		}
-@@ -651,6 +653,7 @@ sub checkqueue {
- 	if($opt{r}){
- 		unless($opt{Q}){
- 			print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
-+			print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
- 		}
- 	}
+ 
+@@ -105,10 +105,10 @@ if($opt{l}){
+         }
+     }elsif($opt{B} eq 'r'){
+         my(%owner,%uid,%gid);
+-        $owner{info} = $owner{local} = $owner{remote} = $owner{bounce} = 'qmails';
+-        $owner{mess} = $owner{todo} = $owner{intd} = 'qmailq';
++        $owner{info} = $owner{local} = $owner{remote} = $owner{bounce} = '@QMAIL_SEND_USER@';
++        $owner{mess} = $owner{todo} = $owner{intd} = '@QMAIL_QUEUE_USER@';
+ 
+-        for my $user (qw/qmailq qmails/){
++        for my $user (qw/@QMAIL_QUEUE_USER@ @QMAIL_SEND_USER@/){
+             ($uid{$user},$gid{$user}) = (getpwnam($user))[2,3];
+         }
+ 
+@@ -162,6 +162,7 @@ if($opt{l}){
+         }
+         unless($opt{Q}){
+             print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
++            print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
+         }
+     }else{
+         syntax();
+@@ -422,6 +423,7 @@ sub check_daemons {
+                 next if(/multilog\s+/); # some log to /var/log/qmail/qmail-send/
+                 die "you must stop qmail-send and qmail-smtpd before this program can continue (PID [$1] running).\n",
+                     "for a LWQ installation, run: svc -d /service/qmail-send /service/qmail-smtpd\n",
++                    "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend stop; @RCD_SCRIPTS_DIR@/qmailsmtpd stop\n",
+                     "others may be able to run: kill -9 `$ps | awk '/qmail-send|qmail-smtpd/ { print \$1 }'`\n";
+             }
+         }
+@@ -652,6 +654,7 @@ sub checkqueue {
+     if($opt{r}){
+         unless($opt{Q}){
+             print "you must now start qmail-send: for a LWQ installation, run: svc -u /service/qmail-send\n";
++            print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend start\n";
+         }
+     }
  }
-@@ -691,6 +694,7 @@ sub rm_files {
- 	}
- 	if($restart){
- 		print "you must now restart qmail-send: for a LWQ installation, run: svc -du /service/qmail-send\n";
-+		print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend restart\n";
- 	}
+@@ -692,6 +695,7 @@ sub rm_files {
+     }
+     if($restart){
+         print "you must now restart qmail-send: for a LWQ installation, run: svc -du /service/qmail-send\n";
++        print "for a pkgsrc installation, run: @RCD_SCRIPTS_DIR@/qmailsend restart\n";
+     }
  }
  
-@@ -979,7 +983,7 @@ sub find_msgs_bystring {
- 	my @msgs;
- 	# using find|xargs grep is must faster than regex matching in perl (dunno why)
- 	my $last=0;
--	open(GREP, "find ${qmail}/queue/mess/ -type f | xargs grep $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs grep: $!\n";
-+	open(GREP, "find ${qmail}/queue/mess/ -type f | xargs @GREP@ $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs @GREP@ $!\n";
- 	# do not count on grep's exit code, because:
- 	#  if a message is removed while grepping, exit code is 2
- 	while(<GREP>){
+@@ -985,7 +989,7 @@ sub find_msgs_bystring {
+     # using find|xargs grep is must faster than regex matching in perl (dunno why)
+     # grep -r isnt portable, dunno if it's safe for huge file lists
+     my $last=0;
+-    open(GREP, "find ${qmail}/queue/mess/ -type f | xargs grep $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs grep: $!\n";
++    open(GREP, "find ${qmail}/queue/mess/ -type f | xargs @GREP@ $opts \"$regex\" /dev/null 2>/dev/null |") || die "could not fork find | xargs @GREP@ $!\n";
+     # do not count on grep's exit code, because:
+     #  if a message is removed while grepping, exit code is 2
+     while(<GREP>){
diff --git a/mail/qmqtool/patches/patch-configure b/mail/qmqtool/patches/patch-configure
index b026c4b8084..91f8a62589e 100644
--- a/mail/qmqtool/patches/patch-configure
+++ b/mail/qmqtool/patches/patch-configure
@@ -1,12 +1,12 @@
-$NetBSD: patch-configure,v 1.1 2014/06/09 23:47:56 schmonz Exp $
+$NetBSD: patch-configure,v 1.2 2017/04/04 08:27:56 schmonz Exp $
 
 Since qmqtool operates directly on a queue structure, it doesn't
 depend on mail/qmail, so ${QMAILDIR} may not exist at build time.
 Patch out overzealous configure checks.
 
---- configure.orig	2009-01-24 04:20:49.000000000 +0000
+--- configure.orig	2016-06-11 16:26:52.000000000 +0000
 +++ configure
-@@ -77,12 +77,12 @@ EOM
+@@ -79,12 +79,12 @@ EOM
  		;;
  	   --qmaildir*)
  			if [ "$arg" ]; then
@@ -24,7 +24,7 @@ Patch out overzealous configure checks.
  			fi
  		;;
  		*)
-@@ -106,14 +106,14 @@ if [ ! -x "$perl" ] ; then
+@@ -117,14 +117,14 @@ if [ ! -x "$perl" ] ; then
  	fi
  fi
  
@@ -46,4 +46,4 @@ Patch out overzealous configure checks.
 +#fi
  
  if [ ! "$prefix" ] && [ ! "$scriptdir" ] && [ ! "$mandir" ] ; then
- 	exscr="`which qmqtool`"
+ 	exscr="`which qmqtool 2>/dev/null`"