aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mail/mutt/Makefile7
-rw-r--r--mail/mutt14/Makefile7
2 files changed, 10 insertions, 4 deletions
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index f2a78a145166..0226d7633028 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -79,8 +79,8 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
-USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 19 # configure.in is patched by <PATCHFILES>
+USE_AUTOCONF_VER= 259
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
@@ -135,6 +135,9 @@ post-patch::
cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
.endif
+pre-configure::
+ @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+
# XXX
# this should be done automagically by aclocal but ....
# for now, this will have to do
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index f2a78a145166..0226d7633028 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -79,8 +79,8 @@ DIST_SUBDIR= mutt
WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//}
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USE_AUTOMAKE_VER= 14 # configure.in is patched by <PATCHFILES>
-USE_AUTOCONF_VER= 213
+USE_AUTOMAKE_VER= 19 # configure.in is patched by <PATCHFILES>
+USE_AUTOCONF_VER= 259
USE_REINPLACE= yes
CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
LDFLAGS+= -L${LOCALBASE}/lib
@@ -135,6 +135,9 @@ post-patch::
cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch
.endif
+pre-configure::
+ @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4)
+
# XXX
# this should be done automagically by aclocal but ....
# for now, this will have to do