aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortijl <tijl@FreeBSD.org>2014-09-25 03:36:59 +0800
committertijl <tijl@FreeBSD.org>2014-09-25 03:36:59 +0800
commite04bc076edab307736138ec5b4d712d5c63e0612 (patch)
tree9ce9d964b9962e1c2aa31d76a23801c7765f01c1
parent4bbfd9f04530e70c743d140fa71183bf1cc9d611 (diff)
downloadfreebsd-ports-gnome-e04bc076edab307736138ec5b4d712d5c63e0612.tar.gz
freebsd-ports-gnome-e04bc076edab307736138ec5b4d712d5c63e0612.tar.zst
freebsd-ports-gnome-e04bc076edab307736138ec5b4d712d5c63e0612.zip
- Convert to USES=autoreconf
- Remove unused extra patch
-rw-r--r--www/emacs-w3m/Makefile7
-rw-r--r--www/emacs-w3m/files/extra-patch-aclocal.m419
2 files changed, 4 insertions, 22 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 23ced54336d4..5cfe0bb99232 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -15,13 +15,14 @@ COMMENT?= Simple front-end to w3m for emacs
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= tar:bzip2
+USES= autoreconf tar:bzip2
USE_EMACS= yes
SNAPDATE= 20140622
MAKE_JOBS_UNSAFE= yes
+GNU_CONFIGURE= yes
CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \
--with-lispdir=${PREFIX}/${LISPDIR} \
--with-icondir=${PREFIX}/${ICONDIR} \
@@ -32,7 +33,6 @@ ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
INFO= emacs-w3m-ja emacs-w3m
-USE_AUTOTOOLS= autoconf213
ALL_TARGET= default
PLIST_SUB+= LISPDIR=${LISPDIR} \
@@ -110,7 +110,8 @@ RUN_DEPENDS+= ${MULE_UCS_ELISP_FILE}:${MULE_UCS_PORT}
.endif
.endif
-post-extract:
+post-patch:
+ @${MV} ${WRKSRC}/aclocal.m4 ${WRKSRC}/acinclude.m4
.if defined(EMACS_PACKAGESDIR)
@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
.endif
diff --git a/www/emacs-w3m/files/extra-patch-aclocal.m4 b/www/emacs-w3m/files/extra-patch-aclocal.m4
deleted file mode 100644
index 789cba752f63..000000000000
--- a/www/emacs-w3m/files/extra-patch-aclocal.m4
+++ /dev/null
@@ -1,19 +0,0 @@
---- aclocal.m4.orig 2012-01-06 11:02:58.000000000 +0900
-+++ aclocal.m4 2012-03-11 22:40:26.000000000 +0900
-@@ -13,7 +13,7 @@
- dnl XEmacs 21.5 starts, in order to suppress warnings for Lisp shadows
- dnl when XEmacs 21.5 starts.
- if test "${VANILLA_FLAG}" = "-vanilla"; then
-- XEMACSDEBUG='XEMACSDEBUG='\''(setq log-warning-minimum-level (quote error))'\'' '
-+ XEMACSDEBUG=
- else
- XEMACSDEBUG=
- fi
-@@ -263,6 +263,7 @@
- fi
- fi])
- retval=`eval ${XEMACSDEBUG}${EMACS}' '${VANILLA_FLAG}' -batch -l w3mhack.el '${ADDITIONAL_LOAD_PATH}' -f w3mhack-print-status 2>/dev/null | $EGREP -v '\''^$'\'`
-+ retval=`echo $retval | tr -d "\n"`
- if test x"$retval" != xOK; then
- AC_MSG_ERROR([Process couldn't proceed. See the above messages.])
- fi