* Install main.cf and master.cf to /etc/postfix if they don't exist

* Fixed some hardcoded paths (should fix pkg/13987)

4 files changed, 57 insertions, 2 deletions

diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 50547fb632e..3dd1b4f240c 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2002/03/13 08:10:09 martti Exp $
+# $NetBSD: Makefile,v 1.56 2002/03/16 18:06:39 martti Exp $
 
 DISTNAME=	postfix-1.1.5
+PKGREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	ftp://postfix.cloud9.net/official/
 
@@ -62,6 +63,15 @@ pre-configure:
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/postfix-install.dist \
 	    > ${WRKSRC}/postfix-install
+	${CP} ${WRKSRC}/conf/sample-misc.cf ${WRKSRC}/conf/sample-misc.cf.dist
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/conf/sample-misc.cf.dist \
+	    > ${WRKSRC}/conf/sample-misc.cf
+	${CP} ${WRKSRC}/src/global/mail_params.h \
+		${WRKSRC}/src/global/mail_params.h.dist
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/src/global/mail_params.h.dist \
+	    > ${WRKSRC}/src/global/mail_params.h
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} makefiles)
@@ -86,6 +96,10 @@ pre-install:
 		${INSTALL_DATA} ${WRKSRC}/conf/postfix-files /etc/postfix
 	${TEST} -f /etc/postfix/postfix-script || \
 		${INSTALL_DATA} ${WRKSRC}/conf/postfix-script /etc/postfix
+	${TEST} -f /etc/postfix/main.cf || \
+		${INSTALL_DATA} ${WRKSRC}/conf/main.cf /etc/postfix
+	${TEST} -f /etc/postfix/master.cf || \
+		${INSTALL_DATA} ${WRKSRC}/conf/master.cf /etc/postfix
 
 do-install:
 	(cd ${WRKSRC} && ${SH} postfix-install -non-interactive)
diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo
index 0281bfc1545..c9fba168cf5 100644
--- a/mail/postfix/distinfo
+++ b/mail/postfix/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.13 2002/03/13 08:10:09 martti Exp $
+$NetBSD: distinfo,v 1.14 2002/03/16 18:06:39 martti Exp $
 
 SHA1 (postfix/postfix-1.1.5.tar.gz) = 4a914a5a7d9e1e9f428d99b609599f1c3263e61a
 Size (postfix/postfix-1.1.5.tar.gz) = 1184214 bytes
 SHA1 (patch-aa) = 01d0df30acc0ee454771ade263b6e793d0dba6a4
 SHA1 (patch-ab) = d4e50ffc31d71ff64067101f6d733655fcf76713
 SHA1 (patch-ac) = 0c79f73f1a9327e97ab6e6910d03b479c849d9f4
+SHA1 (patch-ad) = 78f24bf3f7e6829c2a5c9a402e33dea25f1a55d2
+SHA1 (patch-ae) = 9027a04cc9d507c1cfaf84865414002e2fd95d13
 SHA1 (patch-af) = 8ddf7b1c0a2333127f5911739ee884f7eaee95ce
diff --git a/mail/postfix/patches/patch-ad b/mail/postfix/patches/patch-ad
new file mode 100644
index 00000000000..b6d7ca1c489
--- /dev/null
+++ b/mail/postfix/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.4 2002/03/16 18:06:40 martti Exp $
+
+--- conf/sample-misc.cf.orig	Sat Mar 16 18:01:19 2002
++++ conf/sample-misc.cf	Sat Mar 16 18:02:59 2002
+@@ -293,7 +293,7 @@
+ # The program_directory parameter specifies the location of Postfix
+ # support programs and daemons. This directory must be owned by root.
+ #
+-program_directory = /usr/libexec/postfix
++program_directory = __PREFIX/libexec/postfix
+ 
+ # The queue_directory specifies the location of the Postfix queue.
+ # This is also the root directory of Postfix daemons that run chrooted.
diff --git a/mail/postfix/patches/patch-ae b/mail/postfix/patches/patch-ae
new file mode 100644
index 00000000000..547c7253302
--- /dev/null
+++ b/mail/postfix/patches/patch-ae
@@ -0,0 +1,26 @@
+$NetBSD: patch-ae,v 1.4 2002/03/16 18:06:40 martti Exp $
+
+--- src/global/mail_params.h.orig	Sat Mar 16 18:04:22 2002
++++ src/global/mail_params.h	Sat Mar 16 18:05:47 2002
+@@ -169,18 +169,18 @@
+   */
+ #define VAR_PROGRAM_DIR		"program_directory"
+ #ifndef DEF_PROGRAM_DIR
+-#define DEF_PROGRAM_DIR		"/usr/libexec/postfix"
++#define DEF_PROGRAM_DIR		"__PREFIX/libexec/postfix"
+ #endif
+ 
+ #define VAR_DAEMON_DIR		"daemon_directory"
+ #ifndef DEF_DAEMON_DIR
+-#define DEF_DAEMON_DIR		"/usr/libexec/postfix"
++#define DEF_DAEMON_DIR		"__PREFIX/libexec/postfix"
+ #endif
+ extern char *var_daemon_dir;
+ 
+ #define VAR_COMMAND_DIR		"command_directory"
+ #ifndef DEF_COMMAND_DIR
+-#define DEF_COMMAND_DIR		"/usr/sbin"
++#define DEF_COMMAND_DIR		"__PREFIX/sbin"
+ #endif
+ extern char *var_command_dir;
+