Update w3m-el-snapshot to 1.4.483+0.20120614.

Changes from previous:
----------------------
2012-06-14  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-url-encode-string-2): Encode only `(' and `)'.

2012-06-12  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-proc.el (w3m-process-do-with-temp-buffer): Use labels macro again.
	Functions that the labels form generates to be used in the outside of
	the labels form should be prefixed with #' from now on.
	Thanks to Michael Heerdegen and Andreas Schwab.

	* w3m-proc.el (w3m-process-do-with-temp-buffer): Don't use labels macro
	of which the spec has been changed in the most recent Emacs.

2012-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-expand-url): Work for scheme name containing upcase
	letters.  Reported by Dan Jacobson <jidanni@jidanni.org>.

	* w3m-util.el (w3m-force-mode-line-update): New alias.

	* w3m-lnum.el (w3m-with-lnum, w3m-lnum-universal-dispatch): Use it.

2012-06-03  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-create-page): Improve regexp matching Google's click-
	tracking urls.

2012-05-14  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-url-encode-string-2): New function.
	(w3m-print-current-url, w3m-print-this-url, w3m-print-this-image-url):
	Use it to encode url characters that are apt to be misidentified as
	word boundaries.

2012-04-22  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-create-page): Decode url in Google's click-tracking
	filter.

2012-04-18  Andrey Kotlarski  <m00naticus@gmail.com>

	* w3m-lnum.el (w3m-with-lnum, w3m-lnum-universal-dispatch):
	Explicitly redraw mode line.
	(w3m-lnum-visit): Fix prompt; add --insecure option to Curl.

2012-04-17  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-create-page): Add a filter for Google's click-tracking
	temporarily --- maybe this should be incorporated in w3m-filter.el.

2012-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-goto-mailto-url): Protect against nil value of body=;
	decode url string; don't change mail buffer's modification status;
	make sure body text is inserted to the message body.

2012-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-shr-url-at-point): New function.
	(w3m-url-at-point): Use it.

	* doc/ptexinfmt.el (texinfo-format-syntax-table): Modify character
	syntax of " and \ to w, as a workaround.
	(texinfo-format-comma): Support @comma.
	(texinfo-format-parse-args): Tweak it so as to work for @comma.

2012-03-16  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-scroll-left, w3m-scroll-right): Use image-mode function
	for an image page.
	(w3m-shift-left, w3m-shift-right): Pass prefix argument to image-mode
	function.

