summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-mail/courier-imap/ChangeLog9
-rw-r--r--net-mail/courier-imap/courier-imap-4.1.2.ebuild7
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch10
-rw-r--r--net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch34
4 files changed, 57 insertions, 3 deletions
diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index edad6792fa57..186cd7b7468d 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for net-mail/courier-imap
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.143 2007/02/26 11:09:41 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.144 2007/02/27 17:34:53 chutzpah Exp $
+
+ 27 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+ +files/courier-imap-4.1.2-aclocal-fix.patch,
+ +files/courier-imap-4.1.2-db4-configure.in.patch,
+ courier-imap-4.1.2.ebuild:
+ Add patch to remove AC_PROG_SYSCONFTOOL from configure.in, move patch out of
+ -db4-configure.in.patch (fixes bug #168206).
25 Feb 2007; Patrick McLean <chutzpah@gentoo.org>
+files/courier-imap-4.0.6-db4-tcpd_configure.in.patch,
diff --git a/net-mail/courier-imap/courier-imap-4.1.2.ebuild b/net-mail/courier-imap/courier-imap-4.1.2.ebuild
index c40fa80ece4f..084cd0cd7d3d 100644
--- a/net-mail/courier-imap/courier-imap-4.1.2.ebuild
+++ b/net-mail/courier-imap/courier-imap-4.1.2.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/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.2 2007/02/25 22:56:32 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.1.2.ebuild,v 1.3 2007/02/27 17:34:53 chutzpah Exp $
WANT_AUTOCONF="2.6"
@@ -70,12 +70,15 @@ src_unpack() {
# This new patch should fix bug #51540. fam USE flag is not needed for shared folder support.
epatch ${FILESDIR}/${PN}-4.0.1-disable-fam-configure.in.patch
+ # kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206)
+ epatch "${FILESDIR}"/${P}-aclocal-fix.patch
+
# These patches should fix problem detecting Berkeley DB.
# We now can compile with db4 support.
if use berkdb; then
epatch ${FILESDIR}/${PN}-4.0.6-db4-bdbobj_configure.in.patch
epatch ${FILESDIR}/${PN}-4.0.6-db4-tcpd_configure.in.patch
- epatch ${FILESDIR}/${PN}-4.0.6-db4-configure.in.patch
+ epatch ${FILESDIR}/${P}-db4-configure.in.patch
fi
export WANT_AUTOCONF="2.5"
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
new file mode 100644
index 000000000000..f8cb78adaf07
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.1.2-aclocal-fix.patch
@@ -0,0 +1,10 @@
+--- courier-imap-4.1.2.orig/configure.in 2006-12-30 09:28:52.000000000 -0500
++++ courier-imap-4.1.2/configure.in 2007-02-27 12:13:38.000000000 -0500
+@@ -16,7 +16,6 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_MAKE_SET
+-AC_PROG_SYSCONFTOOL
+ AC_LIBTOOL_DLOPEN
+ AM_PROG_LIBTOOL
+
diff --git a/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
new file mode 100644
index 000000000000..03d2c03912a8
--- /dev/null
+++ b/net-mail/courier-imap/files/courier-imap-4.1.2-db4-configure.in.patch
@@ -0,0 +1,34 @@
+--- configure.in.orig 2004-11-16 16:02:11.045791896 -0800
++++ configure.in 2004-11-16 16:03:06.743324584 -0800
+@@ -150,16 +149,22 @@
+
+ if test "$db" != "gdbm"
+ then
++ for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
++ do
++ AC_CHECK_LIB($dbname, db_create_4004, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ AC_CHECK_LIB($dbname, db_create_4003, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ AC_CHECK_LIB($dbname, db_create_4002, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ AC_CHECK_LIB($dbname, db_create_4001, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ AC_CHECK_LIB($dbname, db_create_4000, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ],
++ AC_CHECK_LIB($dbname, db_create, [ LIBDB=-l$dbname ; LIBS="-l$dbname $LIBS"; break ]))))))
++ done
++ AC_CHECK_FUNC(db_create_4004, HAVE_BDB=1)
++ AC_CHECK_FUNC(db_create_4003, HAVE_BDB=1)
++ AC_CHECK_FUNC(db_create_4002, HAVE_BDB=1)
++ AC_CHECK_FUNC(db_create_4001, HAVE_BDB=1)
++ AC_CHECK_FUNC(db_create_4000, HAVE_BDB=1)
++ AC_CHECK_FUNC(db_create, HAVE_BDB=1)
+
+- AC_CHECK_LIB(db, dbopen, [ LIBDB=-ldb ; LIBS="-ldb $LIBS" ],
+- AC_CHECK_LIB(db, db_open, [ LIBDB=-ldb ; LIBS="-ldb $LIBS"],
+- AC_CHECK_LIB(db, db_env_create,
+- [ LIBDB=-ldb; LIBS="-ldb $LIBS"])
+- ))
+-
+- AC_CHECK_FUNC(dbopen, HAVE_BDB=1)
+- AC_CHECK_FUNC(db_open, HAVE_BDB=1)
+- AC_CHECK_FUNC(db_env_create, HAVE_BDB=1)
+ fi
+
+ LIBS="$saveLIBS"