Fri Mar 14 01:13:36 2008 UTC ()
Set data_directory's default to "/var/db/postfix" and create it properly
install stage.

It should be fix some problem; running tls and find command's error
on start.

Bump PKGREVISION.


(taca)
diff -r1.215 -r1.216 pkgsrc/mail/postfix/Makefile

cvs diff -r1.215 -r1.216 pkgsrc/mail/postfix/Makefile (switch to unified diff)

--- pkgsrc/mail/postfix/Makefile 2008/02/18 17:45:34 1.215
+++ pkgsrc/mail/postfix/Makefile 2008/03/14 01:13:36 1.216
@@ -1,159 +1,164 @@ @@ -1,159 +1,164 @@
1# $NetBSD: Makefile,v 1.215 2008/02/18 17:45:34 ghen Exp $ 1# $NetBSD: Makefile,v 1.216 2008/03/14 01:13:36 taca Exp $
2 2
3DISTNAME= postfix-2.5.1 3DISTNAME= postfix-2.5.1
 4PKGREVISION= 1
4CATEGORIES= mail 5CATEGORIES= mail
5MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ 6MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/
6DIST_SUBDIR= postfix 7DIST_SUBDIR= postfix
7 8
8MAINTAINER= martti@NetBSD.org 9MAINTAINER= martti@NetBSD.org
9HOMEPAGE= http://www.postfix.org/ 10HOMEPAGE= http://www.postfix.org/
10COMMENT= Postfix SMTP server and tools 11COMMENT= Postfix SMTP server and tools
11#LICENSE= postfix-license 12#LICENSE= postfix-license
12 13
13CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]* 14CONFLICTS+= courier-mta-[0-9]* fastforward>=0.51nb2 sendmail-[0-9]*
14 15
15PKG_INSTALLATION_TYPES= overwrite pkgviews 16PKG_INSTALLATION_TYPES= overwrite pkgviews
16 17
17USE_TOOLS+= perl 18USE_TOOLS+= perl
18CHECK_HEADERS_SKIP+= src/global/mail_params.h 19CHECK_HEADERS_SKIP+= src/global/mail_params.h
19 20
20.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
21 22
22# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is 23# POSTFIX_QUEUE_DIR is the default queue directory for Postfix. This is
23# merely a default, and may be changed by setting "queue_directory" in 24# merely a default, and may be changed by setting "queue_directory" in
24# ${PKG_SYSCONFDIR}/main.cf. 25# ${PKG_SYSCONFDIR}/main.cf.
25# 26#
 27POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix
26POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix 28POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
27BUILD_DEFS+= VARBASE POSTFIX_QUEUE_DIR 29BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
28 30
29# CCARGS is a list of options to pass to the preprocessor/compiler. 31# CCARGS is a list of options to pass to the preprocessor/compiler.
30# AUXLIBS is a list of options to pass to the linker. 32# AUXLIBS is a list of options to pass to the linker.
31# 33#
32CCARGS= -DUSE_SASL_AUTH 34CCARGS= -DUSE_SASL_AUTH
33AUXLIBS= ${LDFLAGS} 35AUXLIBS= ${LDFLAGS}
34FIX_RPATH+= AUXLIBS 
35 36
36# Set some default paths to override ${WRKSRC}/src/global/mail_params.h. 37# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
 38CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
37CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\" 39CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
38CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\" 40CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
39CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\" 41CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
40CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\" 42CCARGS+= -DDEF_CONFIG_DIR=\"${PKG_SYSCONFDIR}\"
41CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\" 43CCARGS+= -DDEF_SENDMAIL_PATH=\"${PREFIX}/sbin/sendmail\"
42CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\" 44CCARGS+= -DDEF_MAILQ_PATH=\"${PREFIX}/bin/mailq\"
43CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\" 45CCARGS+= -DDEF_NEWALIAS_PATH=\"${PREFIX}/bin/newaliases\"
44CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\" 46CCARGS+= -DDEF_MANPAGE_DIR=\"${PREFIX}/${PKGMANDIR}\"
45CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\" 47CCARGS+= -DDEF_SAMPLE_DIR=\"${EXAMPLEDIR}\"
46CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\" 48CCARGS+= -DDEF_README_DIR=\"${DOCDIR}\"
47 49
48REPLACE_PERL+= auxiliary/qshape/qshape.pl 50REPLACE_PERL+= auxiliary/qshape/qshape.pl
49 51
50# Override those same default paths in the installed example main.cf. 52# Override those same default paths in the installed example main.cf.
51SUBST_CLASSES+= postfix 53SUBST_CLASSES+= postfix
52SUBST_STAGE.postfix= post-configure 54SUBST_STAGE.postfix= post-configure
53SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h 55SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
54SUBST_SED.postfix= \ 56SUBST_SED.postfix= \
 57 -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
 58SUBST_SED.postfix+= \
