If qmailqread runs on a custom host and port, have qmail-qread-client find it there. Bump version.diff -r1.34 -r1.35 pkgsrc/mail/qmail-run/Makefile
(schmonz)
@@ -1,17 +1,17 @@ | @@ -1,17 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.34 2017/04/10 15:04:56 schmonz Exp $ | 1 | # $NetBSD: Makefile,v 1.35 2017/04/11 14:04:37 schmonz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= qmail-run-20170410 | 4 | DISTNAME= qmail-run-20170411 | |
5 | CATEGORIES= mail | 5 | CATEGORIES= mail | |
6 | MASTER_SITES= # empty | 6 | MASTER_SITES= # empty | |
7 | DISTFILES= # empty | 7 | DISTFILES= # empty | |
8 | 8 | |||
9 | MAINTAINER= schmonz@NetBSD.org | 9 | MAINTAINER= schmonz@NetBSD.org | |
10 | COMMENT= Configures qmail to receive and deliver mail | 10 | COMMENT= Configures qmail to receive and deliver mail | |
11 | LICENSE= 2-clause-bsd | 11 | LICENSE= 2-clause-bsd | |
12 | 12 | |||
13 | DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail | 13 | DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail | |
14 | DEPENDS+= ${DEPENDS_QMAIL} | 14 | DEPENDS+= ${DEPENDS_QMAIL} | |
15 | 15 | |||
16 | CONFLICTS+= qmail-qfilter-1.5nb1 | 16 | CONFLICTS+= qmail-qfilter-1.5nb1 | |
17 | 17 |
@@ -1,10 +1,18 @@ | @@ -1,10 +1,18 @@ | |||
1 | #!@SH@ | 1 | #!@SH@ | |
2 | # | 2 | # | |
3 | # $NetBSD: qmail-qread-client.sh,v 1.4 2015/11/25 12:51:30 jperkin Exp $ | 3 | # $NetBSD: qmail-qread-client.sh,v 1.5 2017/04/11 14:04:37 schmonz Exp $ | |
4 | # | 4 | # | |
5 | # @PKGNAME@ client program to allow local non-root users to see | 5 | # @PKGNAME@ client program to allow local non-root users to see | |
6 | # the queue. Requires that the corresponding server program be running. | 6 | # the queue. Requires that the corresponding server program be running. | |
7 | # From Steinar Haug. | 7 | # From Steinar Haug. | |
8 | # | 8 | # | |
9 | 9 | |||
10 | exec @PREFIX@/bin/tcpclient -RHl0 -- 127.0.0.1 20025 @SH@ -c 'exec @CAT@ <&6' | 10 | if [ -f /etc/rc.subr ]; then | |
11 | . /etc/rc.subr | |||
12 | load_rc_config qmailqread | |||
13 | fi | |||
14 | ||||
15 | : ${qmailqread_tcphost:="127.0.0.1"} | |||
16 | : ${qmailqread_tcpport:="20025"} | |||
17 | ||||
18 | exec @PREFIX@/bin/tcpclient -RHl0 -- ${qmailqread_tcphost} ${qmailqread_tcpport} @SH@ -c 'exec @CAT@ <&6' |