Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

--- pkgsrc/www/emacs-w3m/Makefile	2006/01/04 04:29:08	1.15
+++ pkgsrc/www/emacs-w3m/Makefile	2013/04/06 21:07:36	1.31
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2006/01/04 04:29:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2013/04/06 21:07:36 rodent Exp $
 
-DISTNAME=	emacs-w3m-1.3.3
-PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+DISTNAME=	emacs-w3m-1.4.4
+PKGREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 
@@ -9,48 +9,55 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://emacs-w3m.namazu.org/
 COMMENT=	Simple w3m interface for Emacs
 
-BROKEN_IN=	pkgsrc-2005Q4
+INSTALLATION_DIRS=	${ETCDIR}
 
-DEPENDS+=	{w3m,w3m-img}>=0.3.1:../../www/w3m
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
+USE_TOOLS+=	makeinfo
+INFO_FILES=	YES
 
-# Not tested with xemacs...
-EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
-
-.include "../../mk/emacs.mk"
-
-.if ${EMACS_FLAVOR} == "xemacs"
-DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel
-.endif
-
-EMACS_MAJOR_VERSION=	${EMACS_VERSION:C/\..*//}
-.if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21
-BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs
-.endif
+DEPENDS+=	w3m{,-img}>=0.5.1nb2:../../www/w3m
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
+CONFIGURE_ARGS+=--with-icondir=${ICONDIR}
 BUILD_TARGET=	default
-.if ${EMACS_FLAVOR} == "xemacs"
-INSTALL_TARGET=	install-package
-.else
-INSTALL_TARGET=	install install-icons
+INSTALL_TARGET=	${INSTALL_TARGET.${EMACS_FLAVOR}}
+MAKE_FLAGS=	prefix=${DESTDIR}${PREFIX} ICONDIR=${DESTDIR}${ICONDIR}
+PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
+
+SUBST_CLASSES+=	fix-icondir
+SUBST_STAGE.fix-icondir=	pre-configure
+SUBST_FILES.fix-icondir=	Makefile.in w3m.el w3mhack.el
+SUBST_SED.fix-icondir=		-e 's|etc/images/w3m|etc/w3m|g'
+SUBST_SED.fix-icondir+=		-e 's|images/w3m|w3m|g'
+
+EMACS_BUILDLINK=# defined
+EMACS_VERSIONS_ACCEPTED=	emacs22 emacs22nox emacs21 emacs21nox emacs20 \
+				xemacs215 xemacs215nox xemacs214 xemacs214nox
+
+.include "../../editors/emacs/modules.mk"
+
+# GNU Emacs 21 or later and XEmacs have GUI support
+PLIST_VARS+=	gui
+.if (${EMACS_FLAVOR} == "emacs" && ${EMACS_VERSION_MAJOR} > 20) || \
+    ${EMACS_FLAVOR} == "xemacs"
+PLIST.gui=	yes
 .endif
 
-DOCUMENTS=	COPYING ChangeLog ChangeLog.1 FAQ FAQ.ja README README.ja README.namazu.ja README.shimbun.ja TIPS TIPS.ja
-.if ${EMACS_FLAVOR} == "xemacs"
-ETCDIR=	lib/xemacs/site-packages/etc
-ICONDIR=	${ETCDIR}/w3m
-.else
-ETCDIR=	share/emacs/${EMACS_VERSION:C/[^0-9]*$//}/etc
-ICONDIR=	${ETCDIR}/w3m/icons
-.endif
-DOCDIR=	${ETCDIR}/w3m/doc
-PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
-PLIST_SUBST+=	ICONDIR=${ICONDIR:Q}
+DOCUMENTS=	COPYING ChangeLog ChangeLog.1 README README.ja
+ETCDIR=		${ETCDIR.${EMACS_FLAVOR}}
+ICONDIR=	${PREFIX}/${ETCDIR}
+
+INSTALL_TARGET.emacs=	install install-icons
+INSTALL_TARGET.xemacs=	install-package
+ETCDIR.emacs=		share/emacs/${_EMACS_VERSION_MAJOR}/etc/w3m
+ETCDIR.xemacs=		lib/xemacs/site-packages/etc/w3m
 
 post-install:
-	@${MKDIR} ${PREFIX}/${DOCDIR}
-	for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/${DOCDIR}; done
+	for f in ${DOCUMENTS}; do ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/${ETCDIR}; done
+
+.include "options.mk"
 
+.include "../../devel/apel/buildlink3.mk"
+.include "../../devel/semi/buildlink3.mk"
+.include "../../editors/mule-ucs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"