2012-03-12  Dan Jacobson  <jidanni@jidanni.org>

	* w3m.el (w3m-ctl-c-map): Bind `C-c C-e' to w3m-goto-new-session-url.

2012-02-27  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-relationship-estimate-rules)
	(w3m-open-all-links-in-new-session): Work for https Google pages.

2012-02-20  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-goto-mailto-url): Work for mail body.

2012-02-13  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-util.el (w3m-switch-to-buffer): Abolish.

	* w3m-bookmark.el (w3m-bookmark-add-all-urls):
	* w3m-ems.el (w3m-tab-drag-mouse-function)
	(w3m-tab-click-mouse-function, w3m-tab-next-buffer)
	(w3m-tab-make-keymap):
	* w3m-form.el (w3m-form-input-textarea, w3m-form-input-select)
	(w3m-form-input-map):
	* w3m-session.el (w3m-session-select):
	* w3m-tabmenu.el (w3m-switch-buffer, w3m-tab-menubar-open-item):
	* w3m-util.el (w3m-popup-buffer, w3m-make-menu-commands):
	* w3m.el (w3m-next-buffer, w3m-move-unseen-buffer)
	(w3m-goto-url-new-session, w3m-reload-all-pages): Revert to using
	switch-to-buffer.

2012-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-hist.el (w3m-history-store-position): Don't trust column position
	that Emacs tells if there's an image.
	(w3m-history-restore-position): Revert 2011-10-21 change.

2012-02-10  Kevin Ryde  <user42@zip.com.au>

	* w3m.el (w3m-about-header): Show info of image where point stays.

2012-01-26  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-mode): Don't make bidi-paragraph-direction bound globally
	in old Emacsen and XEmacsen.
	(w3m-goto-url): Work for name anchors.

2012-01-23  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-ems.el (w3m-form-make-button): Use "submit" instead for an empty
	text, that won't be buttonized.
	Reported by Roland Winkler <winkler@gnu.org>.

2012-01-13  Hideyuki SHIRAI  <shirai@meadowy.org>

	* w3m.el (w3m-fontify-anchors, w3m-goto-url): Not encode and decode
	the anchor values to use Punycode.

2012-01-10  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-image-type-alist): Add image/tiff.
	(w3m-view-previous-page): Protect against empty history.

2012-01-06  Katsumi Yamaoka  <yamaoka@jpl.org>

	* Makefile.in (install-icons, install-icons30, install-info)
	(install-info-en, install-info-ja, install-package)
	(install-package-ja):
	* doc/Makefile.in (install): Add DESTDIR variable to installation
	directory.

	* w3mhack.el (w3mhack-expand-file-name): New function.
	(w3mhack-what-where): Use it.

	* aclocal.m4 (AC_SET_VANILLA_FLAG): Remove --no-unibyte option.

2012-01-02  Elias Pipping  <pipping@lavabit.com>

	* Makefile.in (install-lisp): Add DESTDIR variable to installation
	directory.

2011-12-26  Dan Jacobson  <jidanni@jidanni.org>

	* w3m.el (w3m-gohome): Always reload the home page.

2011-12-07  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-mode): Force paragraph direction to be left-to-right.
	Suggested by Naohiro Aota <naota@elisp.net>.

2011-12-06  Katsumi Yamaoka  <yamaoka@jpl.org>

	* Makefile.in (.el.elc): Shut up.

	* w3m-lnum.el (w3m-lnum-read-interactive): Use (sit-for 0) instead of
	redisplay for Emacs 21.1, too.

2011-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>

	* aclocal.m4 (AC_EMACS_LISP): Simplify.
	(AC_PATH_EMACS): Simplify Lisp code so as to make it work for recent
	XEmacsen.

	* w3m-favicon.el (w3m-favicon-type): Silence SXEmacs 22.1.14's byte
	compiler.

	* w3m-lnum.el (w3m-lnum-read-interactive): Use (sit-for 0) instead of
	redisplay for XEmacs.

	* w3m.el (w3m-resize-image-interactive): Use read-char-exclusive with
	no arg for XEmacs.

2011-12-05  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-read-file-name): Don't strip query part from given url.
	(w3m-download): Always prompt for file name; don't strip query part.
	Suggested by Dan Jacobson <jidanni@jidanni.org>.

2011-12-04  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-lnum.el (w3m-lnum-universal-dispatch): Add argument passed to
	kill-buffer, Emacs 22 requires it; use beginning-of-line rather than
	move-beginning-of-line that XEmacs doesn't provide.

2011-12-02  Dan Jacobson  <jidanni@jidanni.org>

	* w3m-search.el (w3m-search-engine-alist): Put search string first in
	query form.

2011-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-util.el (w3m-popup-buffer): Restore history position always.

	* w3m.el (w3m-copy-buffer): Save history position.

2011-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-lnum.el (w3m-lnum-actions-custom-type): New variable.
	(w3m-lnum-actions-general, w3m-lnum-actions-image-alist)
	(w3m-lnum-actions-link-alist w3m-lnum-actions-button-alist)
	(w3m-lnum-actions-form-alist): Use it to improve custom type.

2011-11-16  Andrey Kotlarski  <m00naticus@gmail.com>

	Add alternative selection->action method.

	* w3m-lnum.el: Update comment section.
	(w3m-lnum-quick-browsing): Change default value.
	(w3m-lnum-actions-general, w3m-lnum-actions-image-alist)
	(w3m-lnum-actions-link-alist, w3m-lnum-actions-button-alist)
	(w3m-lnum-actions-form-alist): New custom options.
	(w3m-lnum-remove-overlays): Add optional parameters for start and end.
	(w3m-lnum, w3m-lnum-prompt-str, w3m-lnum-highlight-anchor): Sanitize
	variable naming.
	(w3m-read-event, w3m-lnum-visit, w3m-lnum-make-action): New macros.
	(w3m-lnum-read-interactive): Add optional parameters for previous filter
	and selected number.  Return last applied filter along selected value.
	Use `w3m-read-event'.  Remove lnum overlays within all buffer on
	scroll.
	(w3m-with-lnum): Add parameter for initial filter.  Change mode-line
	during selection.
	(w3m-lnum-get-action): If single image during image selection -
	immediately select it.  Accommodate to new return format of
	`w3m-lnum-read-interactive'.
	(w3m-lnum-follow): Use `w3m-lnum-visit'.
	(w3m-lnum-universal-dispatch): New function.
	(w3m-lnum-universal): New command.
	(w3m-lnum-view-image, w3m-lnum-save-image, w3m-lnum-print-this-url):
	Use nth.
	(w3m-lnum-zoom-image): Use `w3m-resize-image-interactive'.
	(w3m-lnum-zoom-in-image, w3m-lnum-zoom-out-image): Update doc string.
	(w3m-lnum-bookmark-add-this-url): Fix bookmarking of current url.
	(w3m-lnum-actions-link-alist): Add actions for generic browser and Curl
	if present.

	* w3m.el (autoload): Autoload `w3m-lnum-universal'.
	(w3m-resize-image-interactive): New function.
	(w3m-lnum-map): Add key for `w3m-lnum-universal'.

2011-11-14  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-expand-url): Assume only a name anchor, that has no
	scheme part nor directory part, to be the buffer: scheme.
	(w3m-buffer-local-url): Move forward.

2011-10-24  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-hist.el: Require w3m-util.

2011-10-22  Naohiro Aota  <naota@elisp.net>

	* w3m.el (w3m-goto-url): Check name anchor after redirect resolution.

2011-10-21  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-hist.el (w3m-history-restore-position): Don't hscroll if there
	are images ([emacs-w3m:11658]).

2011-10-17  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-canonicalize-url): Fix url that fails to have put
	a separator following a domain name.
	Suggested by Dan Jacobson <jidanni@jidanni.org>.

2011-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-url-coding-system-alist): Add a rule for Google.
	(w3m-url-coding-system): Allow function to determine coding system.

2011-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-url-encode-string, w3m-url-transfer-encode-string):
	Restore optional coding argument.
	(w3m-gmane-url-at-point, w3m-canonicalize-url): Do.
	(w3m-download): Decode file name in url.

	* w3m-form.el (w3m-form-make-form-data, w3m-form-parse-and-fontify):
	* w3m-search.el (w3m-search-escape-query-string, w3m-search-do-search)
	(w3m-search-uri-replace): Revert last change.

2011-10-13  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-url-coding-system-alist): New user option.
	(w3m-show-decoded-url, w3m-google-feeling-lucky-charset): Abolish.
	(w3m-url-coding-system): New function.
	(w3m-url-encode-string, w3m-url-readable-string)
	(w3m-url-transfer-encode-string): Use it.

	* w3m.el (w3m-fontify-anchors, w3m-gmane-url-at-point)
	(w3m-canonicalize-url, w3m-goto-url):
	* w3m-form.el (w3m-form-make-form-data, w3m-form-parse-and-fontify):
	* w3m-search.el (w3m-search-escape-query-string, w3m-search-do-search)
	(w3m-search-uri-replace): Don't specify coding system for encoding url.

2011-10-07  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-favicon.el (w3m-favicon-type): Prefer gif.
	(w3m-favicon-convert): Work for gif icons named "favicon.ico".

2011-09-08  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-lnum.el (w3m-lnum-face): Remove face alias.
	(w3m-lnum-quick-browsing): Add custom type.
	(w3m-lnum-remove-overlays, w3m-lnum-set-numbering)
	(w3m-lnum-highlight-anchor, w3m-lnum-get-match-info): Fix overlay end
	range, too.

2011-09-07  Andrey Kotlarski  <m00naticus@gmail.com>

	* w3m.el: Use `w3m-lnum' as naming prefix for commands and
	maps from `w3m-lnum.el'.

	* w3m-lnum.el: Use `w3m-lnum' as naming prefix everywhere instead of
	`w3m-linknum' or `w3m-link-numbering'.
	(w3m-lnum-set-numbering, w3m-lnum): Optionally don't clean previous
	numbering.
	(w3m-lnum-read-interactive): Don't clean previous numbering with
	`w3m-lnum' in cases when there is no such.
	(w3m-lnum-remove-overlays, w3m-lnum-set-numbering): Fix overlay start
	range to make it work for XEmacs.
	(w3m-lnum-get-action): Don't invoke `w3m-lnum-read-interactive' with 0
	numbered items.

	* w3m-util.el (w3m-goto-next-defun): New macro.
	(w3m-goto-next-anchor-or-image, w3m-substitute-key-definitions): Move
	from w3m-lnum.el

