added a patch

3 files changed, 97 insertions, 2 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 296455d70924..bbda6a7b93a7 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.22 2003/02/07 20:06:56 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.23 2003/02/11 11:01:16 raker Exp $
 
 *cyrus-imapd-2.1.12 (07 Feb 2003)
 
+  11 Feb 2003; Nick Hadaway <raker@gentoo.org> cyrus-imapd-2.1.12.ebuild,
+  files/cyrus-imapd-2.1.12-includepath.patch :
+  Added a patch to remove spurious -I/usr/include statements so users
+  configure runs will detect things such as sasl properly.
+
   07 Feb 2003; Nick Hadaway <raker@gentoo.org> cyrus-imapd-2.1.12.ebuild,
   files/digest-cyrus-imapd-2.1.12, files/cyrus-imapd-2.1.12-libwrap.patch :
   Version bump.
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
index 8f6101619b26..05b3229107a7 100644
--- a/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.2 2003/02/07 20:08:23 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.12.ebuild,v 1.3 2003/02/11 11:01:16 raker Exp $
 
 inherit eutils
 
@@ -32,6 +32,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd ${S}
+	# remove spurious -I/usr/includes
+	epatch ${FILESDIR}/${P}-includepath.patch
 	# add libwrap defines as we don't have a dynamicly linked library.
 	epatch ${FILESDIR}/${P}-libwrap.patch
 	# when linking with rpm, you need to link with more libraries.
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch
new file mode 100644
index 000000000000..4a59a0c0c541
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-2.1.12-includepath.patch
@@ -0,0 +1,88 @@
+diff -urN cyrus-imapd-2.1.12/configure cyrus-imapd-2.1.12-modified/configure
+--- cyrus-imapd-2.1.12/configure	2003-02-03 15:31:13.000000000 -0600
++++ cyrus-imapd-2.1.12-modified/configure	2003-02-11 04:40:39.000000000 -0600
+@@ -1499,10 +1499,10 @@
+     CFLAGS="-Wall ${CFLAGS}"
+   GCC_VERSION=`$CC -v 2>&1 | sed -n -e '/version/s/.*version \([0-9]\)\..*/\1/p'`
+   if test "$GCC_VERSION" != "3"; then
+-    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
++    CPPFLAGS="${CPPFLAGS}"
+   fi
+ else
+-  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
++  CPPFLAGS="${CPPFLAGS}"
+ fi 
+ 
+   # this is CMU ADD LIBPATH
+@@ -4501,7 +4501,7 @@
+ if test "${with_afs+set}" = set; then
+   withval="$with_afs"
+   with_afs="${withval}"
+-	CFLAGS="${CFLAGS} -I${withval}/include"
++	CFLAGS="${CFLAGS}"
+ else
+   with_afs="/usr/local"
+ fi
+@@ -5028,7 +5028,7 @@
+ 
+ 		
+ 		;;
+-	*)  OPENSSL_INC="-I${with_openssl}/include"
++	*)  OPENSSL_INC=""
+ 	    OPENSSL_LIBPATH="${with_openssl}/lib"
+ 	    CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
+ 	    
+@@ -5131,7 +5131,7 @@
+        *)  if test -d ${with_zephyr}/include/zephyr; then
+                ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
+            else
+-               ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
++               ZEPHYR_CPPFLAGS=""
+            fi
+            ZEPHYR_LIBS="-lzephyr";;
+ esac
+@@ -5384,7 +5384,7 @@
+   *) # use whatever they told us, or whatever we found
+      COMPILE_ET="${with_com_err}/bin/compile_et"
+      COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
+-     COM_ERR_CPPFLAGS="-I${with_com_err}/include"
++     COM_ERR_CPPFLAGS=""
+      # Ever get the feeling people hide this stuff on purpose?
+      if test -d "${with_com_err}/include/et" ; then
+        COM_ERR_CPPFLAGS="-I${with_com_err}/include"
+@@ -5796,7 +5796,7 @@
+ 
+  if test "$gssapi" != no; then
+     if test -d ${gssapi}; then
+-       CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++       CPPFLAGS="$CPPFLAGS"
+        LDFLAGS="$LDFLAGS -L$gssapi/lib"
+     fi
+     ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
+@@ -5970,7 +5970,7 @@
+ fi
+ 
+   if test -d ${gssapi}; then 
+-     CPPFLAGS="$CPPFLAGS -I$gssapi/include"
++     CPPFLAGS="$CPPFLAGS"
+      LDFLAGS="$LDFLAGS -L$gssapi/lib"
+   fi
+ 
+@@ -6587,7 +6587,7 @@
+ 
+   if test "$with_libwrap" != no; then
+     if test -d "$with_libwrap"; then
+-      CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
++      CPPFLAGS="$CPPFLAGS"
+       LDFLAGS="$LDFLAGS -L${with_libwrap}/lib"
+     fi
+     cmu_save_LIBS="$LIBS"
+@@ -6733,7 +6733,7 @@
+ 
+   if test "$with_ucdsnmp" != no; then
+     if test -d "$with_ucdsnmp"; then
+-      CPPFLAGS="$CPPFLAGS -I${with_ucdsnmp}/include"
++      CPPFLAGS="$CPPFLAGS"
+       LDFLAGS="$LDFLAGS -L${with_ucdsnmp}/lib"
+     fi
+     cmu_save_LIBS="$LIBS"