svn commit: r369205 - in head/mail/mutt14: . files

[Tijl Coosemans]

Author: tijl
Date: Wed Sep 24 20:25:54 2014
New Revision: 369205
URL: http://svnweb.freebsd.org/changeset/ports/369205
QAT: https://qat.redports.org/buildarchive/r369205/

Log:
  - Convert to USES=autoreconf
  - Fix detection of base system Heimdal

Deleted:
  head/mail/mutt14/files/patch-aclocal.m4
Modified:
  head/mail/mutt14/Makefile
  head/mail/mutt14/files/patch-m4-gssapi.m4

Modified: head/mail/mutt14/Makefile
==============================================================================
--- head/mail/mutt14/Makefile	Wed Sep 24 20:22:49 2014	(r369204)
+++ head/mail/mutt14/Makefile	Wed Sep 24 20:25:54 2014	(r369205)
@@ -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

Modified: head/mail/mutt14/files/patch-m4-gssapi.m4
==============================================================================
--- head/mail/mutt14/files/patch-m4-gssapi.m4	Wed Sep 24 20:22:49 2014	(r369204)
+++ head/mail/mutt14/files/patch-m4-gssapi.m4	Wed Sep 24 20:25:54 2014	(r369205)
@@ -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