Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_15609665536150"
MIME-Version: 1.0
Date: Wed, 19 Jun 2019 17:49:13 +0000
From: "Amitai Schleier" <schmonz@netbsd.org>
Subject: CVS commit: pkgsrc/mail/qmail-run
To: pkgsrc-changes@NetBSD.org
Reply-To: schmonz@netbsd.org
Message-Id: <20190619174914.03EB3FBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_15609665536150
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	schmonz
Date:		Wed Jun 19 17:49:13 UTC 2019

Modified Files:
	pkgsrc/mail/qmail-run: Makefile

Log Message:
Keep it simple: set PKG_SYSCONFSUBDIR to match mail/qmail's. Bump version just in case.


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/mail/qmail-run/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_15609665536150
Content-Disposition: inline
Content-Length: 2162
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/mail/qmail-run/Makefile
diff -u pkgsrc/mail/qmail-run/Makefile:1.72 pkgsrc/mail/qmail-run/Makefile:1.73
--- pkgsrc/mail/qmail-run/Makefile:1.72	Sun Apr 14 13:28:44 2019
+++ pkgsrc/mail/qmail-run/Makefile	Wed Jun 19 17:49:13 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.72 2019/04/14 13:28:44 schmonz Exp $
+# $NetBSD: Makefile,v 1.73 2019/06/19 17:49:13 schmonz Exp $
 #
 
-DISTNAME=		qmail-run-20190414
+DISTNAME=		qmail-run-20190619
 CATEGORIES=		mail
 MASTER_SITES=		# empty
 DISTFILES=		# empty
@@ -13,8 +13,7 @@ LICENSE=		2-clause-bsd
 DEPENDS+=		greetdelay-[0-9]*:../../mail/greetdelay
 DEPENDS+=		greylisting-spp-[0-9]*:../../mail/greylisting-spp
 DEPENDS+=		pkg_alternatives-[0-9]*:../../pkgtools/pkg_alternatives
-DEPENDS_QMAIL=		qmail>=1.03nb42:../../mail/qmail
-DEPENDS+=		${DEPENDS_QMAIL}
+DEPENDS+=		qmail>=1.03nb42:../../mail/qmail
 DEPENDS+=		qmail-acceptutils>=20181228:../../mail/qmail-acceptutils
 DEPENDS+=		qmail-qfilter>1.5nb1:../../mail/qmail-qfilter
 DEPENDS+=		qmail-rejectutils>=20181230:../../mail/qmail-rejectutils
@@ -33,6 +32,8 @@ FILES_SUBST+=		UCSPI_SSL_GROUP=${UCSPI_S
 MESSAGE_SUBST+=		PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q}
 RCD_SCRIPTS=		qmail qmailofmipd qmailpop3d qmailqread qmailsend qmailsmtpd
 
+PKG_SYSCONFSUBDIR=	qmail
+
 EGDIR=			share/examples/qmail-run
 .for f in defaultdelivery fixsmtpio signatures rcptchecks \
 	ofmipfilters smtpfilters \
@@ -60,21 +61,6 @@ BUILD_DEFS+=		QMAIL_DAEMON_USER QMAIL_LO
 BUILD_DEFS+=		QMAIL_QMAIL_GROUP PKG_SYSCONFBASE
 BUILD_DEFS+=		UCSPI_SSL_USER UCSPI_SSL_GROUP
 
-.include "../../mk/bsd.prefs.mk"
-
-# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create
-# config files there and refer to them from rc.d scripts.
-#
-.if !defined(PKG_SYSCONFDIR.qmail-run)
-PKG_SYSCONFDIR.qmail-run!=						\
-	${PKG_INFO} -Q PKG_SYSCONFDIR					\
-		${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null ||		\
-	${ECHO} "PKG_SYSCONFDIR.qmail-run_not_set"
-.  if empty(PKG_SYSCONFDIR.qmail-run:M*not_set)
-MAKEVARS+=	PKG_SYSCONFDIR.qmail-run
-.  endif
-.endif
-
 SUBST_CLASSES+=		paths
 SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	mailer.conf README.pkgsrc


--_----------=_15609665536150--