stick with upstream

Signed-off-by: Raphaël Marichez <falco@gentoo.org>

6 files changed, 89 insertions, 22 deletions

diff --git a/mail-mta/postfix/ChangeLog b/mail-mta/postfix/ChangeLog
index e82719c..f9620b8 100644
--- a/mail-mta/postfix/ChangeLog
+++ b/mail-mta/postfix/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for mail-mta/postfix
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.159 2008/04/13 23:06:39 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/ChangeLog,v 1.166 2008/08/14 12:33:40 falco Exp $
+
+*postfix-2.5.3-r1 (14 Aug 2008)
+*postfix-2.4.7-r1 (14 Aug 2008)
+
+  14 Aug 2008; Raphael Marichez <falco@gentoo.org>
+  +files/postfix-2.4.7-CVE-2008-2936.patch,
+  +files/postfix-2.4.7-CVE-2008-2937.patch,
+  +files/postfix-2.5.3-CVE-2008-2936.patch, +postfix-2.4.7-r1.ebuild,
+  +postfix-2.5.3-r1.ebuild:
+  Revision bump, security bug 232642
+
+*postfix-2.5.3 (03 Aug 2008)
+
+  03 Aug 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -postfix-2.5.2.ebuild, +postfix-2.5.3.ebuild:
+  Version bump, #233779
+
+  22 Jul 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  postfix-2.2.11-r1.ebuild, postfix-2.3.8-r1.ebuild,
+  postfix-2.4.6-r2.ebuild, postfix-2.4.7.ebuild, -postfix-2.5.0.ebuild,
+  -postfix-2.5.1.ebuild, postfix-2.5.2.ebuild:
+  Add blocker on net-mail/mailwrapper if mailwrapper use-flag isn't used,
+  #231052
+
+  16 Jul 2008; Luca Longinotti <chtekk@gentoo.org> postfix-2.2.11-r1.ebuild,
+  postfix-2.3.8-r1.ebuild, postfix-2.4.6-r2.ebuild, postfix-2.4.7.ebuild,
+  postfix-2.5.0.ebuild, postfix-2.5.1.ebuild, postfix-2.5.2.ebuild:
+  Dep on PostgreSQL libs only.
+
+  09 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  postfix-2.5.0.ebuild, postfix-2.5.1.ebuild, postfix-2.5.2.ebuild:
+  chown keepfile in /var/lib/postfix to postfix to get rid of a postfix
+  warning (#214342)
+
+*postfix-2.5.2 (09 Jun 2008)
+
+  09 Jun 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  postfix-2.5.1.ebuild, +postfix-2.5.2.ebuild:
+  Fix postgres linking, version bump (#223937)
+
+  21 May 2008; Tiziano Müller <dev-zero@gentoo.org>
+  postfix-2.2.11-r1.ebuild, postfix-2.3.8-r1.ebuild,
+  postfix-2.4.6-r2.ebuild, postfix-2.4.7.ebuild, postfix-2.5.0.ebuild,
+  postfix-2.5.1.ebuild:
+  Changed dependency for postgresql from dev-db/postgresql to
+  virtual/postgresql-server
 
   13 Apr 2008; Ulrich Mueller <ulm@gentoo.org> -postfix-2.4.5.ebuild:
   Remove last vulnerable ebuild wrt bug 201671.
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 699b8b1..c164d04 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,8 +1,12 @@
 AUX mailer.conf 438 RMD160 b9efd9921c9e6295d8791e621e4e08510b526ac4 SHA1 fad8603d181a0d1ba104f09719e5620bae421288 SHA256 4ea1fb59653bd12841501f30781bda51a66aae56a5560623f7d41709dc97c839
 AUX postfix-2.0.9-get-FQDN.patch 1057 RMD160 492e9de53c0a16e71940ab4f4ed99bc4f76061fa SHA1 38f0322792822612a836ded1845368b23d3c1120 SHA256 6e5f5a1f9bc60e04d6decc8491c5955c625396f23698d961c412b50ec793e878
+AUX postfix-2.4.7-CVE-2008-2936.patch 1879 RMD160 948efbfaff66fdb933ee3056353f4836c706c93d SHA1 2b5e97cc6210a0659af5183293ce8acfc538bbe0 SHA256 a2d4b352340789dc566ed2f54f3d323afbdcb85ff4566353d981a1cfe347e321
+AUX postfix-2.4.7-CVE-2008-2937.patch 22069 RMD160 b511a73873841605e266f769553365579370c32c SHA1 0ad2f1bb69ae8bdbc5f069f60fdd53b790a8f050 SHA256 9f1954df2c3b67cbef21afadcf59328408a6a72355d4021ff4059166583cdf8a
 AUX postfix-2.5.0-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
 AUX postfix-2.5.1-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
 AUX postfix-2.5.2-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
+AUX postfix-2.5.3-CVE-2008-2936.patch 1886 RMD160 2967daf2c2a5a81f71bf06a851c43f54551ada38 SHA1 2956880e3ae671b030706288dcd3c52e503da960 SHA256 993cf8fe9373f10739295f5aeec40acede51818b2dc043b2ffef696c93a746a6
+AUX postfix-2.5.3-strncmp.patch 2202 RMD160 a07c88325cca2a7fd2dd7c43277ee54e17130c23 SHA1 78e3bffcc704a0a6a6f899d1537d04b6256d055e SHA256 0ad7a026714a40cdb1f8dc0a7283d9bed69b0e94e349cb4a70f3a26a834870c2
 AUX postfix-master.cf.patch 1064 RMD160 25283e8c3c27ff156e229ad1ae8643d3be61d6b7 SHA1 86088a034f6cf4a09a68436c97df5e5babf11251 SHA256 b1f7040cb9445379c4318e2161efd79c74bc6927125f4542eb87500ece145f60
 AUX postfix.rc6.2.2.9 648 RMD160 5c8242c63e4263734ae2c51f20c5970db53dc604 SHA1 fc8f2b301c853fe01ad920c33a3c1027a4480322 SHA256 8c7c77faf61f81f4e29bafd4255bdd2fc237c15059440b16c975a7f4967b3ac0
 AUX postfix.rc6.2.5 1412 RMD160 ea2df7e53456d96cf1b34ebd46869dc8c0034e7d SHA1 f77d3f6a43040524dc468830fb73d4d2147db5db SHA256 bdb33f04cce1ccd87eaaef590d70dfec7beb777fbafe1adc4382e2a8c58bb0d2
@@ -20,12 +24,17 @@ DIST postfix-2.5.0.tar.gz 3153152 RMD160 2f7c29d63a747bce259ed5596e4b59f279aa819
 DIST postfix-2.5.1-vda-ng-r1.patch.gz 28964 RMD160 35527bf9358ce35ca9cc863d1e5fe71ce0e3814e SHA1 134e9973c09fa2c137d4b4a4295eed6c209a43b5 SHA256 36e47b7b57317c1055c48481261bdccd4688fdad3ae26c7a2988ea812ac068d5
 DIST postfix-2.5.1.tar.gz 3153629 RMD160 cf414306742d642ccab78212ee33af955d7a9023 SHA1 4ceb805b78aff4c872b7e55554d2364e06f695b3 SHA256 bad7ed98d1bbc8fd27d4b4d6d65a8dfe21794c109bc923e5fe45abea5b484037
 DIST postfix-2.5.2.tar.gz 3155511 RMD160 f16bb7ed2f4990c5f39931f3a604b5a235c03828 SHA1 6589c590b2e2a955bce5615bde1a86c37c572ce0 SHA256 6ce9cf14338b55ecf3a81d774d406ff7dfead9413d78dc8b423d72497d7a9f53
-EBUILD postfix-2.2.11-r1.ebuild 10444 RMD160 497f04e50d7a17fa8fe2cfd16a09ab782a96d911 SHA1 4a0c3f72416dd7fbd084be171cdec0107d575e2b SHA256 61b3a4f69b463ea772cb349c585a477c2faf5b0c02ccc2a67e33a2db6d435666
-EBUILD postfix-2.3.8-r1.ebuild 11777 RMD160 e70ed0ae4998ece4a3d3c98cd75bed9d9a558646 SHA1 8e65faa7311dff65bfb6351e9706d1d6452d76e2 SHA256 361a86999b96413c10bf1e46ba4d1e77b1b5361e1be6ba699a3e2962f06a4876
-EBUILD postfix-2.4.6-r2.ebuild 11825 RMD160 7677e32b281a789ad55b339579c21338b629182e SHA1 86b8b0fc3e29fdcdb4e3200e08195a12fb916f4c SHA256 4eba825a51fa695bf37f3f0ed46f3bb4c83c6f485c0803d64c2f8aa2b7cdb25d
-EBUILD postfix-2.4.7.ebuild 11828 RMD160 e6727fabb323e920a9e76a564869327af186f230 SHA1 cb8533c642670d6ecfabd5dd274828b192f1dcd4 SHA256 f28ebb304440c62ca961d6504b2c12d676419fa72df382d27695856562bd9e84
+DIST postfix-2.5.3-vda-ng.patch.gz 12809 RMD160 4543db88a244eae7edaf7250449eb6d2e78d0156 SHA1 f3fc798f6eede1d600531877dd069c20b0a1e626 SHA256 5690c734072e6231b151449a7ef1da25e9ac091f51b279c4670219751b984799
+DIST postfix-2.5.3.tar.gz 3156942 RMD160 3966af29024c587da3eebe56446f059a6cd1a8e4 SHA1 95d511c003ef89cc334c90b73396c4d366c74923 SHA256 4f8f933dd437fd9c29b2b53795cb16a20d6ca73bccf445101aeb5e05068a3a43
+EBUILD postfix-2.2.11-r1.ebuild 10482 RMD160 38a30850a1d3be0327aaf61eaf3ec085a65c75ed SHA1 e86c048743816eb80cf4a86ce9f7aef977efaab4 SHA256 886a8fa626c202b9eda143aa1d76c052abfdf8722da39072bd4f7abc63ac8f46
+EBUILD postfix-2.3.8-r1.ebuild 11815 RMD160 1ff0b58312bbe3daaa2972b25c8a1f86815a5b4a SHA1 45a577bb284e99e48905b7f3e39496002e85c08a SHA256 720e3c5f359cccc9655c48340b0d7383c3e836ecd7c8b71eba264c99bc03b117
+EBUILD postfix-2.4.6-r2.ebuild 11865 RMD160 7055177b96401e61a89f3fe1440d2489dc2389df SHA1 3e9fa6bbc787d9989d95ec9a2ae1c90556c35053 SHA256 1c3fc1a9c1dc3207794217748055ecefabb149c9ad3ec19dd071444f6669444d
+EBUILD postfix-2.4.7-r1.ebuild 11924 RMD160 b5530383f9785785faaeb069265edde44ba75d7a SHA1 418dbb93c48d9ecc49021a3a4c48b83343784d30 SHA256 702afb595dfa10fc1c36fe04291aa75f9dc560364506877dd36f6f5d137c1e64
+EBUILD postfix-2.4.7.ebuild 11869 RMD160 bb93f5800f18174d6a8f45ea1e4c386280bf8f1f SHA1 49aee93b67215ef973de6be54a18d16299f9bbb2 SHA256 14e9d1d6e61fd999d5b00a56a0b7d530ab8529757d8127b885218a81cda88f1e
 EBUILD postfix-2.5.0.ebuild 12000 RMD160 00aae793626cb0d902fd768cf94ee3ec71ffda84 SHA1 e4ae84ab8f8bcd46b63021bb825cfbd21f29c7e5 SHA256 2a27b0ab668b0db73ccc4cd512ec75b9263b75dc953bda56f2e7abb20a3cc2e2
 EBUILD postfix-2.5.1.ebuild 12000 RMD160 00aae793626cb0d902fd768cf94ee3ec71ffda84 SHA1 e4ae84ab8f8bcd46b63021bb825cfbd21f29c7e5 SHA256 2a27b0ab668b0db73ccc4cd512ec75b9263b75dc953bda56f2e7abb20a3cc2e2
 EBUILD postfix-2.5.2.ebuild 12013 RMD160 bdad38770899b1dd6b3fc0d132c8511c096be330 SHA1 f264e2e394b0a6ee8f8a88a642a44a605f000a32 SHA256 eb7074f3daeddba5191d59c4b82d9cb4bfbe816af44b062640599df3ebea08a1
-MISC ChangeLog 48631 RMD160 c922410f507408aa796e2923428edcb38b2dbe10 SHA1 62795b50a43108404a7f84159ebe8fcf91f2f0f9 SHA256 4458c3216af7660c4a06edbacd90680814748dbd6cf0732fcfe05b3cc0a1cc5e
+EBUILD postfix-2.5.3-r1.ebuild 12088 RMD160 3a332fe46a22fd4b23b1747607df7e519817a70a SHA1 445270c71d1fdb28de9ebc56f924fe8d44594021 SHA256 6d240d854ac0bf23bce4938e2ea3cee67c4ba417baa2b6837c04636e1eb10c79
+EBUILD postfix-2.5.3.ebuild 12036 RMD160 a6aca5d35c08a1d05b059a8c8dd2ca90b3785091 SHA1 f4336e1b0d10412773eacbf8ffca5844e2cb9a92 SHA256 fbe5494f5eea42c4a7cd513fff2a54883cb33ee87393e4b3acd906e4d0d5bb86
+MISC ChangeLog 50386 RMD160 d635d2a25fa2b37d0a26c6cd82dcb99f65a0ff26 SHA1 450d85d955a48c0126d9894a7d946d66c2fcd02f SHA256 0691ab1ffd135df5f483dbc5335efdac429ebb4b3fcbbc6ff969b721a21118ad
 MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
diff --git a/mail-mta/postfix/postfix-2.2.11-r1.ebuild b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
index 506a812..caa4815 100644
--- a/mail-mta/postfix/postfix-2.2.11-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.2.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.8 2008/04/13 22:53:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.2.11-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 Exp $
 
 inherit eutils ssl-cert toolchain-funcs flag-o-matic pam
 IUSE="ipv6 pam ldap mysql postgres ssl sasl mailwrapper mbox nis vda selinux hardened cdb"
@@ -30,12 +30,15 @@ DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
 	pam? ( virtual/pam )
 	ldap? ( >=net-nds/openldap-1.2 )
 	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
+	postgres? ( virtual/postgresql-base )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )"
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
+	!mailwrapper? (
+		!virtual/mta
+		!net-mail/mailwrapper
+	)
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 	selinux? ( sec-policy/selinux-postfix )"
 
@@ -167,7 +170,7 @@ src_compile() {
 	fi
 
 	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
+		if best_version '=virtual/postgresql-base-7.3*' ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
diff --git a/mail-mta/postfix/postfix-2.3.8-r1.ebuild b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
index e6da154..9614244 100644
--- a/mail-mta/postfix/postfix-2.3.8-r1.ebuild
+++ b/mail-mta/postfix/postfix-2.3.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.8 2008/04/13 22:53:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.3.8-r1.ebuild,v 1.11 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is regular ebuild without mailer-config support
 # comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -45,14 +45,17 @@ DEPEND="cdb? ( || ( >=dev-db/cdb-0.75-r1 >=dev-db/tinycdb-0.74 ) )
 	pam? ( virtual/pam )
 	ldap? ( >=net-nds/openldap-1.2 )
 	mysql? ( virtual/mysql )
-	postgres? ( >=dev-db/postgresql-7.1 )
+	postgres? ( virtual/postgresql-base )
 	ssl? ( >=dev-libs/openssl-0.9.6g )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )"
 
 # regular ebuild.
 RDEPEND="${DEPEND}
 	>=net-mail/mailbase-0.00
-	!mailwrapper? ( !virtual/mta )
+	!mailwrapper? (
+		!virtual/mta
+		!net-mail/mailwrapper
+	)
 	mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 	selinux? ( sec-policy/selinux-postfix )"
 
@@ -196,7 +199,7 @@ src_compile() {
 	fi
 
 	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
+		if best_version '=virtual/postgresql-base-7.3*' ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
diff --git a/mail-mta/postfix/postfix-2.4.6-r2.ebuild b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
index 4bb129a..e4bb211 100644
--- a/mail-mta/postfix/postfix-2.4.6-r2.ebuild
+++ b/mail-mta/postfix/postfix-2.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r2.ebuild,v 1.10 2008/04/13 22:53:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.6-r2.ebuild,v 1.13 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -43,14 +43,17 @@ DEPEND=">=sys-libs/db-3.2
 		ldap? ( >=net-nds/openldap-1.2 )
 		mysql? ( virtual/mysql )
 		pam? ( virtual/pam )
-		postgres? ( >=dev-db/postgresql-7.1 )
+		postgres? ( virtual/postgresql-base )
 		sasl? (  >=dev-libs/cyrus-sasl-2 )
 		ssl? ( >=dev-libs/openssl-0.9.6g )"
 
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
@@ -188,7 +191,7 @@ src_compile() {
 	fi
 
 	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
+		if best_version '=virtual/postgresql-base-7.3*' ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"
diff --git a/mail-mta/postfix/postfix-2.4.7.ebuild b/mail-mta/postfix/postfix-2.4.7.ebuild
index 9aaec00..e6dc55b 100644
--- a/mail-mta/postfix/postfix-2.4.7.ebuild
+++ b/mail-mta/postfix/postfix-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.7.ebuild,v 1.1 2008/03/21 15:03:51 falco Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.4.7.ebuild,v 1.4 2008/07/22 17:44:21 dertobi123 Exp $
 
 # NOTE: this ebuild is a regular ebuild without mailer-config support!
 # Comment lines below "regular ebuild" and uncomment lines below "mailer-config support"
@@ -43,14 +43,17 @@ DEPEND=">=sys-libs/db-3.2
 		ldap? ( >=net-nds/openldap-1.2 )
 		mysql? ( virtual/mysql )
 		pam? ( virtual/pam )
-		postgres? ( >=dev-db/postgresql-7.1 )
+		postgres? ( virtual/postgresql-base )
 		sasl? (  >=dev-libs/cyrus-sasl-2 )
 		ssl? ( >=dev-libs/openssl-0.9.6g )"
 
 # regular ebuild
 RDEPEND="${DEPEND}
 		>=net-mail/mailbase-0.00
-		!mailwrapper? ( !virtual/mta )
+		!mailwrapper? (
+			!virtual/mta
+			!net-mail/mailwrapper
+		)
 		mailwrapper? ( >=net-mail/mailwrapper-0.2 )
 		selinux? ( sec-policy/selinux-postfix )"
 
@@ -188,7 +191,7 @@ src_compile() {
 	fi
 
 	if use postgres ; then
-		if best_version '=dev-db/postgresql-7.3*' ; then
+		if best_version '=virtual/postgresql-base-7.3*' ; then
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql"
 		else
 			mycc="${mycc} -DHAS_PGSQL -I/usr/include/postgresql/pgsql"