aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-12-31 15:00:00 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2005-12-31 15:00:00 +0000
commit6672af7e091e3098b6db48d8b8031bb27936cca9 (patch)
tree212be65e5e15bc6278885b4ce32bc650d6e0380f
parentb8517f0b1cd2b24612ebb017d591c15e23d6454d (diff)
downloadports-6672af7e091e3098b6db48d8b8031bb27936cca9.tar.gz
ports-6672af7e091e3098b6db48d8b8031bb27936cca9.zip
Notes
-rw-r--r--www/emacs-w3m-xemacs21-mule/Makefile4
-rw-r--r--www/emacs-w3m-xemacs21-mule/pkg-plist10
-rw-r--r--www/emacs-w3m/Makefile4
-rw-r--r--www/emacs-w3m/files/patch-w3mhack.el11
4 files changed, 14 insertions, 15 deletions
diff --git a/www/emacs-w3m-xemacs21-mule/Makefile b/www/emacs-w3m-xemacs21-mule/Makefile
index dea8a8233f55..3e0c9c8485d5 100644
--- a/www/emacs-w3m-xemacs21-mule/Makefile
+++ b/www/emacs-w3m-xemacs21-mule/Makefile
@@ -7,8 +7,6 @@
MASTERDIR= ${.CURDIR}/../emacs-w3m
-BROKEN= Install fails
-
EMACS_PORT_NAME= xemacs21-mule
COMMENT= Simple front-end to w3m for xemacs21-mule
@@ -21,6 +19,8 @@ INFODIR= ${EMACS_PACKAGESDIR}/info
PKGINFODIR= ${EMACS_PACKAGESDIR}/pkginfo
INSTALL_TARGET= install-package
+INFO_PATH= ${INFODIR}
+
PLIST= ${.CURDIR}/pkg-plist
PLIST_SUB+= PKGINFODIR=${PKGINFODIR} EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR}
diff --git a/www/emacs-w3m-xemacs21-mule/pkg-plist b/www/emacs-w3m-xemacs21-mule/pkg-plist
index 9b1b8486989a..47ae8959604c 100644
--- a/www/emacs-w3m-xemacs21-mule/pkg-plist
+++ b/www/emacs-w3m-xemacs21-mule/pkg-plist
@@ -1,13 +1,3 @@
-@unexec install-info --delete %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-w3m-ja.info
-@exec install-info %D/%%INFODIR%%/emacs-w3m-ja.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-w3m-ja.info-1
-%%INFODIR%%/emacs-w3m-ja.info-2
-%%INFODIR%%/emacs-w3m-ja.info-3
-%%INFODIR%%/emacs-w3m-ja.info-4
-@unexec install-info --delete %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
-%%INFODIR%%/emacs-w3m.info
-@exec install-info %D/%%INFODIR%%/emacs-w3m.info %D/%%INFODIR%%/dir
%%PKGINFODIR%%/MANIFEST.w3m
%%ICONDIR%%/antenna-up.xpm
%%ICONDIR%%/back-disabled.xpm
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 561ca177afb7..6a61af5c6364 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -23,16 +23,14 @@ CONFIGURE_ARGS?= --with-emacs=${EMACS_CMD} \
LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/w3m
ICONDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
ETCDIR?= ${EMACS_LIBDIR_WITH_VER}/etc/w3m
-INFODIR?= info
-INFO+= emacs-w3m-ja emacs-w3m
+INFO= emacs-w3m-ja emacs-w3m
USE_AUTOTOOLS= autoconf:213
ALL_TARGET= default
PLIST_SUB+= LISPDIR=${LISPDIR} \
ICONDIR=${ICONDIR} \
- INFODIR=${INFODIR} \
ETCDIR=${ETCDIR} \
SHIMBUN=${SHIMBUN}
diff --git a/www/emacs-w3m/files/patch-w3mhack.el b/www/emacs-w3m/files/patch-w3mhack.el
new file mode 100644
index 000000000000..b2cb68c19bc1
--- /dev/null
+++ b/www/emacs-w3m/files/patch-w3mhack.el
@@ -0,0 +1,11 @@
+--- w3mhack.el.orig Sat Dec 31 22:56:04 2005
++++ w3mhack.el Sat Dec 31 22:56:43 2005
+@@ -1180,7 +1180,7 @@
+ `(lambda (&rest args)
+ (apply ,si:push-mark (car args) t (cddr args)))))
+ (unwind-protect
+- (texinfo-format-buffer nil)
++ (texinfo-format-buffer t)
+ (fset 'message si:message)
+ (fset 'push-mark si:push-mark)))
+ (if (buffer-modified-p)