Fix compile with newer PostgreSQL versions. Use proper WANT_AUTOCONF syntax. Fixes bug #37227.

4 files changed, 30 insertions, 7 deletions

diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog
index b14486c3da13..b1e17c54d755 100644
--- a/dev-libs/cyrus-sasl/ChangeLog
+++ b/dev-libs/cyrus-sasl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/cyrus-sasl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.49 2004/01/14 19:42:47 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.50 2004/01/15 21:50:16 max Exp $
+
+  15 Jan 2004; Max Kalika <max@gentoo.org> cyrus-sasl-2.1.17.ebuild,
+  files/cyrus-sasl-2.1.17-pgsql-include.patch:
+  Fix compile with newer PostgreSQL versions. Use proper WANT_AUTOCONF syntax.
+  Fixes bug #37227.
 
 *cyrus-sasl-2.1.17 (14 Jan 2004)
 
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 542fde1e67b8..8813d2e9f5ef 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -2,14 +2,15 @@ MD5 97a5886f616ca348e1455e774982ed69 cyrus-sasl-1.5.27-r6.ebuild 2768
 MD5 a48bbf38c86b01981dade4243ffa7561 cyrus-sasl-2.1.13.ebuild 3266
 MD5 14e928ddb176ad2e2f795693890273f4 cyrus-sasl-2.1.15.ebuild 3737
 MD5 adc5fe7dc04f8b77f22bd78960423693 cyrus-sasl-1.5.27-r5.ebuild 2694
-MD5 613695b7fae72f62ab32f6924a540dc1 cyrus-sasl-2.1.17.ebuild 3757
+MD5 f43521fd10cc644ac4b41af29a72e163 cyrus-sasl-2.1.17.ebuild 3905
 MD5 12c1f2dce1ff1e3d6a27fcb370844c33 cyrus-sasl-2.1.14.ebuild 3905
-MD5 64e943d3106c1749668e1ee44a67a650 ChangeLog 10120
+MD5 29d6335a544958c8b529459ba3d51183 ChangeLog 10336
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r5 69
 MD5 6690c1dc7a0e2c6219719eea1b367ab5 files/digest-cyrus-sasl-1.5.27-r6 69
 MD5 72c9252fd0ccb3fc369c60ec233f4218 files/2.1.14-mysql.patch 730
 MD5 a445d25ebbdf18b372340d4643736941 files/2.1.14-kerberos.patch 1148
+MD5 b9ab0670db5b9b5a74de379c18e5370d files/cyrus-sasl-2.1.17-pgsql-include.patch 617
 MD5 5f2cc406af0465a53e2a4e72b6e79a12 files/cyrus-sasl-2.1.12-kerberos.patch 1529
 MD5 cb4a5c5160219818e04196847ba9f7a1 files/cyrus-sasl-2.1.17-db4.patch 1451
 MD5 ef29bc68cc564b85a86fd21d103748d5 files/saslauthd.rc6 539
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
index 12a7a7f8db11..f4d9beb23a6f 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild,v 1.1 2004/01/14 19:42:47 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.17.ebuild,v 1.2 2004/01/15 21:50:16 max Exp $
 
 inherit eutils flag-o-matic
 
@@ -40,8 +40,11 @@ src_unpack() {
 	# Add configdir support.
 	epatch "${FILESDIR}/cyrus-sasl-2.1.17-configdir.patch"
 
+	# Fix include path for newer PostgreSQL versions.
+	epatch "${FILESDIR}/cyrus-sasl-2.1.17-pgsql-include.patch"
+
 	# Recreate configure.
-	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOCONF="2.5"
 	rm -f configure config.h.in saslauthd/configure
 	ebegin "Recreating configure"
 	aclocal -I cmulocal -I config && autoheader && autoconf || \
@@ -77,7 +80,7 @@ src_compile() {
 		myconf="${myconf} --with-dblib=berkeley"
 	fi
 
-	# compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
+	# Compaq-sdk checks for -D_REENTRANT and -pthread takes care the cpp stuff.
 	# taviso #24998 (17 Aug 03)
 	use alpha && append-flags -D_REENTRANT -pthread
 
@@ -89,7 +92,8 @@ src_compile() {
 		--with-dbpath=/etc/sasl2/sasldb2 \
 		${myconf}
 
-	emake || die "compile problem"
+	# Parallel build doesn't work.
+	emake -j1 || die "compile problem"
 }
 
 src_install () {
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
new file mode 100644
index 000000000000..90afd85147fd
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.17-pgsql-include.patch
@@ -0,0 +1,13 @@
+--- configure.in.orig	2004-01-15 13:18:24.000000000 -0800
++++ configure.in	2004-01-15 13:18:27.000000000 -0800
+@@ -674,7 +674,9 @@
+      LIB_PGSQL_DIR=$LIB_PGSQL
+      LIB_PGSQL="$LIB_PGSQL -lpq"
+ 
+-     if test -d ${with_pgsql}/include/pgsql; then
++     if test -d ${with_pgsql}/include/postgresql/pgsql; then
++         CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/postgresql/pgsql"
++     elif test -d ${with_pgsql}/include/pgsql; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/include/pgsql"
+      elif test -d ${with_pgsql}/pgsql/include; then
+          CPPFLAGS="${CPPFLAGS} -I${with_pgsql}/pgsql/include"