3 files changed, 26 insertions, 69 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 4ecadf1772e8..b68f726e876d 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.5
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -23,23 +23,14 @@ LISPDIR?=	${EMACS_VERSION_SITE_LISPDIR}/w3m
 ICONDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m/icons
 ETCDIR?=	${EMACS_LIBDIR_WITH_VER}/etc/w3m
 INFODIR?=	info
-PKGINFODIR?=	"@comment "
 
 USE_AUTOCONF=	yes
 ALL_TARGET=	default
 
-PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
-		XEMACS=${XEMACS} \
-		EMACS20=${EMACS20} \
-		EMACS21=${EMACS21} \
-		EMACS=${EMACS} \
-		LISPDIR=${LISPDIR} \
+PLIST_SUB+=	LISPDIR=${LISPDIR} \
 		ICONDIR=${ICONDIR} \
-		ETCDIR=${ETCDIR} \
 		INFODIR=${INFODIR} \
-		PKGINFODIR=${PKGINFODIR} \
-		ICONS=${ICONS} \
-		ETC=${ETC} \
+		ETCDIR=${ETCDIR} \
 		SHIMBUN=${SHIMBUN}
 
 DOCS=		README
@@ -48,32 +39,6 @@ DOCS_JA=	README.ja
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
 DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
 
-.if (${EMACS_PORT_NAME} == "xemacs21-mule")
-XEMACS=		""
-EMACS=		"@comment "
-EMACS20=	"@comment "
-EMACS21=	"@comment "
-ICONS=		""
-ETC=		"@comment "
-.else
-.if (${EMACS_PORT_NAME} == "emacs20")
-XEMACS=		"@comment "
-EMACS=		""
-EMACS20=	""
-EMACS21=	"@comment "
-ICONS=		"@comment "
-ETC=		"@comment "
-.else
-XEMACS=		"@comment "
-EMACS=		""
-EMACS20=	"@comment "
-EMACS21=	""
-ICONS=		""
-ETC=		""
-INSTALL_TARGET=	install install-icons
-.endif
-.endif
-
 .if defined(WITHOUT_SHIMBUN)
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-Makefile.in
 SHIMBUN=	"@comment "
@@ -86,6 +51,7 @@ SHIMBUN=	""
 FLIM_PORT=	${PORTSDIR}/editors/flim
 SEMI_PORT=	${PORTSDIR}/editors/semi
 MULE_UCS_PORT=	${PORTSDIR}/converters/mule-ucs
+INSTALL_TARGET=	install install-icons
 .endif
 
 FLIM_TRUNK=	1.14
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 90a9e79a025b..04ffb1edf65e 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1 +1 @@
-MD5 (emacs-w3m-1.3.4.tar.gz) = 0eedca4336ebe5acc44f989604398e03
+MD5 (emacs-w3m-1.3.5.tar.gz) = 2e9c9d66b7150b4b006ee8b283145fef
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 484b48e98401..d4e919907dc3 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -11,32 +11,22 @@
 %%INFODIR%%/emacs-w3m.info-2
 %%INFODIR%%/emacs-w3m.info-3
 %%INFODIR%%/emacs-w3m.info-4
-%%PKGINFODIR%%/MANIFEST.w3m
-%%ICONS%%%%ICONDIR%%/antenna-up.xpm
-%%ICONS%%%%ICONDIR%%/back-disabled.xpm
-%%ICONS%%%%ICONDIR%%/back-up.xpm
-%%ICONS%%%%ICONDIR%%/copy-up.xpm
-%%ICONS%%%%ICONDIR%%/db-history-up.xpm
-%%ICONS%%%%ICONDIR%%/forward-disabled.xpm
-%%ICONS%%%%ICONDIR%%/forward-up.xpm
-%%ICONS%%%%ICONDIR%%/history-up.xpm
-%%ICONS%%%%ICONDIR%%/home-up.xpm
-%%ICONS%%%%ICONDIR%%/image-up.xpm
-%%ICONS%%%%ICONDIR%%/open-up.xpm
-%%ICONS%%%%ICONDIR%%/parent-disabled.xpm
-%%ICONS%%%%ICONDIR%%/parent-up.xpm
-%%ICONS%%%%ICONDIR%%/reload-up.xpm
-%%ICONS%%%%ICONDIR%%/search-up.xpm
-%%ICONS%%%%ICONDIR%%/weather-up.xpm
-%%ICONS%%@dirrm %%ICONDIR%%
-%%ETC%%@dirrm %%ETCDIR%%
-%%XEMACS%%%%LISPDIR%%/_pkg.el
-%%XEMACS%%%%LISPDIR%%/_pkg.elc
-%%XEMACS%%%%LISPDIR%%/auto-autoloads.el
-%%XEMACS%%%%LISPDIR%%/auto-autoloads.elc
-%%XEMACS%%%%LISPDIR%%/custom-load.el
-%%XEMACS%%%%LISPDIR%%/custom-load.elc
-%%XEMACS%%%%LISPDIR%%/w3m-xmas.elc
+%%ICONDIR%%/antenna-up.xpm
+%%ICONDIR%%/back-disabled.xpm
+%%ICONDIR%%/back-up.xpm
+%%ICONDIR%%/copy-up.xpm
+%%ICONDIR%%/db-history-up.xpm
+%%ICONDIR%%/forward-disabled.xpm
+%%ICONDIR%%/forward-up.xpm
+%%ICONDIR%%/history-up.xpm
+%%ICONDIR%%/home-up.xpm
+%%ICONDIR%%/image-up.xpm
+%%ICONDIR%%/open-up.xpm
+%%ICONDIR%%/parent-disabled.xpm
+%%ICONDIR%%/parent-up.xpm
+%%ICONDIR%%/reload-up.xpm
+%%ICONDIR%%/search-up.xpm
+%%ICONDIR%%/weather-up.xpm
 %%SHIMBUN%%%%LISPDIR%%/mew-shimbun.el
 %%SHIMBUN%%@unexec rm -f %D/%%LISPDIR%%/mew-shimbun.elc
 %%LISPDIR%%/mew-w3m.el
@@ -222,11 +212,10 @@
 %%LISPDIR%%/w3m-dtree.elc
 %%LISPDIR%%/w3m-e19.el
 %%LISPDIR%%/w3m-e20.el
-%%EMACS20%%%%LISPDIR%%/w3m-e20.elc
 %%LISPDIR%%/w3m-e21.el
-%%EMACS21%%%%LISPDIR%%/w3m-e21.elc
+%%LISPDIR%%/w3m-e21.elc
 %%LISPDIR%%/w3m-fsf.el
-%%EMACS%%%%LISPDIR%%/w3m-fsf.elc
+%%LISPDIR%%/w3m-fsf.elc
 %%LISPDIR%%/w3m-form.el
 %%LISPDIR%%/w3m-form.elc
 %%LISPDIR%%/w3m-hist.el
@@ -254,8 +243,10 @@
 %%LISPDIR%%/w3m.elc
 %%LISPDIR%%/w3mhack.el
 %%LISPDIR%%/w3m.el
-@dirrm %%LISPDIR%%
 %%PORTDOCS%%share/doc/ja/emacs-w3m/README.ja
 %%PORTDOCS%%share/doc/emacs-w3m/README
 %%PORTDOCS%%@dirrm share/doc/ja/emacs-w3m
 %%PORTDOCS%%@dirrm share/doc/emacs-w3m
+@dirrm %%LISPDIR%%
+@dirrm %%ICONDIR%%
+@dirrm %%ETCDIR%%