3 files changed, 78 insertions, 7 deletions

diff --git a/www/emacs-w3m-emacs20/Makefile b/www/emacs-w3m-emacs20/Makefile
index cc1d7dede3aa..3fe8814ebb66 100644
--- a/www/emacs-w3m-emacs20/Makefile
+++ b/www/emacs-w3m-emacs20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	0.2.150
+PORTVERSION=	1.0
 CATEGORIES=	www elisp
 MASTER_SITES=	http://namazu.org/~tsuchiya/emacs-w3m/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -29,7 +29,8 @@ PLIST_SUB+=	EMACS_NAME=${EMACS_NAME} \
 		EMACS_ONLY=${EMACS_ONLY} \
 		LISPDIR=${LISPDIR} \
 		ETCDIR=${ETCDIR} \
-		PKGINFODIR=${PKGINFODIR}
+		PKGINFODIR=${PKGINFODIR} \
+		SHIMBUN=${SHIMBUN}
 
 DOCS=		README
 DOCS_JA=	README.ja TIPS.ja
@@ -42,9 +43,35 @@ DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
 .if ${EMACS_NAME} == xemacs
 XEMACS_ONLY?=		""
 EMACS_ONLY?=		"@comment "
+SEMI_FILE=		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el
 .else
 XEMACS_ONLY?=		"@comment "
 EMACS_ONLY?=		""
+SEMI_FILE=		${LOCALBASE}/${EMACS_LIBDIR}/site-lisp/semi/mime-setup.el
+.endif
+
+.if defined(WITH_SHIMBUN)
+HAVE_SEMI=yes
+SHIMBUN=		""
+.else 
+.if exists(${SEMI_FILE})
+HAVE_SEMI=yes
+SHIMBUN=		""
+.else
+SHIMBUN=		"@comment "
+.endif
+.endif
+
+.if defined(HAVE_SEMI) 
+BUILD_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
+RUN_DEPENDS+=		${SEMI_FILE}:${PORTSDIR}/editors/semi-${EMACS_PORT_NAME}-current
+.endif
+
+.if !defined(HAVE_SEMI)
+pre-fetch:
+	@${ECHO_MSG}
+	@${ECHO_MSG} "NOTE: You can have shimbun support by adding \"WITH_SHIMBUN=yes\" to argument of make."
+	@${ECHO_MSG}
 .endif
 
 post-extract:
diff --git a/www/emacs-w3m-emacs20/distinfo b/www/emacs-w3m-emacs20/distinfo
index 8011f042a66b..10fa02b4c35a 100644
--- a/www/emacs-w3m-emacs20/distinfo
+++ b/www/emacs-w3m-emacs20/distinfo
@@ -1 +1 @@
-MD5 (w3m_el-0.2.150.tar.gz) = ea1ecc0aef0bcb992813a70066ccc8b5
+MD5 (w3m_el-1.0.tar.gz) = 4056fa10c6f6a145e150b2f6387a9936
diff --git a/www/emacs-w3m-emacs20/pkg-plist b/www/emacs-w3m-emacs20/pkg-plist
index 8d3b021325b6..0c9640a34e19 100644
--- a/www/emacs-w3m-emacs20/pkg-plist
+++ b/www/emacs-w3m-emacs20/pkg-plist
@@ -2,11 +2,15 @@
 %%XEMACS_ONLY%%%%ETCDIR%%/antenna-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/back-disabled.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/back-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/db-history-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/forward-disabled.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/forward-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/history-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/home-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/image-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/open-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/parent-disabled.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/parent-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/reload-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/search-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/weather-up.xpm
@@ -22,15 +26,55 @@
 @unexec rm -f %D/%%LISPDIR%%/mew-w3m.elc
 %%LISPDIR%%/mime-w3m.el
 @unexec rm -f %D/%%LISPDIR%%/mime-w3m.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.el
+%%SHIMBUN%%%%LISPDIR%%/sb-airs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.el
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi-html.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-asahi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-bbdb-ml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet.el
+%%SHIMBUN%%%%LISPDIR%%/sb-cnet.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ding.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ding.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-fml.el
+%%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
+%%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-hns.el
+%%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-impress.el
+%%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.el
+%%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mhonarc.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-namazu.el
+%%SHIMBUN%%%%LISPDIR%%/sb-namazu.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.el
+%%SHIMBUN%%%%LISPDIR%%/sb-netbsd.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-sponichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.el
+%%SHIMBUN%%%%LISPDIR%%/sb-tcup.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-text.el
+%%SHIMBUN%%%%LISPDIR%%/sb-text.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-wired.el
+%%SHIMBUN%%%%LISPDIR%%/sb-wired.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
+%%SHIMBUN%%%%LISPDIR%%/sb-xemacs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
+%%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
+%%SHIMBUN%%%%LISPDIR%%/sb-zdnet.elc
+%%SHIMBUN%%%%LISPDIR%%/shimbun.el
+%%SHIMBUN%%%%LISPDIR%%/shimbun.elc
 %%LISPDIR%%/w3m-antenna.el
 %%LISPDIR%%/w3m-antenna.elc
 %%LISPDIR%%/w3m-bookmark.el
 %%LISPDIR%%/w3m-bookmark.elc
 %%LISPDIR%%/w3m-e21.el
-%%LISPDIR%%/w3m-filter.el
-%%LISPDIR%%/w3m-filter.elc
-%%LISPDIR%%/w3m-form.el
-%%LISPDIR%%/w3m-form.elc
 %%LISPDIR%%/w3m-hist.el
 %%LISPDIR%%/w3m-hist.elc
 %%LISPDIR%%/w3m-om.el