Update to 1.1.100.

PR:		ports/30586
Submitted by:	MANTANI Nobutaka <nobutaka@nobutaka.com>

4 files changed, 50 insertions, 13 deletions

diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 9c69e789bb08..7df1a3fe9066 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	emacs-w3m
-PORTVERSION=	1.0
+PORTVERSION=	1.1.100
 CATEGORIES=	www elisp
 MASTER_SITES=	http://emacs-w3m.namazu.org/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -40,7 +40,7 @@ DOCSDIR_JA=	${PREFIX}/share/doc/ja/${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${EMACS_NAME} == xemacs
+.if (${EMACS_NAME} == "xemacs")
 XEMACS_ONLY?=		""
 EMACS_ONLY?=		"@comment "
 SEMI_FILE=		${LOCALBASE}/${EMACS_PACKAGESDIR}/lisp/semi/mime-setup.el
diff --git a/www/emacs-w3m/distinfo b/www/emacs-w3m/distinfo
index 10fa02b4c35a..0965665d9231 100644
--- a/www/emacs-w3m/distinfo
+++ b/www/emacs-w3m/distinfo
@@ -1 +1 @@
-MD5 (w3m_el-1.0.tar.gz) = 4056fa10c6f6a145e150b2f6387a9936
+MD5 (w3m_el-1.1.100.tar.gz) = cd773d62b828dabe6560efe9859b424c
diff --git a/www/emacs-w3m/files/patch-mime-w3m.el b/www/emacs-w3m/files/patch-mime-w3m.el
deleted file mode 100644
index 54b3f71b1a1e..000000000000
--- a/www/emacs-w3m/files/patch-mime-w3m.el
+++ /dev/null
@@ -1,10 +0,0 @@
---- mime-w3m.el.orig	Thu Mar 15 04:58:36 2001
-+++ mime-w3m.el	Thu Mar 15 04:58:43 2001
-@@ -64,7 +64,6 @@
-     (cons 'progn body)))
- 
- (defun mime-w3m-preview-text/html (entity situation)
--  (setq mime-w3m-message-structure (mime-find-root-entity entity))
-   (let ((p (point))
- 	(xref (mime-entity-fetch-field entity "xref")))
-     ;; For nnshimbun.el.
diff --git a/www/emacs-w3m/pkg-plist b/www/emacs-w3m/pkg-plist
index 0c9640a34e19..e8d7339fc5a3 100644
--- a/www/emacs-w3m/pkg-plist
+++ b/www/emacs-w3m/pkg-plist
@@ -2,6 +2,7 @@
 %%XEMACS_ONLY%%%%ETCDIR%%/antenna-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/back-disabled.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/back-up.xpm
+%%XEMACS_ONLY%%%%ETCDIR%%/copy-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/db-history-up.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/forward-disabled.xpm
 %%XEMACS_ONLY%%%%ETCDIR%%/forward-up.xpm
@@ -40,30 +41,66 @@
 %%SHIMBUN%%%%LISPDIR%%/sb-ding.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-fml.el
 %%SHIMBUN%%%%LISPDIR%%/sb-fml.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.el
+%%SHIMBUN%%%%LISPDIR%%/sb-glimpse.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.el
 %%SHIMBUN%%%%LISPDIR%%/sb-gnome.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-gyve.el
+%%SHIMBUN%%%%LISPDIR%%/sb-gyve.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-h14m.el
+%%SHIMBUN%%%%LISPDIR%%/sb-h14m.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.el
 %%SHIMBUN%%%%LISPDIR%%/sb-hns.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.el
 %%SHIMBUN%%%%LISPDIR%%/sb-impress.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.el
+%%SHIMBUN%%%%LISPDIR%%/sb-javaconf.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-kantei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-linuxce-jp.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-lump.el
 %%SHIMBUN%%%%LISPDIR%%/sb-lump.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.el
+%%SHIMBUN%%%%LISPDIR%%/sb-m17n.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mainichi.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-meadow.el
+%%SHIMBUN%%%%LISPDIR%%/sb-meadow.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-mew.el
+%%SHIMBUN%%%%LISPDIR%%/sb-mew.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-nikkei.el
+%%SHIMBUN%%%%LISPDIR%%/sb-nikkei.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-rika.el
+%%SHIMBUN%%%%LISPDIR%%/sb-rika.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.el
+%%SHIMBUN%%%%LISPDIR%%/sb-ruby.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.el
+%%SHIMBUN%%%%LISPDIR%%/sb-slashdot-jp.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-toshiba.el
+%%SHIMBUN%%%%LISPDIR%%/sb-toshiba.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.el
+%%SHIMBUN%%%%LISPDIR%%/sb-vinelinux.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.el
+%%SHIMBUN%%%%LISPDIR%%/sb-w3m-dev.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-wired.el
 %%SHIMBUN%%%%LISPDIR%%/sb-wired.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-xemacs.el
 %%SHIMBUN%%%%LISPDIR%%/sb-xemacs.elc
+%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.el
+%%SHIMBUN%%%%LISPDIR%%/sb-yahoo.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.el
 %%SHIMBUN%%%%LISPDIR%%/sb-yomiuri.elc
 %%SHIMBUN%%%%LISPDIR%%/sb-zdnet.el
@@ -74,9 +111,19 @@
 %%LISPDIR%%/w3m-antenna.elc
 %%LISPDIR%%/w3m-bookmark.el
 %%LISPDIR%%/w3m-bookmark.elc
+%%LISPDIR%%/w3m-dtree.el
+%%LISPDIR%%/w3m-dtree.elc
+%%LISPDIR%%/w3m-e20.el
+%%EMACS_ONLY%%%%LISPDIR%%/w3m-e20.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-macro.el
+%%LISPDIR%%/w3m-macro.elc
 %%LISPDIR%%/w3m-om.el
 %%LISPDIR%%/w3m-search.el
 %%LISPDIR%%/w3m-search.elc