diff options
| author | adam <adam> | 2010-06-02 13:14:47 +0000 |
|---|---|---|
| committer | adam <adam> | 2010-06-02 13:14:47 +0000 |
| commit | 6f060bdbcc6f85533a3f31031a80f1cbb3fa7cf6 (patch) | |
| tree | 67b3e0570f90708d3283ac9230d0d2d9777800d5 /mail/mutt-devel | |
| parent | bd7503a8496882a777a07359af2ebc675464aa8f (diff) | |
| download | pkgsrc-6f060bdbcc6f85533a3f31031a80f1cbb3fa7cf6.tar.gz | |
Fix building with db5; revision bump for db4 update
Diffstat (limited to 'mail/mutt-devel')
| -rw-r--r-- | mail/mutt-devel/Makefile | 17 | ||||
| -rw-r--r-- | mail/mutt-devel/options.mk | 14 |
2 files changed, 15 insertions, 16 deletions
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index cf0e4668c42..b8aa3f044b0 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.77 2009/09/13 22:47:30 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2010/06/02 13:15:48 adam Exp $ DISTNAME= mutt-1.5.20 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MUTT_SITES= ftp://ftp.mutt.org/mutt/ \ ftp://ftp.stealth.net/pub/mirrors/ftp.mutt.org/pub/mutt/ \ @@ -20,14 +20,13 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt - GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --with-docdir=${PREFIX}/share/doc/mutt \ - --without-included-gettext \ - --enable-external-dotlock \ - --enable-pop \ - --enable-imap +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/mutt +CONFIGURE_ARGS+= --without-included-gettext +CONFIGURE_ARGS+= --enable-external-dotlock +CONFIGURE_ARGS+= --enable-pop +CONFIGURE_ARGS+= --enable-imap .if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "OpenBSD" # Force sendmail to /usr/sbin to avoid postfix's diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index 9418b0dd989..2283e06135d 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.39 2010/04/15 19:36:32 tonio Exp $ +# $NetBSD: options.mk,v 1.40 2010/06/02 13:15:48 adam Exp $ # Global and legacy options @@ -87,16 +87,16 @@ CONFIGURE_ARGS+= --disable-smime ### Header cache ### .if !empty(PKG_OPTIONS:Mmutt-hcache) -. include "../../databases/db4/buildlink3.mk" +BDB_ACCEPTED= db4 db5 +BUILDLINK_TRANSFORM+= l:db:${BDB_TYPE} +. include "../../mk/bdb.buildlink3.mk" CONFIGURE_ARGS+= --enable-hcache CONFIGURE_ARGS+= --without-gdbm -# # BDB_INCLUDE_DIR_ and BDB_LIB_DIR don't have to be particularly accurate # since the real -I and -L flags are added by buildlink already. -# -CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BUILDLINK_PREFIX.db4}/include -CONFIGURE_ENV+= BDB_LIB_DIR=${BUILDLINK_PREFIX.db4}/lib -CONFIGURE_ENV+= BDB_LIB=${BUILDLINK_LDADD.db4:S/^-l//:Q} +CONFIGURE_ENV+= BDB_INCLUDE_DIR=${BDBBASE}/include +CONFIGURE_ENV+= BDB_LIB_DIR=${BDBBASE}/lib +CONFIGURE_ENV+= BDB_LIB=${BDB_LIBS:S/^-l//:Q} .else CONFIGURE_ARGS+= --disable-hcache .endif |