Change paths to binaries in default master.cf to standard gentoo paths (/usr/local/ to /usr/, requested by seemant).

Package-Manager: portage-2.1.3.9

3 files changed, 17 insertions, 20 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index 378fc9fdf2ad..1cf5a2cea2bb 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.132 2007/08/31 13:53:48 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.133 2007/09/19 16:09:35 chutzpah Exp $
+
+  19 Sep 2007; Patrick McLean <chutzpah@gentoo.org> postfix-2.4.5.ebuild:
+  Change paths to binaries in default master.cf to standard gentoo paths
+  (/usr/local/ to /usr/, requested by seemant).
 
 *postfix-2.4.5 (31 Aug 2007)
 
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 395b32814186..d891303f0480 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 MD5 a3c32f8c9d1344be08f018d377a61f59 files/mailer.conf 438
 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 files/mailer.conf 438
@@ -83,14 +80,14 @@ EBUILD postfix-2.4.3.ebuild 11504 RMD160 ab6bece53760581ca71a4f461630d2ecb1092b0
 MD5 ce91688efd5a06adb02ae7303d342bb7 postfix-2.4.3.ebuild 11504
 RMD160 ab6bece53760581ca71a4f461630d2ecb1092b09 postfix-2.4.3.ebuild 11504
 SHA256 a89384b89a6bee8bdd464588ad8d3c876d19ca91d0c5fb10f8d638c771349609 postfix-2.4.3.ebuild 11504
-EBUILD postfix-2.4.5.ebuild 11506 RMD160 ac600c7893706dc7f82de318bbc87855040fb771 SHA1 e8a6270e09e0305892430b8c6d7aaa27da957d31 SHA256 90a51dec77c364fb466dcce30126b8a9205897a436a711eca3a3092d7a1b244f
-MD5 aa24bf1a9a1cb39c27c045923e215dc4 postfix-2.4.5.ebuild 11506
-RMD160 ac600c7893706dc7f82de318bbc87855040fb771 postfix-2.4.5.ebuild 11506
-SHA256 90a51dec77c364fb466dcce30126b8a9205897a436a711eca3a3092d7a1b244f postfix-2.4.5.ebuild 11506
-MISC ChangeLog 44239 RMD160 4eb314dc67eed7ceaa1a5e2d6e69d3a91a014146 SHA1 9681e740c1defb50de0d1967dad02d73ca622fbe SHA256 62663fb93c1a67a6608b7200f1a80ca99d736fbddcb4d18ceb6f8e33479593db
-MD5 52172169b85c5d97c4a889faa81b964c ChangeLog 44239
-RMD160 4eb314dc67eed7ceaa1a5e2d6e69d3a91a014146 ChangeLog 44239
-SHA256 62663fb93c1a67a6608b7200f1a80ca99d736fbddcb4d18ceb6f8e33479593db ChangeLog 44239
+EBUILD postfix-2.4.5.ebuild 11646 RMD160 fe8ddfc7ff9b5f5480d76a99f3f1db378a338a74 SHA1 4c013ad0f710f62aa1eb5e0bb1990e667e9e13f9 SHA256 cbf190bc49f50f38169ebaa6a9ef7f2770289177265519a53f63b6d8cc98e99e
+MD5 9e6ef16db3d4268164ec6af97b222534 postfix-2.4.5.ebuild 11646
+RMD160 fe8ddfc7ff9b5f5480d76a99f3f1db378a338a74 postfix-2.4.5.ebuild 11646
+SHA256 cbf190bc49f50f38169ebaa6a9ef7f2770289177265519a53f63b6d8cc98e99e postfix-2.4.5.ebuild 11646
+MISC ChangeLog 44435 RMD160 a77770c90c5e4e1db282e1b787b00a8d2c652d5c SHA1 236662ec5dd633c1385250d2f2dca692a1e83bed SHA256 0d2300b21e7b98c9a80bb3c17ed7c148a493af97c89f5d8e5304ef757749a8a6
+MD5 ea5a89c3cc6d2c3895556a79605e0e20 ChangeLog 44435
+RMD160 a77770c90c5e4e1db282e1b787b00a8d2c652d5c ChangeLog 44435
+SHA256 0d2300b21e7b98c9a80bb3c17ed7c148a493af97c89f5d8e5304ef757749a8a6 ChangeLog 44435
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
 MD5 2169405288c432c981b23bc7965d15c9 metadata.xml 162
 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 metadata.xml 162
@@ -122,10 +119,3 @@ SHA256 da97ce24b0fe3f0e65b01ed898f5d52619bf2e0ecfa029b7e52b3a30393fa992 files/di
 MD5 400322d9b0d0c288c50255c77bce886b files/digest-postfix-2.4.5 509
 RMD160 c964b2d0246bb089223457cffaa164013cc1f353 files/digest-postfix-2.4.5 509
 SHA256 1f3c49c8c8f835b96d3b0eda07aa7066285f0788824f55d88cb5fdcd5c5a5e8c files/digest-postfix-2.4.5 509
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
-
-iD8DBQFG2B14Wt/XSf2CZdkRAtSCAJ9BPmS1IZEoOs7QbPE5XvPL+X1XogCeIL6H
-i4suenMcmNIASiCphTJaoic=
-=CQn0
------END PGP SIGNATURE-----
diff --git a/mail-mta/postfix/postfix-2.4.5.ebuild b/mail-mta/postfix/postfix-2.4.5.ebuild
index 56ff563ff024..9d5c52d2e6bf 100644
--- a/mail-mta/postfix/postfix-2.4.5.ebuild
+++ b/mail-mta/postfix/postfix-2.4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.5.ebuild,v 1.1 2007/08/31 13:53:48 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.5.ebuild,v 1.2 2007/09/19 16:09:35 chutzpah Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -161,6 +161,9 @@ src_unpack() {
 
 	sed -i -e "/^#define ALIAS_DB_MAP/s|hash:/etc/aliases|hash:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
+
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
 }
 
 src_compile() {