[patch] Alternative 2

alt-2.diff (text/plain), 2.10 KB, created by Eray Aslan on 2011-05-09 19:50:44 UTC

diff --git a/postfix-2.8.3.ebuild b/postfix-2.8.3.ebuild
index 7821d55..f26a1df 100644
--- a/postfix-2.8.3.ebuild
+++ b/postfix-2.8.3.ebuild
@@ -150,6 +150,18 @@ src_configure() {
 	fi
 
 	mycc="${mycc} -DDEF_DAEMON_DIR=\\\"/usr/$(get_libdir)/postfix\\\""
+	mycc="${mycc} -DDEF_CONFIG_DIR=\\\"/etc/postfix\\\""
+	mycc="${mycc} -DDEF_COMMAND_DIR=\\\"/usr/sbin\\\""
+	mycc="${mycc} -DDEF_SENDMAIL_PATH=\\\"/usr/sbin/sendmail\\\""
+	mycc="${mycc} -DDEF_NEWALIS_PATH=\\\"/usr/bin/newaliases\\\""
+	mycc="${mycc} -DDEF_MAILQ_PATH=\\\"/usr/bin/mailq\\\""
+	mycc="${mycc} -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\""
+	mycc="${mycc} -DDEF_README_DIR=\\\"/usr/share/doc/${PF}/readme\\\""
+	mycc="${mycc} -DDEF_HTML_DIR=\\\"/usr/share/doc/${PF}/html\\\""
+	mycc="${mycc} -DDEF_QUEUE_DIR=\\\"/var/spool/postfix\\\""
+	mycc="${mycc} -DDEF_DATA_DIR=\\\"/var/lib/postfix\\\""
+	mycc="${mycc} -DDEF_MAIL_OWNER=\\\"postfix\\\""
+	mycc="${mycc} -DDEF_SGID_GROUP=\\\"postdrop\\\""
 
 	# Robin H. Johnson <[e-mail]> 17/Nov/2006
 	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
@@ -165,16 +177,18 @@ src_configure() {
 }
 
 src_install () {
-	local myconf
-	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
-		html_directory=\"/usr/share/doc/${PF}/html\""
-
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
-		config_directory="/usr/share/doc/${PF}/defaults" \
+		config_directory="/etc/postfix" \
 		manpage_directory="/usr/share/man" \
-		${myconf} \
+		readme_directory="/usr/share/doc/${PF}/readme" \
+		html_directory="/usr/share/doc/${PF}/html" \
+		command_directory="/usr/sbin" \
+		daemon_directory="/usr/$(get_libdir)/postfix" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
 		|| die "postfix-install failed"
 
 	# Fix spool removal on upgrade
@@ -205,7 +219,6 @@ src_install () {
 	fperms 02711 /usr/sbin/post{drop,queue}
 
 	keepdir /etc/postfix
-	mv "${D}"/usr/share/doc/${PF}/defaults/*.cf "${D}"/etc/postfix
 	if use mbox ; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else