Wed Jun 19 17:42:25 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/mailfront/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/mail/mailfront/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mailfront/Makefile 2018/09/28 22:45:39 1.21
+++ pkgsrc/mail/mailfront/Makefile 2019/06/19 17:42:25 1.22
@@ -1,64 +1,51 @@ @@ -1,64 +1,51 @@
1# $NetBSD: Makefile,v 1.21 2018/09/28 22:45:39 schmonz Exp $ 1# $NetBSD: Makefile,v 1.22 2019/06/19 17:42:25 schmonz Exp $
2# 2#
3 3
4DISTNAME= mailfront-2.22 4DISTNAME= mailfront-2.22
 5PKGREVISION= 1
5CATEGORIES= mail 6CATEGORIES= mail
6MASTER_SITES= ${HOMEPAGE}archive/ 7MASTER_SITES= ${HOMEPAGE}archive/
7 8
8MAINTAINER= schmonz@NetBSD.org 9MAINTAINER= schmonz@NetBSD.org
9HOMEPAGE= http://untroubled.org/mailfront/ 10HOMEPAGE= http://untroubled.org/mailfront/
10COMMENT= Mail server network protocol front-ends 11COMMENT= Mail server network protocol front-ends
11LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
12 13
13DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools 14DEPENDS+= daemontools-[0-9]*:../../sysutils/daemontools
14DEPENDS_QMAIL= qmail>=1.03nb8:../../mail/qmail 15DEPENDS+= qmail>=1.03nb8:../../mail/qmail
15DEPENDS+= ${DEPENDS_QMAIL} 
16 16
17DJB_RESTRICTED= NO 17DJB_RESTRICTED= NO
18DJB_MAKE_TARGETS= NO 18DJB_MAKE_TARGETS= NO
19BUILD_TARGET= all 19BUILD_TARGET= all
20DJB_CONFIG_CMDS+= ${ECHO} ${PREFIX}/include > conf-include; \ 20DJB_CONFIG_CMDS+= ${ECHO} ${PREFIX}/include > conf-include; \
21 ${ECHO} ${PREFIX}/lib/${PKGBASE} > conf-modules; 21 ${ECHO} ${PREFIX}/lib/${PKGBASE} > conf-modules;
22 22
23FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q} 23FILES_SUBST+= QMAIL_DAEMON_USER=${QMAIL_DAEMON_USER:Q}
24FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q} 24FILES_SUBST+= QMAIL_LOG_USER=${QMAIL_LOG_USER:Q}
25RCD_SCRIPTS= smtpfront 25RCD_SCRIPTS= smtpfront
26INSTALLATION_DIRS= share/doc/mailfront 26INSTALLATION_DIRS= share/doc/mailfront
27INSTALL_ENV+= install_prefix=${DESTDIR:Q} 27INSTALL_ENV+= install_prefix=${DESTDIR:Q}
28 28
29BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER 29BUILD_DEFS+= QMAIL_DAEMON_USER QMAIL_LOG_USER
30 30
31USE_LIBTOOL= yes 31USE_LIBTOOL= yes
32 32
33MAKE_JOBS_SAFE= no # due to hacky libtoolization 33MAKE_JOBS_SAFE= no # due to hacky libtoolization
34 34
35.include "options.mk" 35PKG_SYSCONFSUBDIR= qmail
36 36
37.include "../../mk/bsd.prefs.mk" 37.include "options.mk"
38 38
39post-install: 39post-install:
40 cd ${WRKSRC}; \ 40 cd ${WRKSRC}; \
41 for f in ANNOUNCEMENT NEWS README *.html; do \ 41 for f in ANNOUNCEMENT NEWS README *.html; do \
42 ${INSTALL_DATA} $${f} \ 42 ${INSTALL_DATA} $${f} \
43 ${DESTDIR}${PREFIX}/share/doc/mailfront; \ 43 ${DESTDIR}${PREFIX}/share/doc/mailfront; \
44 done 44 done
45 45
46# Detect the PKG_SYSCONFDIR of the installed qmail, so we can create 
47# config files there and refer to them from rc.d scripts. 
48# 
49.if !defined(PKG_SYSCONFDIR.mailfront) 
50PKG_SYSCONFDIR.mailfront!= \ 
51 ${PKG_INFO} -Q PKG_SYSCONFDIR \ 
52 ${DEPENDS_QMAIL:C/:.*$//:Q} 2>/dev/null || \ 
53 ${ECHO} "PKG_SYSCONFDIR.mailfront_not_set" 
54. if empty(PKG_SYSCONFDIR.mailfront:M*not_set) 
55MAKEVARS+= PKG_SYSCONFDIR.mailfront 
56. endif 
57.endif 
58 
59BUILDLINK_API_DEPENDS.bglibs+= bglibs>=2.01 46BUILDLINK_API_DEPENDS.bglibs+= bglibs>=2.01
60.include "../../devel/bglibs/buildlink3.mk" 47.include "../../devel/bglibs/buildlink3.mk"
61BUILDLINK_API_DEPENDS.cvm+= cvm>=0.97 48BUILDLINK_API_DEPENDS.cvm+= cvm>=0.97
62.include "../../security/cvm/buildlink3.mk" 49.include "../../security/cvm/buildlink3.mk"
63.include "../../mk/djbware.mk" 50.include "../../mk/djbware.mk"
64.include "../../mk/bsd.pkg.mk" 51.include "../../mk/bsd.pkg.mk"