# ChangeLog for mail-filter/maildrop
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.40 2005/09/05 15:23:50 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/ChangeLog,v 1.41 2005/09/10 22:42:16 ferdy Exp $
+
+*maildrop-1.8.1-r2 (10 Sep 2005)
+
+ 10 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
+ +files/maildrop-1.8.1-disable-fam.patch, -maildrop-1.8.1-r1.ebuild,
+ +maildrop-1.8.1-r2.ebuild, maildrop-1.8.1.20050828.ebuild:
+ fix 1.8.1 and development versions adding fam use flag. Remove -r1 in favour
+ of -r2
05 Sep 2005; Fernando J. Pereda <ferdy@gentoo.org>
maildrop-1.8.1-r1.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 ce4778caef86934903335a382ada1cd4 maildrop-1.8.1-r1.ebuild 2969
MD5 1b7667f17727f2ff5bb8b8ffa61d69e2 maildrop-1.7.0-r3.ebuild 3318
-MD5 c5c8ebc7bf8ec45387a6cc2044b9fd56 maildrop-1.8.1.20050828.ebuild 3040
+MD5 f5ed19dea2cfe83b03deb87d530b3bf6 maildrop-1.8.1.20050828.ebuild 3301
MD5 3cbb6f6a6e1be7d2339173ab6d4a23cd maildrop-1.8.0-r3.ebuild 3642
-MD5 e2c4b85dde727fcf851be262633553ae ChangeLog 11819
+MD5 80ee40199f95adbf0f0c9e2493aa0ad2 maildrop-1.8.1-r2.ebuild 3274
+MD5 8745169bf7a202e5eb31ec7fb6c0f8a9 ChangeLog 12126
MD5 2fc9863fa18fa7e25fedaa87a92a3c43 metadata.xml 259
MD5 572398e0dc4c55a532433635a82d1408 maildrop-1.7.0.20040907-r1.ebuild 3248
MD5 be89a292c7c2bd4365fd160f4db22fb9 files/digest-maildrop-1.7.0.20040907-r1 77
MD5 5db4117db5eca1f36f1778625e85d190 files/digest-maildrop-1.7.0-r3 68
MD5 72eeead0d2cb72de0ee2571af5c63bd5 files/maildrop-1.7.0-db4-configure.in.patch 1290
MD5 eb7acda28529a85c74150a140f143d75 files/digest-maildrop-1.8.0-r3 68
-MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1-r1 68
+MD5 7e45a27e2694fb9f4d62724fb0ad25f8 files/digest-maildrop-1.8.1-r2 68
MD5 c9c1f6d4020a5fd19162f20c537eb5cf files/maildroprc 58
+MD5 e7efb3052fe6605244b78179990197f0 files/maildrop-1.8.1-disable-fam.patch 2511
MD5 54e776919d1cd1729e5c6c1f27c40444 files/maildrop-1.7.0-0x0B-fix.patch 525
MD5 532cc225eb7ae73b01639168857445be files/maildrop-1.7.0-db4-bdbobj_configure.in.patch 1211
MD5 2f8014fea76e32d9bb682d00ee5ce7c7 files/maildrop-1.8.0-db4.patch 2501
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDHGMrViELBEf1JB0RAgJbAJ4t8oopsB3YsmO9n1K82J8gNUNgkACePPuv
-4LnFQqyfmF+2oMhoHJZG7vg=
-=s91J
+iD8DBQFDI2FcViELBEf1JB0RAsOzAKCAONSk+L6BvNhzjffl2xGKNOqaywCcD/0o
+6nDRGe5EJew0/E3Bcn0TOno=
+=yD5g
-----END PGP SIGNATURE-----
--- /dev/null
+diff -ruBb maildrop-1.8.1.orig/configure.in maildrop-1.8.1/configure.in
+--- maildrop-1.8.1.orig/configure.in 2005-05-12 16:45:57.000000000 +0200
++++ maildrop-1.8.1/configure.in 2005-09-10 20:05:28.000000000 +0200
+@@ -145,6 +145,7 @@
+ --enable-tempdir=.tmp directory for temp files (in user's home dir)
+ --disable-tempdir disable temp files in home directory (use
+ the tmpfile function)
++ --disable-fam disable libfam.a for maildir operations
+ --enable-smallmsg=8192 size of buffer for small messages
+ --enable-global-timeout=300 global watchdog timer (seconds)
+ --enable-crlf-term=0 enable <CR><LF> line termination
+diff -ruBb maildrop-1.8.1.orig/maildir/configure.in maildrop-1.8.1/maildir/configure.in
+--- maildrop-1.8.1.orig/maildir/configure.in 2005-03-21 13:11:24.000000000 +0100
++++ maildrop-1.8.1/maildir/configure.in 2005-09-10 20:10:55.000000000 +0200
+@@ -58,26 +58,30 @@
+ AC_STRUCT_TM
+
+ dnl Checks for library functions.
+-AC_CHECK_HEADER(fam.h, :, :)
+-AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
+-AC_CHECK_LIB(fam, FAMOpen, [
++AC_ARG_ENABLE(fam, [ --disable-fam Do not use libfam.a library.])
++if test x$enableval = xyes
++then
++ AC_CHECK_HEADER(fam.h, :, :)
++ AC_CHECK_FUNCS(symlink readlink strcasecmp utime utimes)
++ AC_CHECK_LIB(fam, FAMOpen, [
+ LIBFAM=-lfam
+ AC_DEFINE_UNQUOTED(HAVE_FAM,1,
+ [ Whether libfam.a is available ])
+
+ AC_CHECK_HEADER(fam.h, : , [
+-AC_MSG_WARN([[The development header files and libraries for fam,]])
+-AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
+-AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
+-AC_MSG_WARN([[so you need to simply install the additional development]])
+-AC_MSG_WARN([[package for your operating system.]])
+-AC_MSG_ERROR([[FAM development libraries not found.]]) ]
++ AC_MSG_WARN([[The development header files and libraries for fam,]])
++ AC_MSG_WARN([[the File Alteration Monitor, are not installed.]])
++ AC_MSG_WARN([[You appear to have the FAM runtime libraries installed,]])
++ AC_MSG_WARN([[so you need to simply install the additional development]])
++ AC_MSG_WARN([[package for your operating system.]])
++ AC_MSG_ERROR([[FAM development libraries not found.]]) ]
+ )
+ ])
+
+-AC_SUBST(LIBFAM)
++ AC_SUBST(LIBFAM)
+
+-echo "$LIBFAM" >maildir.libdeps
++ echo "$LIBFAM" >maildir.libdeps
++fi
+
+ AC_CACHE_CHECK([for missing gethostname prototype],maildir_cv_SYS_GETHOSTNAME,
+
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.1-r1.ebuild,v 1.4 2005/09/05 15:23:50 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.1-r2.ebuild,v 1.1 2005/09/10 22:42:16 ferdy Exp $
inherit eutils gnuconfig
DESCRIPTION="Mail delivery agent/filter"
-[ -z "${PV/?.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${PV/?.?.?/}" ] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
-[ -z "${SRC_URI}" ] && SRC_URI="http://www.courier-mta.org/beta/courier/${P%%_pre}.tar.bz2"
+[[ -z ${PV/?.?} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${PV/?.?.?} ]] && SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+[[ -z ${SRC_URI} ]] && SRC_URI="http://www.courier-mta.org/beta/${PN}/${P%%_pre}.tar.bz2"
HOMEPAGE="http://www.courier-mta.org/maildrop/"
S="${WORKDIR}/${P%%_pre}"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="mysql ldap gdbm berkdb debug postgres"
+IUSE="berkdb debug fam gdbm ldap mysql postgres"
PROVIDE="virtual/mda"
-DEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
- !gdbm? ( berkdb? ( >=sys-libs/db-3 ) )
- mysql? ( net-libs/courier-authlib )
+DEPEND="!mail-mta/courier
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ mysql? ( net-libs/courier-authlib )
postgres? ( net-libs/courier-authlib )
- ldap? ( net-libs/courier-authlib )
- !mail-mta/courier"
+ ldap? ( net-libs/courier-authlib )
+ fam? ( virtual/fam )
+ !fam? ( ~sys-devel/autoconf-2.59 )
+ !gdbm? (
+ berkdb? (
+ >=sys-libs/db-3
+ ~sys-devel/autoconf
+ )
+ )"
RDEPEND="${DEPEND}
dev-lang/perl"
# Be nice with uclibc also
use elibc_uclibc && sed -i -e 's~linux-gnu\*~& | linux-uclibc~' config.sub
+ # Prefer gdbm over berkdb
if use gdbm ; then
use berkdb && einfo "Both gdbm and berkdb selected. Using gdbm."
- else
- if use berkdb ; then
- epatch ${FILESDIR}/maildrop-1.8.0-db4.patch
- export WANT_AUTOCONF="2.5"
- gnuconfig_update
- libtoolize --copy --force
- ebegin "Recreating configure."
- autoconf || die "recreate configure failed."
- eend $?
+ elif use berkdb ; then
+ epatch ${FILESDIR}/${PN}-1.8.0-db4.patch
cd ${S}/bdbobj
libtoolize --copy --force
- ebegin "Recreating configure in bdbobj."
- autoconf || die "recreate configure failed."
- eend $?
- else
- einfo "Building without database support"
- fi
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (bdbobj)"
+ fi
+
+ if ! use fam ; then
+ epatch ${FILESDIR}/${P}-disable-fam.patch
+ cd ${S}/maildir
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (maildir)"
+ fi
+
+ # Only recreate configure if needed
+ if ! use fam || { ! use gdbm && use berkdb ; } ; then
+ gnuconfig_update
+ libtoolize --copy --force
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (topdir)"
fi
}
fi
econf \
+ $(use_enable fam) \
+ --disable-dependency-tracker \
--with-devel \
--disable-tempdir \
--enable-syslog=1 \
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.1.20050828.ebuild,v 1.2 2005/09/05 15:01:48 ferdy Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/maildrop/maildrop-1.8.1.20050828.ebuild,v 1.3 2005/09/10 22:42:16 ferdy Exp $
inherit eutils gnuconfig
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="mysql ldap gdbm berkdb debug postgres"
+IUSE="berkdb debug fam gdbm ldap mysql postgres"
PROVIDE="virtual/mda"
-DEPEND="gdbm? ( >=sys-libs/gdbm-1.8.0 )
- !gdbm? ( berkdb? (
- >=sys-libs/db-3
- ~sys-devel/autoconf-2.59
- )
- )
- mysql? ( net-libs/courier-authlib )
+DEPEND="!mail-mta/courier
+ dev-libs/libpcre
+ gdbm? ( >=sys-libs/gdbm-1.8.0 )
+ mysql? ( net-libs/courier-authlib )
postgres? ( net-libs/courier-authlib )
- ldap? ( net-libs/courier-authlib )
- !mail-mta/courier"
+ ldap? ( net-libs/courier-authlib )
+ fam? ( virtual/fam )
+ !fam? ( ~sys-devel/autoconf-2.59 )
+ !gdbm? (
+ berkdb? (
+ >=sys-libs/db-3
+ ~sys-devel/autoconf
+ )
+ )"
RDEPEND="${DEPEND}
- virtual/fam
- dev-libs/libpcre
dev-lang/perl"
src_unpack() {
# Be nice with uclibc also
use elibc_uclibc && sed -i -e 's~linux-gnu\*~& | linux-uclibc~' config.sub
+ # Prefer gdbm over berkdb
if use gdbm ; then
use berkdb && einfo "Both gdbm and berkdb selected. Using gdbm."
- else
- if use berkdb ; then
- epatch ${FILESDIR}/maildrop-1.8.0-db4.patch
- export WANT_AUTOCONF="2.59"
- gnuconfig_update
- libtoolize --copy --force
- ebegin "Recreating configure."
- autoconf || die "recreate configure failed."
- eend $?
+ elif use berkdb ; then
+ epatch ${FILESDIR}/${PN}-1.8.0-db4.patch
cd ${S}/bdbobj
libtoolize --copy --force
- ebegin "Recreating configure in bdbobj."
- autoconf || die "recreate configure failed."
- eend $?
- else
- einfo "Building without database support"
- fi
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (bdbobj)"
+ fi
+
+ if ! use fam ; then
+ epatch ${FILESDIR}/${P%.*}-disable-fam.patch
+ cd ${S}/maildir
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (maildir)"
+ fi
+
+ # Only recreate configure if needed
+ if ! use fam || { ! use gdbm && use berkdb ; } ; then
+ gnuconfig_update
+ libtoolize --copy --force
+ WANT_AUTOCONF=2.59 autoconf || die "recreate configure failed (topdir)"
fi
}
fi
econf \
+ $(use_enable fam) \
+ --disable-dependency-tracker \
--with-devel \
--disable-tempdir \
--enable-syslog=1 \
projects / gentoo.git / commitdiff