diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-24 20:25:54 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2014-09-24 20:25:54 +0000 |
| commit | fa0d7caf797471dc4fd9ae65469440144490c089 (patch) | |
| tree | 64bd200890f6b4f12481ae4bdbe6c51c19527905 /mail | |
| parent | - Convert to USES=autoreconf (diff) | |
- Convert to USES=autoreconf
- Fix detection of base system Heimdal
Notes
Notes:
svn path=/head/; revision=369205
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/mutt14/Makefile | 25 | ||||
| -rw-r--r-- | mail/mutt14/files/patch-aclocal.m4 | 11 | ||||
| -rw-r--r-- | mail/mutt14/files/patch-m4-gssapi.m4 | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile index a377586ed77c..47019da8f0bf 100644 --- a/mail/mutt14/Makefile +++ b/mail/mutt14/Makefile @@ -90,8 +90,7 @@ PKGMESSAGE= ${PKGDIR}/pkg-message.xface DIST_SUBDIR= mutt WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} GNU_CONFIGURE= yes -USE_AUTOTOOLS= automake autoconf -AUTOMAKE_ARGS= --add-missing +USES+= autoreconf LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \ @@ -137,40 +136,20 @@ WITH_MUTT_KRB5_SYS=YES .endif .endif -post-patch:: +post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ ${WRKSRC}/contrib/gpg.rc @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ ${WRKSRC}/contrib/pgp6.rc @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ ${WRKSRC}/contrib/Makefile.in - .if ${PORT_OPTIONS:MMUTT_XFACE} -post-patch:: @${ECHO} "===> Applying XFACE patch" slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \ -name slrnface-\*`; \ cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch .endif -pre-configure:: - @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) -.if defined(WITH_MUTT_KRB5_SYS) - @${ECHO_CMD} "#define HAVE_HEIMDAL" >> ${WRKSRC}/config.h.in - @${REINPLACE_CMD} -e 's|<gssapi/gssapi\.h>|<gssapi.h>|' \ - ${WRKSRC}/imap/auth_gss.c -.endif - -# XXX -# this should be done automagically by aclocal but .... -# for now, this will have to do -pre-build: - @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \ - -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \ - -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \ - -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \ - ${BUILD_WRKSRC}/Makefile - .if ${PORT_OPTIONS:MDOCS} post-build: @${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml diff --git a/mail/mutt14/files/patch-aclocal.m4 b/mail/mutt14/files/patch-aclocal.m4 deleted file mode 100644 index 6635a1a90fa6..000000000000 --- a/mail/mutt14/files/patch-aclocal.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4.orig Fri Jul 28 11:50:25 2000 -+++ aclocal.m4 Wed Dec 5 12:10:16 2001 -@@ -62,4 +62,4 @@ --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir) -+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir) -+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir) -+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir) diff --git a/mail/mutt14/files/patch-m4-gssapi.m4 b/mail/mutt14/files/patch-m4-gssapi.m4 index 2425cde4f2b8..43c8000c4825 100644 --- a/mail/mutt14/files/patch-m4-gssapi.m4 +++ b/mail/mutt14/files/patch-m4-gssapi.m4 @@ -20,7 +20,7 @@ case "`$KRB5CFGPATH --version`" in "Kerberos 5 "*) GSSAPI_IMPL="MIT";; - [hH]eimdal*) GSSAPI_IMPL="Heimdal";; -+ ?eimdal*) GSSAPI_IMPL="Heimdal";; ++ *[[hH]]eimdal*) GSSAPI_IMPL="Heimdal";; *) GSSAPI_IMPL="Unknown";; esac else |