Some cleanup of the mutt Makefile's. Moving the common

WANTLIB stuff to Makefile.inc. Sorting the CONFIGURE_ARGS
options. Having the stable release of mutt use the appropriate
version of autoconf.

from brad@
This commit is contained in:
bernd 2008-05-09 17:46:51 +00:00
parent 2569c87523
commit 76ec27bad0
3 changed files with 16 additions and 23 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.25 2007/11/11 10:09:43 sthen Exp $
# $OpenBSD: Makefile.inc,v 1.26 2008/05/09 17:46:51 bernd Exp $
CATEGORIES= mail
@ -19,26 +19,24 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB+= c crypto des gssapi krb5 ssl
FLAVORS+= slang mixmaster compressed
FLAVOR?=
AUTOCONF_VERSION?= 2.59
CONFIGURE_STYLE= autoconf old
CONFIGURE_ARGS+=--with-sharedir="${PREFIX}/share/mutt" \
--with-docdir="${PREFIX}/share/doc/mutt" \
AUTOCONF_VERSION?= 2.61
CONFIGURE_ARGS+=--enable-external_dotlock \
--enable-flock \
--disable-fcntl \
--enable-external_dotlock \
--enable-imap \
--enable-pop \
--disable-fcntl \
--mandir=${PREFIX}/man \
--sysconfdir=${CONFDIR} \
--with-docdir="${PREFIX}/share/doc/mutt" \
--with-gss \
--with-sharedir="${PREFIX}/share/mutt" \
--with-ssl \
--sysconfdir=${CONFDIR}
.if ${KERBEROS5} == "yes"
CONFIGURE_ARGS+=--with-gss
WANTLIB+= gssapi krb5
.endif
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.46 2008/02/06 15:01:56 okan Exp $
# $OpenBSD: Makefile,v 1.47 2008/05/09 17:46:51 bernd Exp $
COMMENT= tty-based e-mail client, development version
@ -7,14 +7,13 @@ DISTNAME= mutt-${VERSION}
PKGNAME= ${DISTNAME}p0
MASTER_SITES= ${MASTER_SITES_MUTT:=devel/}
WANTLIB= z
FLAVORS= idn sasl sidebar
FLAVOR?=
AUTOCONF_VERSION=2.61
CONFIGURE_ARGS= --enable-smtp \
--mandir=${PREFIX}/man \
--enable-hcache \
CONFIGURE_ARGS= --enable-hcache \
--enable-smtp \
--without-gdbm
LIB_DEPENDS= qdbm.>=14::databases/qdbm
@ -24,6 +23,4 @@ CONFIGURE_ARGS+= --with-sasl=${LOCALBASE}
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
.endif
WANTLIB= c crypto des ssl z
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.34 2007/11/11 10:09:43 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2008/05/09 17:46:51 bernd Exp $
COMMENT= tty-based e-mail client
@ -6,6 +6,4 @@ VERSION= 1.4.2.3
DISTNAME= mutt-${VERSION}
MASTER_SITES= ${MASTER_SITES_MUTT}
WANTLIB= c crypto des ssl
.include <bsd.port.mk>