>Number:         13987
>Category:       pkg
>Synopsis:       pkgsrc postfix, default program_directory is /usr/libexec/postfix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 17 03:51:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Katsuomi Hamajima
>Release:        NetBSD 1.5.1
>Organization:
>Environment:
System: NetBSD atom 1.5.2 NetBSD 1.5.2 (ATOM) #27: Mon Aug 20 16:52:08 JST 2001 hamajima@atom:/usr/src/sys/arch/i386/compile/ATOM i386


>Description:
	on pkgsrc postfix, default program_directory is /usr/libexec/postfix.
	so original /usr/libexec/postfix daemon is executed.
>How-To-Repeat:
	delete "daemon_directory=" line in /etc/postfix/main.cf,
	and run pkgsrc postfix.
>Fix:
--- Makefile.orig	Wed Aug 22 10:32:55 2001
+++ Makefile	Mon Sep 17 19:29:05 2001
@@ -38,14 +38,22 @@
 
 pre-configure:
 	${CP} ${WRKSRC}/conf/main.cf ${WRKSRC}/conf/main.cf.dist
+	${CP} ${WRKSRC}/conf/sample-misc.cf ${WRKSRC}/conf/sample-misc.cf.dist
 	${CP} ${WRKSRC}/src/util/sys_defs.h ${WRKSRC}/src/util/sys_defs.h.dist
+	${CP} ${WRKSRC}/src/global/mail_params.h ${WRKSRC}/src/global/mail_params.h.dist
 	${CP} ${WRKSRC}/INSTALL.sh ${WRKSRC}/INSTALL.sh.dist
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/conf/main.cf.dist \
 	    > ${WRKSRC}/conf/main.cf
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/conf/sample-misc.cf.dist \
+	    > ${WRKSRC}/conf/sample-misc.cf
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/src/util/sys_defs.h.dist \
 	    > ${WRKSRC}/src/util/sys_defs.h
+	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
+	    < ${WRKSRC}/src/global/mail_params.h.dist \
+	    > ${WRKSRC}/src/global/mail_params.h
 	${SED} -e 's:__PREFIX:'${PREFIX}':g' \
 	    < ${WRKSRC}/INSTALL.sh.dist \
 	    > ${WRKSRC}/INSTALL.sh
--- distinfo.orig	Thu Aug  9 17:14:12 2001
+++ distinfo	Mon Sep 17 19:27:21 2001
@@ -8,3 +8,4 @@
 Size (postfix/postfix-20010228release-ercpt.diff) = 4484 bytes
 SHA1 (patch-aa) = a2cbec9609c9abaf87a8e11220ddf2546802648d
 SHA1 (patch-af) = 1f96a9b36cc65b079839542cc4e7a3230318013c
+SHA1 (patch-bt) = d379b30ea4ad4921f94f2c98b9007abe9b6e1120
--- patches/patch-bt.orig	Mon Sep 17 19:34:46 2001
+++ patches/patch-bt	Mon Sep 17 19:23:44 2001
@@ -0,0 +1,22 @@
+--- src/global/mail_params.h.orig	Mon Sep 17 19:18:33 2001
++++ src/global/mail_params.h	Mon Sep 17 19:22:06 2001
+@@ -153,7 +153,7 @@
+   */
+ #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"
+--- conf/sample-misc.cf.orig	Fri May 18 04:42:04 2001
++++ conf/sample-misc.cf	Mon Sep 17 19:23:19 2001
+@@ -281,7 +281,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.
>Release-Note:
>Audit-Trail:
>Unformatted: