diff options
| author |   Tuan Van <langthang@gentoo.org> | 2006-07-18 21:33:18 +0000 |
|---|---|---|
| committer | Tuan Van <langthang@gentoo.org> | 2006-07-18 21:33:18 +0000 |
| commit | 604f930816cc01fc9e1b34c5c9793a70912cab26 (patch) | |
| tree | 5ab8dc6c3a2f2ed8e20b1967c6d10d98310776a1 | |
| parent | Marking ~hppa for app-office/koffice (diff) | |
| download | gentoo-2-604f930816cc01fc9e1b34c5c9793a70912cab26.tar.gz gentoo-2-604f930816cc01fc9e1b34c5c9793a70912cab26.tar.bz2 gentoo-2-604f930816cc01fc9e1b34c5c9793a70912cab26.zip | |
add fam-disable-check patch. Bug #140883.
mv epatch to src_unpack and use eautoreconf instead.
(Portage version: 2.1.1_pre2-r6)
| -rw-r--r-- | mail-mta/courier/ChangeLog | 7 | ||||
| -rw-r--r-- | mail-mta/courier/courier-0.53.2.ebuild | 21 | ||||
| -rw-r--r-- | mail-mta/courier/files/fam-disable-check.patch | 23 |
3 files changed, 37 insertions, 14 deletions
diff --git a/mail-mta/courier/ChangeLog b/mail-mta/courier/ChangeLog index c82e2123a41d..93b49dd222c8 100644 --- a/mail-mta/courier/ChangeLog +++ b/mail-mta/courier/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for mail-mta/courier # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.73 2006/07/16 21:05:05 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/ChangeLog,v 1.74 2006/07/18 21:33:18 langthang Exp $ + + 18 Jul 2006; Tuấn Văn <langthang@gentoo.org> + +files/fam-disable-check.patch, courier-0.53.2.ebuild: + add fam-disable-check patch. Bug #140883. + mv epatch to src_unpack and use eautoreconf instead. 16 Jul 2006; Jason Wever <weeve@gentoo.org> courier-0.53.2.ebuild: Stable on SPARC wrt security bug #135005. diff --git a/mail-mta/courier/courier-0.53.2.ebuild b/mail-mta/courier/courier-0.53.2.ebuild index 248480484602..6fb2c28f94b0 100644 --- a/mail-mta/courier/courier-0.53.2.ebuild +++ b/mail-mta/courier/courier-0.53.2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.3 2006/07/16 21:05:05 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-mta/courier/courier-0.53.2.ebuild,v 1.4 2006/07/18 21:33:18 langthang Exp $ -inherit eutils gnuconfig flag-o-matic +inherit eutils gnuconfig flag-o-matic autotools DESCRIPTION="An MTA designed specifically for maildirs" [ -z "${PV/?.??/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" @@ -59,6 +59,11 @@ src_unpack() { cd ${S} use norewrite && epatch ${FILESDIR}/norewrite.patch use elibc_uclibc && sed -i -e 's:linux-gnu\*:linux-gnu\*\ \|\ linux-uclibc:' config.sub + if ! use fam ; then + epatch ${FILESDIR}/fam-disable-check.patch + cd ${S}/maildir + eautoreconf + fi } src_compile() { @@ -76,17 +81,7 @@ src_compile() { [ -e /etc/mime.types ] && \ myconf="${myconf} --enable-mimetypes=/etc/mime.types" - use fam || ( - epatch ${FILESDIR}/fam-disable-check.patch - export WANT_AUTOCONF="2.5" - gnuconfig_update - cd ${S}/maildir - libtoolize --copy --force - ebegin "Recreating maildir without fam" - autoconf || die "recreate maildir failed" - eend $? - myconf="${myconf} --without-fam" - ) + myconf="${myconf} $(use_with fam)" einfo "Configuring courier: `echo ${myconf} | xargs echo`" diff --git a/mail-mta/courier/files/fam-disable-check.patch b/mail-mta/courier/files/fam-disable-check.patch new file mode 100644 index 000000000000..7019d02a6af5 --- /dev/null +++ b/mail-mta/courier/files/fam-disable-check.patch @@ -0,0 +1,23 @@ +--- courier-imap-3.0.7-orig/maildir/configure.in 2004-06-08 15:44:23.000000000 -0700 ++++ courier-imap-3.0.7/maildir/configure.in 2004-08-14 15:28:20.525714876 -0700 +@@ -60,6 +60,12 @@ + dnl Checks for library functions. + AC_CHECK_HEADER(fam.h, :, :) + AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes) ++AC_ARG_WITH(fam, [ --with-fam Compile with FAM support], ++ fam="$withval", ++ fam="no") ++ ++if test "$fam" != "no" ++then + AC_CHECK_LIB(fam, FAMOpen, [ + LIBFAM=-lfam + AC_DEFINE_UNQUOTED(HAVE_FAM,1, +@@ -74,6 +80,7 @@ + AC_MSG_ERROR([[FAM development libraries not found.]]) ] + ) + ]) ++fi + + AC_SUBST(LIBFAM) + |