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

--- pkgsrc/www/emacs-w3m/Makefile	2004/05/08 13:35:20	1.7
+++ pkgsrc/www/emacs-w3m/Makefile	2006/02/22 20:35:59	1.17
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2004/05/08 13:35:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/22 20:35:59 wiz Exp $
 
 DISTNAME=	emacs-w3m-1.3.3
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
+PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${HOMEPAGE}
 
@@ -8,8 +10,8 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	http://emacs-w3m.namazu.org/
 COMMENT=	Simple w3m interface for Emacs
 
-EMACS_DEPENDS+=	{w3m,w3m-img}>=0.3.1:../../www/w3m
-BUILD_DEPENDS+=	${PKGNAME_PREFIX}semi-*:../../devel/semi
+DEPENDS+=	{w3m,w3m-img}>=0.3.1:../../www/w3m
+BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
 
 # Not tested with xemacs...
 EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox emacs20 xemacs214 xemacs215
@@ -17,20 +19,17 @@ EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21
 .include "../../mk/emacs.mk"
 
 .if ${EMACS_FLAVOR} == "xemacs"
-EMACS_DEPENDS+=	apel>=10.3:../../devel/apel
-BUILD_DEPENDS+=	mew-xemacs-*:../../mail/mew-xemacs
-.else
-BUILD_DEPENDS+=	mew-*:../../mail/mew
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.3:../../devel/apel
 .endif
 
-EMACS_MAJOR_VERSION=	${EMACS_VERSION:C/\..*//}
+EMACS_MAJOR_VERSION=	${_EMACS_VERSION:C/\..*//}
 .if ${EMACS_FLAVOR} == "emacs" && ${EMACS_MAJOR_VERSION} == 21
-BUILD_DEPENDS+=	Mule-UCS>=0.84:../../editors/mule-ucs
+BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs
 .endif
 
-HAS_CONFIGURE=	# defined
-CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN}
-ALL_TARGET=	default
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q}
+BUILD_TARGET=	default
 .if ${EMACS_FLAVOR} == "xemacs"
 INSTALL_TARGET=	install-package
 .else
@@ -42,12 +41,13 @@ DOCUMENTS=	COPYING ChangeLog ChangeLog.1
 ETCDIR=	lib/xemacs/site-packages/etc
 ICONDIR=	${ETCDIR}/w3m
 .else
-ETCDIR=	share/emacs/${EMACS_VERSION}/etc
+ETCDIR=	share/emacs/${_EMACS_VERSION:C/(^[0-9.]*).*$/\1/}/etc
 ICONDIR=	${ETCDIR}/w3m/icons
 .endif
 DOCDIR=	${ETCDIR}/w3m/doc
-PLIST_SUBST+=	DOCDIR=${DOCDIR}
-PLIST_SUBST+=	ICONDIR=${ICONDIR}
+PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
+PLIST_SUBST+=	ETCDIR=${ETCDIR:Q}
+PLIST_SUBST+=	ICONDIR=${ICONDIR:Q}
 
 post-install:
 	@${MKDIR} ${PREFIX}/${DOCDIR}