55 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|' 59 -e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
56SUBST_SED.postfix+= \ 60SUBST_SED.postfix+= \
57 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|' 61 -e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
58SUBST_SED.postfix+= \ 62SUBST_SED.postfix+= \
59 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|' 63 -e 's|^\(daemon_directory\) =.*|\1 = ${LIBEXECDIR}|'
60SUBST_SED.postfix+= \ 64SUBST_SED.postfix+= \
61 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|' 65 -e 's|^\(sendmail_path\) =.*|\1 = ${PREFIX}/sbin/sendmail|'
62SUBST_SED.postfix+= \ 66SUBST_SED.postfix+= \
63 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|' 67 -e 's|^\(newaliases_path\) =.*|\1 = ${PREFIX}/bin/newaliases|'
64SUBST_SED.postfix+= \ 68SUBST_SED.postfix+= \
65 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|' 69 -e 's|^\(mailq_path\) =.*|\1 = ${PREFIX}/bin/mailq|'
66SUBST_SED.postfix+= \ 70SUBST_SED.postfix+= \
67 -e 's|^\(setgid_group\) =.*|\1 = maildrop|' 71 -e 's|^\(setgid_group\) =.*|\1 = maildrop|'
68SUBST_SED.postfix+= \ 72SUBST_SED.postfix+= \
69 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|' 73 -e 's|^\(manpage_directory\) =.*|\1 = ${PREFIX}/${PKGMANDIR}|'
70SUBST_SED.postfix+= \ 74SUBST_SED.postfix+= \
71 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|' 75 -e 's|^\(sample_directory\) =.*|\1 = ${EXAMPLEDIR}|'
72SUBST_SED.postfix+= \ 76SUBST_SED.postfix+= \
73 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|' 77 -e 's|^\(readme_directory\) =.*|\1 = ${DOCDIR}|'
74SUBST_SED.postfix+= \ 78SUBST_SED.postfix+= \
75 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g' 79 -e '/^\#define DEF_SGID_GROUP[ ]/s,postdrop,maildrop,g'
76 80
77# options.mk appends to CCARGS and AUXLIBS the options needed to build 81# options.mk appends to CCARGS and AUXLIBS the options needed to build
78# Postfix with support for various add-on modules. 82# Postfix with support for various add-on modules.
79# 83#
80.include "options.mk" 84.include "options.mk"
81 85
82PKG_SYSCONFSUBDIR= postfix 86PKG_SYSCONFSUBDIR= postfix
83LIBEXECDIR= ${PREFIX}/libexec/postfix 87LIBEXECDIR= ${PREFIX}/libexec/postfix
84DOCDIR= ${PREFIX}/share/doc/postfix 88DOCDIR= ${PREFIX}/share/doc/postfix
85EXAMPLEDIR= ${PREFIX}/share/examples/postfix 89EXAMPLEDIR= ${PREFIX}/share/examples/postfix
86 90
87FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q} 91FILES_SUBST+= EXAMPLEDIR=${EXAMPLEDIR:Q}
88MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR} 92MESSAGE_SUBST+= EXAMPLEDIR=${EXAMPLEDIR}
89MESSAGE_SUBST+= DOCDIR=${DOCDIR} 93MESSAGE_SUBST+= DOCDIR=${DOCDIR}
90 94
91MESSAGE_SRC+= ${PKGDIR}/MESSAGE 95MESSAGE_SRC+= ${PKGDIR}/MESSAGE
92.if exists(${PKGDIR}/MESSAGE.${OPSYS}) 96.if exists(${PKGDIR}/MESSAGE.${OPSYS})
93MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS} 97MESSAGE_SRC+= ${PKGDIR}/MESSAGE.${OPSYS}
94.endif 98.endif
95PLIST_SRC+= ${PKGDIR}/PLIST 99PLIST_SRC+= ${PKGDIR}/PLIST
96 100
97BUILD_TARGET= # empty 101BUILD_TARGET= # empty
98MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q} 102MAKE_ENV+= CC=${CC:Q} OPT=${CFLAGS:Q}
99MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q} 103MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
100 104
101RCD_SCRIPTS= postfix 105RCD_SCRIPTS= postfix
102OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc 106OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
 107OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} postfix postfix 0700
