3 files changed, 34 insertions, 13 deletions
diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile
index 446bf9027a7..a21f7a04cf5 100644
--- a/www/emacs-w3m/Makefile
+++ b/www/emacs-w3m/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2013/04/06 21:07:36 rodent Exp $
+# $NetBSD: Makefile,v 1.32 2016/12/12 13:53:10 hauke Exp $
 
 DISTNAME=	emacs-w3m-1.4.4
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 
@@ -43,6 +43,12 @@ PLIST_VARS+=	gui
 PLIST.gui=	yes
 .endif
 
+# Work around an xemacs rendering bug for optimized GIFs, see
+# <https://github.com/doitian/emacs-w3m>, 2b
+.if (${EMACS_FLAVOR} == "xemacs")
+DEPENDS+=	gifsicle:../../graphics/gifsicle
+.endif
+
 DOCUMENTS=	COPYING ChangeLog ChangeLog.1 README README.ja
 ETCDIR=		${ETCDIR.${EMACS_FLAVOR}}
 ICONDIR=	${PREFIX}/${ETCDIR}
@@ -53,11 +59,18 @@ ETCDIR.emacs=		share/emacs/${_EMACS_VERSION_MAJOR}/etc/w3m
 ETCDIR.xemacs=		lib/xemacs/site-packages/etc/w3m
 
 post-install:
-	for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/${ETCDIR}; done
+	for f in ${DOCUMENTS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/${ETCDIR}; \
+	done
 
 .include "options.mk"
 
+.if (${EMACS_FLAVOR} != "xemacs")
 .include "../../devel/apel/buildlink3.mk"
 .include "../../devel/semi/buildlink3.mk"
 .include "../../editors/mule-ucs/buildlink3.mk"
+.endif
+
+.include "../../devel/flim/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/emacs-w3m/PLIST b/www/emacs-w3m/PLIST
index 83be38a9f30..b9559671a17 100644
--- a/www/emacs-w3m/PLIST
+++ b/www/emacs-w3m/PLIST
@@ -1,4 +1,10 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 22:00:21 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/12/12 13:53:10 hauke Exp $
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-1
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-2
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-3
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m-ja.info-4
+${NOTFOR_emacs}${EMACS_INFOPREFIX}/emacs-w3m.info
 ${EMACS_LISPPREFIX}/w3m/ChangeLog
 ${EMACS_LISPPREFIX}/w3m/ChangeLog.1
 ${EMACS_LISPPREFIX}/w3m/mew-w3m.el
@@ -56,19 +62,17 @@ ${EMACS_LISPPREFIX}/w3m/w3m-tabmenu.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-ucs.el
 ${FOR_emacs21}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${FOR_emacs21nox}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
-${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
-${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
+${FOR_xemacs}${EMACS_LISPPREFIX}/w3m/w3m-ucs.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-util.el
 ${EMACS_LISPPREFIX}/w3m/w3m-util.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-weather.el
 ${EMACS_LISPPREFIX}/w3m/w3m-weather.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-xmas.el
-${FOR_xemacs214}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
-${FOR_xemacs215}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
+${FOR_xemacs}${EMACS_LISPPREFIX}/w3m/w3m-xmas.elc
 ${EMACS_LISPPREFIX}/w3m/w3m.el
 ${EMACS_LISPPREFIX}/w3m/w3m.elc
 ${EMACS_LISPPREFIX}/w3m/mew-shimbun.el
-${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
+${NOTFOR_xemacs}${PLIST.mew}${EMACS_LISPPREFIX}/w3m/mew-shimbun.elc
 ${EMACS_LISPPREFIX}/w3m/w3m-ccl.el
 ${EMACS_LISPPREFIX}/w3m/w3m-favicon.el
 ${EMACS_LISPPREFIX}/w3m/w3m-filter.el
@@ -338,5 +342,5 @@ ${PLIST.gui}${ETCDIR}/state-01.xpm
 ${PLIST.gui}${ETCDIR}/state-10.xpm
 ${PLIST.gui}${ETCDIR}/state-11.xpm
 ${PLIST.gui}${ETCDIR}/weather-up.xpm
-info/emacs-w3m-ja.info
-info/emacs-w3m.info
+${NOTFOR_xemacs}info/emacs-w3m-ja.info
+${NOTFOR_xemacs}info/emacs-w3m.info
diff --git a/www/emacs-w3m/options.mk b/www/emacs-w3m/options.mk
index b798cbe175d..174e4d85edd 100644
--- a/www/emacs-w3m/options.mk
+++ b/www/emacs-w3m/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:13 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2016/12/12 13:53:10 hauke Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs-w3m
 PKG_SUPPORTED_OPTIONS=	emacs-w3m-mew
@@ -6,7 +6,11 @@ PKG_SUPPORTED_OPTIONS=	emacs-w3m-mew
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=	mew
-.if !empty(PKG_OPTIONS:Memacs-w3m-mew)
+
+# xemacs-packages contain mew (but not mew-nntp)
+.if (${EMACS_FLAVOR} == "xemacs")
+PLIST.mew =	yes
+.elif !empty(PKG_OPTIONS:Memacs-w3m-mew)
 .include "../../mail/mew/buildlink3.mk"
 PLIST.mew=	yes
 .endif