summaryrefslogtreecommitdiff
path: root/mail/postfix-current
diff options
context:
space:
mode:
authormartti <martti>2008-03-17 07:11:42 +0000
committermartti <martti>2008-03-17 07:11:42 +0000
commit20f1da33bad3d017404b5c00e172c3dc6d7cd69d (patch)
treeb6dd1544e3c43345eca9078d8956ccd0ab0b4d34 /mail/postfix-current
parentdd6b9f11cf4a7aa7399373b9adbfde12c712e02c (diff)
downloadpkgsrc-20f1da33bad3d017404b5c00e172c3dc6d7cd69d.tar.gz
Updated postfix-current to 2.6.20080221
* Bug fixes * Create /var/db/postfix like in pkgsrc/mail/postfix
Diffstat (limited to 'mail/postfix-current')
-rw-r--r--mail/postfix-current/Makefile14
-rw-r--r--mail/postfix-current/distinfo8
2 files changed, 13 insertions, 9 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 261d9aee463..aeccff0eeea 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2008/03/10 10:33:38 wiz Exp $
+# $NetBSD: Makefile,v 1.97 2008/03/17 07:11:42 martti Exp $
-DISTNAME= postfix-2.6-20080216
-PKGNAME= postfix-2.6.20080216
+DISTNAME= postfix-2.6-20080221
+PKGNAME= postfix-2.6.20080221
CATEGORIES= mail
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/
DIST_SUBDIR= postfix
@@ -25,17 +25,18 @@ CHECK_HEADERS_SKIP+= src/global/mail_params.h
# merely a default, and may be changed by setting "queue_directory" in
# ${PKG_SYSCONFDIR}/main.cf.
#
+POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix
POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix
-BUILD_DEFS+= VARBASE POSTFIX_QUEUE_DIR
+BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR
# CCARGS is a list of options to pass to the preprocessor/compiler.
# AUXLIBS is a list of options to pass to the linker.
#
CCARGS= -DUSE_SASL_AUTH
AUXLIBS= ${LDFLAGS}
-FIX_RPATH+= AUXLIBS
# Set some default paths to override ${WRKSRC}/src/global/mail_params.h.
+CCARGS+= -DDEF_DATA_DIR=\"${POSTFIX_DATA_DIR}\"
CCARGS+= -DDEF_QUEUE_DIR=\"${POSTFIX_QUEUE_DIR}\"
CCARGS+= -DDEF_DAEMON_DIR=\"${LIBEXECDIR}\"
CCARGS+= -DDEF_COMMAND_DIR=\"${PREFIX}/sbin\"
@@ -54,6 +55,8 @@ SUBST_CLASSES+= postfix
SUBST_STAGE.postfix= post-configure
SUBST_FILES.postfix= conf/main.cf src/global/mail_params.h
SUBST_SED.postfix= \
+ -e 's|^\(data_directory\) =.*|\1 = ${POSTFIX_DATA_DIR}|'
+SUBST_SED.postfix+= \
-e 's|^\(queue_directory\) =.*|\1 = ${POSTFIX_QUEUE_DIR}|'
SUBST_SED.postfix+= \
-e 's|^\(command_directory\) =.*|\1 = ${PREFIX}/sbin|'
@@ -102,6 +105,7 @@ MAKE_ENV+= AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
RCD_SCRIPTS= postfix
OWN_DIRS+= ${POSTFIX_QUEUE_DIR} ${POSTFIX_QUEUE_DIR}/etc
+OWN_DIRS_PERMS+= ${POSTFIX_DATA_DIR} postfix postfix 0700
MAKE_DIRS+= ${PKG_SYSCONFDIR}
PKG_GROUPS?= postfix maildrop
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index ee7bf3580b4..b0ccbe39a2c 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.42 2008/02/18 17:46:22 ghen Exp $
+$NetBSD: distinfo,v 1.43 2008/03/17 07:11:42 martti Exp $
-SHA1 (postfix/postfix-2.6-20080216.tar.gz) = e711a0169a5d711f9bc01569cd79ef5ae6cedbd5
-RMD160 (postfix/postfix-2.6-20080216.tar.gz) = 3db1697bffeaf9fab7c3c5dc115a53d7d3e49864
-Size (postfix/postfix-2.6-20080216.tar.gz) = 3143908 bytes
+SHA1 (postfix/postfix-2.6-20080221.tar.gz) = 0e874c9dc0022812af8487ace7a6433231900c7c
+RMD160 (postfix/postfix-2.6-20080221.tar.gz) = 69596410cfeda7f969a285f0c43e4d3ba3bb2428
+Size (postfix/postfix-2.6-20080221.tar.gz) = 3141991 bytes
SHA1 (patch-aa) = 757b6f1be1a51696f1c7d41ad520cba3b8420dcf
SHA1 (patch-ag) = 4d66026fe81dde97470bd01d529af191f1547228
SHA1 (patch-ai) = 7b19361e77d25139134511331a82abcd26b5336d