103MAKE_DIRS+= ${PKG_SYSCONFDIR} 108MAKE_DIRS+= ${PKG_SYSCONFDIR}
104 109
105PKG_GROUPS?= postfix maildrop 110PKG_GROUPS?= postfix maildrop
106PKG_USERS?= postfix:postfix 111PKG_USERS?= postfix:postfix
107PKG_GECOS.postfix= Postfix User 112PKG_GECOS.postfix= Postfix User
108PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR} 113PKG_HOME.postfix= ${POSTFIX_QUEUE_DIR}
109 114
110CONF_FILES= # empty 115CONF_FILES= # empty
111.for i in main.cf master.cf postfix-files 116.for i in main.cf master.cf postfix-files
112CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} 117CONF_FILES+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i}
113.endfor 118.endfor
114CONF_FILES_PERMS= # empty 119CONF_FILES_PERMS= # empty
115.for i in post-install postfix-script 120.for i in post-install postfix-script
116CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \ 121CONF_FILES_PERMS+= ${EXAMPLEDIR}/${i} ${PKG_SYSCONFDIR}/${i} \
117 ${ROOT_USER} ${ROOT_GROUP} 755 122 ${ROOT_USER} ${ROOT_GROUP} 755
118.endfor 123.endfor
119 124
120MAKE_ENV+= DEBUG= # empty 125MAKE_ENV+= DEBUG= # empty
121 126
122SUBST_CLASSES+= paths 127SUBST_CLASSES+= paths
123SUBST_FILES.paths= ${WRKDIR}/mailer.conf 128SUBST_FILES.paths= ${WRKDIR}/mailer.conf
124SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 129SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
125SUBST_STAGE.paths= post-patch 130SUBST_STAGE.paths= post-patch
126 131
127post-extract: 132post-extract:
128 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf 133 cp ${FILESDIR}/mailer.conf ${WRKDIR}/mailer.conf
129 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix 134 rm -f ${WRKSRC}/auxiliary/MacOSX/Postfix.StartupItem/Postfix
130 135
131do-configure: 136do-configure:
132 cd ${WRKSRC} && \ 137 cd ${WRKSRC} && \
133 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \ 138 env ${MAKE_ENV} ${MAKE} -f Makefile.init makefiles \
134 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}' 139 'CCARGS=${CCARGS}' 'AUXLIBS=${AUXLIBS}'
135 140
136post-build: 141post-build:
137.if !empty(PKG_OPTIONS:Msasl) 142.if !empty(PKG_OPTIONS:Msasl)
138 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf 143 ${ECHO} "pwcheck_method: ${PWCHECK_METHOD}" > ${WRKDIR}/smtpd.conf
139.endif 144.endif
140 145
141do-install: 146do-install:
142 ${INSTALL_DATA_DIR} ${LIBEXECDIR} 147 ${INSTALL_DATA_DIR} ${LIBEXECDIR}
143 ${INSTALL_DATA_DIR} ${EXAMPLEDIR} 148 ${INSTALL_DATA_DIR} ${EXAMPLEDIR}
144 ${INSTALL_DATA_DIR} ${DOCDIR} 149 ${INSTALL_DATA_DIR} ${DOCDIR}
145 rm -f ${WRKSRC}/conf/*.orig 150 rm -f ${WRKSRC}/conf/*.orig
146.if !empty(PKG_OPTIONS:Msasl) 151.if !empty(PKG_OPTIONS:Msasl)
147 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR} 152 ${INSTALL_DATA} ${WRKDIR}/smtpd.conf ${EXAMPLEDIR}
148.endif 153.endif
149 ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR} 154 ${INSTALL_SCRIPT} ${WRKSRC}/conf/post-install ${EXAMPLEDIR}
150 ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR} 155 ${INSTALL_SCRIPT} ${WRKSRC}/conf/postfix-script ${EXAMPLEDIR}
151 ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf 156 ${INSTALL_DATA} ${WRKDIR}/mailer.conf ${EXAMPLEDIR}/mailer.conf
152 cd ${WRKSRC} && sh ./postfix-install -non-interactive \ 157 cd ${WRKSRC} && sh ./postfix-install -non-interactive \
153 config_directory="${EXAMPLEDIR}" 158 config_directory="${EXAMPLEDIR}"
154 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \ 159 ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl \
155 ${PREFIX}/sbin/qshape 160 ${PREFIX}/sbin/qshape
156 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ 161 ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \
157 ${PREFIX}/${PKGMANDIR}/man1 162 ${PREFIX}/${PKGMANDIR}/man1
158 163
159.include "../../mk/bsd.pkg.mk" 164.include "../../mk/bsd.pkg.mk"