Wed Jun 19 17:44:15 2019 UTC ()
Keep it simple: set PKG_SYSCONFSUBDIR to match mail/qmail's. Bump PKGREVISION just in case.


(schmonz)
diff -r1.21 -r1.22 pkgsrc/mail/qgreylist/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/mail/qgreylist/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qgreylist/Makefile 2018/10/31 20:37:20 1.21
+++ pkgsrc/mail/qgreylist/Makefile 2019/06/19 17:44:15 1.22
@@ -1,53 +1,39 @@ @@ -1,53 +1,39 @@
1# $NetBSD: Makefile,v 1.21 2018/10/31 20:37:20 schmonz Exp $ 1# $NetBSD: Makefile,v 1.22 2019/06/19 17:44:15 schmonz Exp $
2 2
3DISTNAME= qgreylist-0.3 3DISTNAME= qgreylist-0.3
4PKGREVISION= 7 4PKGREVISION= 8
5CATEGORIES= mail 5CATEGORIES= mail
6#MASTER_SITES= ${HOMEPAGE} 6#MASTER_SITES= ${HOMEPAGE}
7 7
8MAINTAINER= schmonz@NetBSD.org 8MAINTAINER= schmonz@NetBSD.org
9#HOMEPAGE= http://www.jonatkins.com/page/software/qgreylist 9#HOMEPAGE= http://www.jonatkins.com/page/software/qgreylist
10COMMENT= Simple greylisting for qmail 10COMMENT= Simple greylisting for qmail
11LICENSE= mit 11LICENSE= mit
12 12
13DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail 13DEPENDS+= qmail>=1.03nb8:../../mail/qmail
14DEPENDS+= ${DEPENDS_QMAIL} 
15 14
16WRKSRC= ${WRKDIR}/qgreylist 15WRKSRC= ${WRKDIR}/qgreylist
17 16
18USE_TOOLS+= perl:run 17USE_TOOLS+= perl:run
19OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/greylist ${QMAIL_DAEMON_USER} ${REAL_ROOT_GROUP} 0755 18OWN_DIRS_PERMS= ${PKG_SYSCONFDIR}/greylist ${QMAIL_DAEMON_USER} ${REAL_ROOT_GROUP} 0755
20OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/whitelist ${QMAIL_DAEMON_USER} ${REAL_ROOT_GROUP} 0755 19OWN_DIRS_PERMS+= ${PKG_SYSCONFDIR}/whitelist ${QMAIL_DAEMON_USER} ${REAL_ROOT_GROUP} 0755
21NO_BUILD= yes 20NO_BUILD= yes
22 21
23BUILD_DEFS+= QMAIL_DAEMON_USER 22BUILD_DEFS+= QMAIL_DAEMON_USER
24 23
25REPLACE_PERL= greylist 24REPLACE_PERL= greylist
26 25
27.include "../../mk/bsd.prefs.mk" 26PKG_SYSCONFSUBDIR= qmail
28 
29# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create 
30# config files there and refer to them from rc.d scripts. 
31# 
32.if !defined(PKG_SYSCONFDIR.qgreylist) 
33PKG_SYSCONFDIR.qgreylist!= \ 
34 ${PKG_INFO} -Q PKG_SYSCONFDIR \ 
35 ${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null || \ 
36 ${ECHO} "PKG_SYSCONFDIR.qgreylist_not_set" 
37. if empty(PKG_SYSCONFDIR.qgreylist:M*not_set) 
38MAKEVARS+= PKG_SYSCONFDIR.qgreylist 
39. endif 
40.endif 
41 27
42SUBST_CLASSES+= qmaildirs 28SUBST_CLASSES+= qmaildirs
43SUBST_STAGE.qmaildirs= do-configure 29SUBST_STAGE.qmaildirs= do-configure
44SUBST_FILES.qmaildirs= greylist 30SUBST_FILES.qmaildirs= greylist
45SUBST_SED.qmaildirs= -e 's|/var/qmail/greylist|${PKG_SYSCONFDIR}/greylist|g' 31SUBST_SED.qmaildirs= -e 's|/var/qmail/greylist|${PKG_SYSCONFDIR}/greylist|g'
46SUBST_SED.qmaildirs+= -e 's|/var/qmail/whitelist|${PKG_SYSCONFDIR}/whitelist|g' 32SUBST_SED.qmaildirs+= -e 's|/var/qmail/whitelist|${PKG_SYSCONFDIR}/whitelist|g'
47SUBST_SED.qmaildirs+= -e 's|/var/qmail|${QMAILDIR}|g' 33SUBST_SED.qmaildirs+= -e 's|/var/qmail|${QMAILDIR}|g'
48 34
49INSTALLATION_DIRS= bin share/doc/qgreylist 35INSTALLATION_DIRS= bin share/doc/qgreylist
50BUILD_DEFS+= QMAILDIR 36BUILD_DEFS+= QMAILDIR
51 37
52do-install: 38do-install:
53 ${INSTALL_SCRIPT} ${WRKSRC}/greylist ${DESTDIR}${PREFIX}/bin/qgreylist 39 ${INSTALL_SCRIPT} ${WRKSRC}/greylist ${DESTDIR}${PREFIX}/bin/qgreylist