From 079cec5eab0ae9540b262cad903d033a6c6893ed Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Fri, 14 Mar 2008 01:13:36 +0000
Subject: 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.
---
 mail/postfix/Makefile | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index d213b9f1512..d1378024556 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.215 2008/02/18 17:45:34 ghen Exp $
+# $NetBSD: Makefile,v 1.216 2008/03/14 01:13:36 taca Exp $
 
 DISTNAME=	postfix-2.5.1
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.porcupine.org/mirrors/postfix-release/official/
 DIST_SUBDIR=	postfix
@@ -23,17 +24,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\"
@@ -52,6 +54,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|'
@@ -100,6 +104,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
-- 
cgit v1.2.3