2011-09-04  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m-lnum.el (w3m-link-numbering, w3m-linknum-minibuffer-prompt)
	(w3m-linknum-match): Use old defface style for XEmacs.
	(w3m-link-set-numbering): Replace string-match-p w/ w3m-string-match-p.
	(w3m-highlight-numbered-anchor, w3m-get-match-info): Fix range passed
	to overlays-in to make it work for XEmacs.

2011-09-04  Andrey Kotlarski  <m00naticus@gmail.com>

	* w3m-lnum.el: Update copyright years. Don't require `cl'.
	(w3m-linknum-match): Make numbering face visible for some
	consoles.
	(w3m-link-numbering-quick-browsing)
	(w3m-link-numbering-context-alist): New custom variables.
	(w3m-linknum-remove-overlays): Delete overlays only within the
	visible window part.
	(w3m-link-set-overlay): Don't use `incf'.
	(w3m-link-set-numbering): Number additional context items as
	specified by `w3m-link-numbering-context-alist'. Return index of
	the last matched item.
	(w3m-goto-next-image2): Fix doc typo.
	(w3m-goto-next-anchor-or-image, w3m-link-numbering): Cosmetic
	indent.
	(w3m-linknum-prompt-str): Don't show 0 when this is being current
	default for selection.
	(w3m-read-int-interactive): Up and down scrolling preserves text
	filter and cleans previous numbering. Allow <enter> shortcutting
	options as specified by `w3m-link-numbering-quick-browsing'. Don't
	let the text filter grow when no items match.
	(w3m-with-linknum): Make `last-index' variable visible within body
	and set as the last index currently used for numbering.
	(w3m-get-match-info): New macro.
	(w3m-get-anchor-info): Use `w3m-get-match-info'.
	(w3m-go-to-linknum, w3m-linknum-get-action): Call
	`w3m-get-anchor-info' with a selection number.
	(w3m-linknum-follow, w3m-linknum-view-image)
	(w3m-linknum-save-image, w3m-linknum-print-this-url): Don't use cl
	functions.
	(w3m-linknum-zoom-image): Cosmetic doc string change.
	(w3m-linknum-bookmark-add-this-url): Use 1+.

2011-09-03  Dan Jacobson  <jidanni@jidanni.org>

	* w3m.el (w3m-lynx-like-map, w3m-info-like-map): Bind the `C-t t' key
	to w3m-create-empty-session.

2011-09-02  Katsumi Yamaoka  <yamaoka@jpl.org>

	* w3m.el (w3m-create-empty-session): New user command.
	(w3m-new-session-url): Default to about:blank.
	(w3m-input-url): Don't use about:* as initial value.
	(w3m-goto-url-new-session): Use w3m-new-session-url as the default.

7 files changed, 55 insertions, 21 deletions

diff --git a/www/emacs-w3m-snapshot/Makefile b/www/emacs-w3m-snapshot/Makefile
index e7cd8f15f1e..483f3b3eacc 100644
--- a/www/emacs-w3m-snapshot/Makefile
+++ b/www/emacs-w3m-snapshot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2013/02/17 19:18:10 dholland Exp $
+# $NetBSD: Makefile,v 1.10 2013/03/04 19:12:22 hiramatsu Exp $
 
-DISTNAME=	w3m-el-snapshot_1.4.442+0.20110729.orig
-PKGREVISION=	2
+DISTNAME=	w3m-el-snapshot_1.4.483+0.20120614.orig
 PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME:S/w3m-el-snapshot_/emacs-w3m-/:S/+0//:S/.orig//}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
@@ -9,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_DEBIAN:=pool/main/w/w3m-el-snapshot/}
 MAINTAINER=	makoto@ki.nu
 HOMEPAGE=	http://emacs-w3m.namazu.org/
 COMMENT=	Emacs frontend for w3m browser
+LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	makeinfo gzip autoconf
 INFO_FILES=	yes
@@ -18,9 +18,9 @@ DEPENDS+=	w3m{,-img}>=0.5.2nb3:../../www/w3m
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--srcdir=${WRKSRC}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
-CONFIGURE_ENV+=		GAMEOWN=${GAMEOWN}
+CONFIGURE_ENV+=		GAMEOWN=${GAMES_USER}
 BUILD_TARGET=
-WRKSRC=			${WRKDIR}/emacs-w3m
+WRKSRC=			${WRKDIR}/w3m-el-snapshot-1.4.483+0.20120614.orig
 
 EVAL_PREFIX+=	W3M_PREFIX=w3m
 
@@ -30,14 +30,9 @@ SUBST_STAGE.paths=	pre-configure
 SUBST_FILES.paths=	w3m.el
 SUBST_SED.paths=	-e 's|@W3M@|${W3M_PREFIX}/bin/w3m|g'
 
-INSTALL_MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX} \
-			infodir=${DESTDIR}${PREFIX}/${PKGINFODIR}
-
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
 
-PLIST_SRC+=		PLIST
-
 .include "options.mk"
 
 .include "../../devel/apel/buildlink3.mk"
diff --git a/www/emacs-w3m-snapshot/PLIST b/www/emacs-w3m-snapshot/PLIST
index 609d7afb51e..ad3cc2a5e37 100644
--- a/www/emacs-w3m-snapshot/PLIST
+++ b/www/emacs-w3m-snapshot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2011/12/02 23:05:42 minskim Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/03/04 19:12:22 hiramatsu Exp $
 info/emacs-w3m-ja.info
 info/emacs-w3m.info
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
@@ -40,6 +40,8 @@ ${EMACS_LISPPREFIX}/w3m/sb-bbc.el
 ${EMACS_LISPPREFIX}/w3m/sb-bbc.elc
 ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.el
 ${EMACS_LISPPREFIX}/w3m/sb-bbdb-ml.elc
+${EMACS_LISPPREFIX}/w3m/sb-chise.el
+${EMACS_LISPPREFIX}/w3m/sb-chise.elc
 ${EMACS_LISPPREFIX}/w3m/sb-cgi-board.el
 ${EMACS_LISPPREFIX}/w3m/sb-cgi-board.elc
 ${EMACS_LISPPREFIX}/w3m/sb-cnet-jp.el
diff --git a/www/emacs-w3m-snapshot/distinfo b/www/emacs-w3m-snapshot/distinfo
index df90b1e6fc0..f807593b731 100644
--- a/www/emacs-w3m-snapshot/distinfo
+++ b/www/emacs-w3m-snapshot/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2011/12/01 17:53:58 minskim Exp $
+$NetBSD: distinfo,v 1.6 2013/03/04 19:12:22 hiramatsu Exp $
 
