CVS commit: pkgsrc/mail/qmail-run

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Apr 11 14:04:38 UTC 2017

Modified Files:
        pkgsrc/mail/qmail-run: Makefile
        pkgsrc/mail/qmail-run/files: qmail-qread-client.sh

Log Message:
If qmailqread runs on a custom host and port, have qmail-qread-client
find it there. Bump version.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/mail/qmail-run/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh

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-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.34 pkgsrc/mail/qmail-run/Makefile:1.35
--- pkgsrc/mail/qmail-run/Makefile:1.34 Mon Apr 10 15:04:56 2017
+++ pkgsrc/mail/qmail-run/Makefile      Tue Apr 11 14:04:37 2017
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2017/04/10 15:04:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.35 2017/04/11 14:04:37 schmonz Exp $
 #
 
-DISTNAME=              qmail-run-20170410
+DISTNAME=              qmail-run-20170411
 CATEGORIES=            mail
 MASTER_SITES=          # empty
 DISTFILES=             # empty

Index: pkgsrc/mail/qmail-run/files/qmail-qread-client.sh
diff -u pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.4 pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.5
--- pkgsrc/mail/qmail-run/files/qmail-qread-client.sh:1.4       Wed Nov 25 12:51:30 2015
+++ pkgsrc/mail/qmail-run/files/qmail-qread-client.sh   Tue Apr 11 14:04:37 2017
@@ -1,10 +1,18 @@
 #!@SH@
 #
-# $NetBSD: qmail-qread-client.sh,v 1.4 2015/11/25 12:51:30 jperkin Exp $
+# $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $
 #
 # @PKGNAME@ client program to allow local non-root users to see
 # the queue. Requires that the corresponding server program be running.
 # From Steinar Haug.
 #
 
-exec @PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6'
+if [ -f /etc/rc.subr ]; then
+       . /etc/rc.subr
+       load_rc_config qmailqread
+fi
+
+: ${qmailqread_tcphost:="127.0.0.1"}
+: ${qmailqread_tcpport:="20025"}
+
+exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6'