-SHA1 (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = 6ef7b01891142ec8c0c8c6f9522d67540fab244d
-RMD160 (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = b8c21021aa1c3f46554934a82223455b3cdd7cc5
-Size (w3m-el-snapshot_1.4.442+0.20110729.orig.tar.gz) = 983801 bytes
-SHA1 (patch-w3m.el) = 536f58f3ef4c4fda546715d2bf07191d4a3eee5f
+SHA1 (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = a7a9ce6b664c9b3e4c4b23f8f3ebd8b558c94dac
+RMD160 (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = 591afd134c6e22af9a3e7b93475f62a0dac61f4e
+Size (w3m-el-snapshot_1.4.483+0.20120614.orig.tar.gz) = 995591 bytes
+SHA1 (patch-Makefile.in) = b580cf5969febf3e4bb3b4229369d601b7444638
+SHA1 (patch-w3m.el) = a4c14deed274e984f854255513ce49dbd320eb83
+SHA1 (patch-w3mhack.el) = ecb7448d7f79b37e2b3229e11f9079062728ebf7
diff --git a/www/emacs-w3m-snapshot/options.mk b/www/emacs-w3m-snapshot/options.mk
index 79c78d603d2..547e33dd9ba 100644
--- a/www/emacs-w3m-snapshot/options.mk
+++ b/www/emacs-w3m-snapshot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2009/08/07 15:35:10 minskim Exp $
+# $NetBSD: options.mk,v 1.2 2013/03/04 19:12:22 hiramatsu Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs-w3m
 PKG_SUPPORTED_OPTIONS=	emacs-w3m-mew
@@ -7,6 +7,7 @@ PKG_SUPPORTED_OPTIONS=	emacs-w3m-mew
 
 PLIST_VARS+=	mew
 .if !empty(PKG_OPTIONS:Memacs-w3m-mew)
+MAKE_ENV+=	EMACS-W3M-MEW=1
 .include "../../mail/mew/buildlink3.mk"
 PLIST.mew=	yes
 .endif
diff --git a/www/emacs-w3m-snapshot/patches/patch-Makefile.in b/www/emacs-w3m-snapshot/patches/patch-Makefile.in
new file mode 100644
index 00000000000..527a9827f8b
--- /dev/null
+++ b/www/emacs-w3m-snapshot/patches/patch-Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/03/04 19:12:23 hiramatsu Exp $
+
+Compile mew-shimbun.el and mew-w3m.el when
+emacs-w3m-mew option is set.
+
+--- Makefile.in.orig	2013-02-27 14:07:25.000000000 +0900
++++ Makefile.in	2013-02-27 14:07:38.000000000 +0900
+@@ -40,7 +40,7 @@
+ lisp: Makefile
+ 	env test ! -f w3m-util.elc -o w3m-util.elc -nt w3m-util.el || $(MAKE) clean
+ 	env test ! -f w3m-proc.elc -o w3m-proc.elc -nt w3m-proc.el || $(MAKE) clean
+-	$(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-compile
++	$(MAKE_ENV) $(XEMACSDEBUG)$(EMACS) $(FLAGS) -f w3mhack-compile
+ 
+ # `w3mhack-what-where' respects DESTDIR
+ what-where:
diff --git a/www/emacs-w3m-snapshot/patches/patch-w3m.el b/www/emacs-w3m-snapshot/patches/patch-w3m.el
index 334bc9cf0d5..52cbf9c3204 100644
--- a/www/emacs-w3m-snapshot/patches/patch-w3m.el
+++ b/www/emacs-w3m-snapshot/patches/patch-w3m.el
@@ -1,8 +1,10 @@
-$NetBSD: patch-w3m.el,v 1.1 2011/11/30 21:05:13 minskim Exp $
+$NetBSD: patch-w3m.el,v 1.2 2013/03/04 19:12:23 hiramatsu Exp $
 
---- w3m.el.orig	2010-05-19 05:12:47.000000000 +0000
-+++ w3m.el
-@@ -243,13 +243,13 @@ The valid values include `w3m', `w3mmee'
+Use an absolute path in invoking w3m.
+
+--- w3m.el.orig	2013-02-25 15:15:04.000000000 +0900
++++ w3m.el	2013-02-25 15:16:14.000000000 +0900
+@@ -259,13 +259,13 @@
  ;; Set w3m-command, w3m-type, w3m-version and w3m-compile-options
  (if noninteractive ;; Don't call the external command when compiling.
      (unless w3m-command
diff --git a/www/emacs-w3m-snapshot/patches/patch-w3mhack.el b/www/emacs-w3m-snapshot/patches/patch-w3mhack.el
new file mode 100644
index 00000000000..2e317633bd1
--- /dev/null
+++ b/www/emacs-w3m-snapshot/patches/patch-w3mhack.el
@@ -0,0 +1,16 @@
+$NetBSD: patch-w3mhack.el,v 1.1 2013/03/04 19:12:23 hiramatsu Exp $
+
+Compile mew-shimbun.el and mew-w3m.el when
+emacs-w3m-mew option is set.
+
+--- w3mhack.el.orig	2013-02-27 13:42:17.000000000 +0900
++++ w3mhack.el	2013-02-27 13:42:45.000000000 +0900
+@@ -311,7 +311,7 @@
+ 				 2))
+ 			 (error nil))
+ 		     t)))
+-	  (locate-library "mew"))
++	  (and (locate-library "mew") (getenv "EMACS-W3M-MEW")))
+       (push "mew-w3m.el" ignores))
+     (unless (if (featurep 'xemacs)
+ 		(and (featurep 'mule) (locate-library "pccl"))