Rework emacs.mk:

1) Simplify the way how an emacs version is picked when no emacs is installed, but a user try to install an Emacs Lisp package. Just pick up the version set as EMACS_TYPE than searching for versions already installed etc. If the EMACS_TYPE version is not supported by the Emacs Lisp Package, just fail. EMACS_TYPE be default to GNU Emacs 21. (In other words, users should set EMACS_TYPE as they want. Otherwise GNU Emacs 21 is used.) 2) All Emacs Lisp Packages *must* prepend EMACS_PKGNAME_PREFIX to a) the PKGNAME itself, and b) PKGNAME in its dependency lines. EMACS_PKGNAME_PREFIX is expanded to "xemacs-" when XEmacs is used. This keeps dependency graph of Emacs-Lisp-packages- installed-for-XEmacs consistent. 3) Document EMACS_* variables as much as possible. 4) Provide more cookies for PLIST. Maybe utilized later. Note that the 2) change doesn't affect the default, GNU Emacs 21 behaviour. So no version / revision bumps in this commit.
NetBSD · Aug 28, 2005 · aa8e85b · aa8e85b
1 parent 6192820
commit aa8e85b
Show file tree

Hide file tree

Showing 58 changed files with 504 additions and 341 deletions.
diff --git a/cad/dinotrace-mode/Makefile b/cad/dinotrace-mode/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 21:24:48 grant Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	dinotrace-9.1i
-PKGNAME=	dinotrace-mode-9.1i
+PKGNAME=	${EMACS_PKGNAME_PREFIX}dinotrace-mode-9.1i
 CATEGORIES=	cad editors
 MASTER_SITES=	http://www.veripool.com/ftp/
 
 MAINTAINER=	[email protected]
 HOMEPAGE= 	http://www.veripool.com/dinotrace/
 COMMENT=	Emacs major mode for dinotrace
 
-DEPENDS+=	verilog-mode>=3.13:../../cad/verilog-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}verilog-mode>=3.13:../../cad/verilog-mode
 
 .include "../../mk/bsd.prefs.mk"
 

diff --git a/cad/verilog-mode/Makefile b/cad/verilog-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:09:10 agc Exp $
+# $NetBSD: Makefile,v 1.6 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=		verilog-mode-3.60
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		cad editors
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 # The latest can be fetched interactively from

diff --git a/chat/irchat-pj/Makefile b/chat/irchat-pj/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2005/05/24 13:59:13 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=	irchat-pj-2.4.24.22
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	http://irc.fan.gr.jp/pj/src/
 

diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=	navi2ch-1.7.5
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=navi2ch/}
 

diff --git a/chat/riece/Makefile b/chat/riece/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2005/03/05 09:14:11 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	riece-1.0.7a
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat japanese
 MASTER_SITES=	http://savannah.nongnu.org/download/riece/
 

diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/04/02 22:01:36 jwise Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=		zenicb-19981202
-PKGNAME=${DISTNAME}
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=		2
 CATEGORIES=		chat
 MASTER_SITES=		${MASTER_SITE_LOCAL}

diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 21:26:31 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	zenirc-2.112
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat
 MASTER_SITES=	ftp://ftp.splode.com/pub/zenirc/
 

diff --git a/chat/zephyr-mode/Makefile b/chat/zephyr-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2005/05/24 14:04:15 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	zephyr-mode-2.5.20
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	chat net
 MASTER_SITES=	http://www-2.cs.cmu.edu/People/dkindred/zephyr-mode/
 

diff --git a/devel/apel/Makefile b/devel/apel/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/03/05 16:33:07 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=	apel-10.6
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/apel/
 

diff --git a/devel/elib/Makefile b/devel/elib/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:50 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	elib-1.0
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION?=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://jde.sunsite.dk/

diff --git a/devel/emacs-ilisp/Makefile b/devel/emacs-ilisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:14:54 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:28 uebayasi Exp $
 #
 
 DISTNAME=	ilisp-20021222
-PKGNAME=	emacs-${DISTNAME}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}emacs-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ilisp/}
 

diff --git a/devel/haskell-mode/Makefile b/devel/haskell-mode/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/07/17 21:31:03 grant Exp $
+# $NetBSD: Makefile,v 1.14 2005/08/28 04:25:28 uebayasi Exp $
 
 DISTNAME=		haskell-mode-1.44
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=		devel editors
 MASTER_SITES=		http://www.haskell.org/haskell-mode/
 

diff --git a/devel/pcl-cvs/Makefile b/devel/pcl-cvs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	pcl-cvs-2.9.9
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs/

diff --git a/devel/pvs/Makefile b/devel/pvs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=		pvs-${VERSION}
+PKGNAME=		${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=		2
 CATEGORIES=		devel lang
 MASTER_SITES=		ftp://pvs.csl.sri.com/pub/pvs/pvs${VERSION}/ \

diff --git a/devel/python-mode/Makefile b/devel/python-mode/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	python-mode-4.54
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-mode/}
 DISTFILES=	python-mode.el

diff --git a/devel/ruby-mode/Makefile b/devel/ruby-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2005/08/08 14:30:32 taca Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGPREFIX}-mode-${RUBY_VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-mode-${RUBY_VERSION}
 CATEGORIES=	devel ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 

diff --git a/devel/ruby-rd-mode/Makefile b/devel/ruby-rd-mode/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/08/08 14:30:32 taca Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	rdtool-${RUBY_RD_VERSION}
-PKGNAME=	${RUBY_PKGPREFIX}-rd-mode-${RUBY_RD_VERSION}
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${RUBY_PKGPREFIX}-rd-mode-${RUBY_RD_VERSION}
 CATEGORIES=	devel ruby
 MASTER_SITES=	http://www2.pos.to/~tosh/ruby/rdtool/archive/
 

diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
@@ -1,33 +1,30 @@
-# $NetBSD: Makefile,v 1.14 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/08/28 04:25:29 uebayasi Exp $
 #
 
 DISTNAME=	semantic-1.4.2
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cedet/}
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://cedet.sourceforge.net/semantic.shtml
 COMMENT=	Lexer, parser-generator, and parser written for Emacs
 
-DEPENDS+=	speedbar>=0.13:../../editors/speedbar
-DEPENDS+=	eieio>=0.17:../../lang/eieio
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}speedbar>=0.13:../../editors/speedbar
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio>=0.17:../../lang/eieio
 
 .include "../../mk/emacs.mk"
 
-.if ${EMACS_FLAVOR} == "emacs"
-EMACS=			emacs
-.else
-EMACS=			xemacs
-.endif
-
-BUILD_ENV+=	EMACS=${EMACS}
+BUILD_ENV+=	EMACS=${EMACS_FLAVOR}
 
 NO_CONFIGURE=	# set
 USE_TOOLS+=	gmake
 
 INFO_FILES=	semantic.info
 OTHER_INFO=	semantic.info-1 semantic.info-2
 
+MAKE_ENV+=	EMACS=${EMACS_FLAVOR}
+
 # XXX cd ${WRKSRC}; ${MAKE} -V semantic_LISP
 SRCS=	semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el
 # XXX cd ${WRKSRC}; ${MAKE} -V Languages_LISP

diff --git a/devel/semantic/distinfo b/devel/semantic/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/23 22:24:33 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/08/28 04:25:29 uebayasi Exp $
 
 SHA1 (semantic-1.4.2.tar.gz) = a8898745055319de676c61a5d529d4dfb6eb2878
 RMD160 (semantic-1.4.2.tar.gz) = 38243d5b84443430565100d2cfb1add45383e92f
 Size (semantic-1.4.2.tar.gz) = 313881 bytes
-SHA1 (patch-aa) = 7747913d4db505d1bc287b1d9bd986cbfaf53c7a
+SHA1 (patch-aa) = 28b97231dadb920be67d853de531f0b273e1b870
diff --git a/devel/semantic/patches/patch-aa b/devel/semantic/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2003/01/11 08:56:33 uebayasi Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/28 04:25:29 uebayasi Exp $
 
---- Makefile.orig	Tue Dec 31 19:17:40 2002
+--- Makefile.orig	2002-12-31 19:17:40.000000000 +0900
 +++ Makefile
-@@ -19,7 +19,6 @@
+@@ -11,7 +11,6 @@ ede_FILES=Project.ede Makefile
+
+ example_MISC=semantic-skel.el skeleton.bnf semantic-example.el
+ init_LISP=semantic-load.el
+-EMACS=emacs
+ LOADPATH=../speedbar/ ../eieio/ 
+ semantic_LISP=semantic.el semantic-util.el semantic-bnf.el semantic-ctxt.el
+ Languages_LISP=semantic-c.el semantic-el.el semantic-java.el semantic-make.el semantic-scm.el semantic-texi.el
+@@ -19,7 +18,6 @@ tools_LISP=semantic-imenu.el semantic-sb
  senator_LISP=senator.el
  misc_AUX=INSTALL NEWS ChangeLog
  info_TEXINFOS=semantic.texi

diff --git a/devel/sml-mode/Makefile b/devel/sml-mode/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	sml-mode-3.9.5
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 CATEGORIES=	devel editors
 MASTER_SITES=	ftp://flint.cs.yale.edu/pub/monnier/sml-mode/
 

diff --git a/editors/emacs-packages/Makefile b/editors/emacs-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/11/30 15:42:02 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	emacs-packages-0.6
 CATEGORIES=	meta-pkgs editors
@@ -12,60 +12,60 @@ COMMENT=	Meta-package for the GNU Emacs lisp packages
 .include "../../mk/emacs.mk"
 
 # XXX
-# Please update the version of this package (emacs-package) when you #
-# add a new emacs lisp package below!				     #
-DEPENDS+=	apel-[0-9]*:../../devel/apel
-DEPENDS+=	artist-[0-9]*:../../graphics/artist
-DEPENDS+=	auctex-[0-9]*:../../print/auctex
-DEPENDS+=	bbdb-[0-9]*:../../misc/bbdb
+# Please update the version of this package (emacs-package) when you
+# add a new emacs lisp package below!
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel-[0-9]*:../../devel/apel
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}artist-[0-9]*:../../graphics/artist
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}auctex-[0-9]*:../../print/auctex
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}bbdb-[0-9]*:../../misc/bbdb
 .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20"
-DEPENDS+=	calc-[0-9]*:../../math/calc
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}calc-[0-9]*:../../math/calc
 .endif
-DEPENDS+=	eieio-[0-9]*:../../lang/eieio
-DEPENDS+=	elib-[0-9]*:../../devel/elib
-DEPENDS+=	emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client
-DEPENDS+=	emacs-ilisp-[0-9]*:../../devel/emacs-ilisp
-DEPENDS+=	emacs-w3m-[0-9]*:../../www/emacs-w3m
-DEPENDS+=	ess-[0-9]*:../../math/ess
-DEPENDS+=	etach-[0-9]*:../../mail/etach
-DEPENDS+=	flim-[0-9]*:../../devel/flim
-DEPENDS+=	flyspell-[0-9]*:../../textproc/flyspell
-DEPENDS+=	haskell-mode-[0-9]*:../../devel/haskell-mode
-DEPENDS+=	iiimecf-[0-9]*:../../inputmethod/iiimecf
-DEPENDS+=	irchat-pj-[0-9]*:../../chat/irchat-pj
-DEPENDS+=	ispell-emacs-[0-9]*:../../textproc/ispell-emacs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}eieio-[0-9]*:../../lang/eieio
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}elib-[0-9]*:../../devel/elib
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-dict-client-[0-9]*:../../textproc/emacs-dict-client
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-ilisp-[0-9]*:../../devel/emacs-ilisp
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}emacs-w3m-[0-9]*:../../www/emacs-w3m
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ess-[0-9]*:../../math/ess
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}etach-[0-9]*:../../mail/etach
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}flim-[0-9]*:../../devel/flim
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}flyspell-[0-9]*:../../textproc/flyspell
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}haskell-mode-[0-9]*:../../devel/haskell-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}iiimecf-[0-9]*:../../inputmethod/iiimecf
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}irchat-pj-[0-9]*:../../chat/irchat-pj
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ispell-emacs-[0-9]*:../../textproc/ispell-emacs
 #.if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "21"
-#DEPENDS+=	jde-[0-9]*:../../editors/jde
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}jde-[0-9]*:../../editors/jde
 #.endif
-DEPENDS+=	riece-[0-9]*:../../chat/riece
-#DEPENDS+=	lookup-[0-9]*:../../misc/lookup
-DEPENDS+=	mailcrypt-[0-9]*:../../mail/mailcrypt
-DEPENDS+=	matlab-mode-*:../../editors/matlab-mode
-#DEPENDS+=	mew-[0-9]*:../../mail/mew
-DEPENDS+=	mew-[0-9]*:../../mail/mew3
-DEPENDS+=	Mule-UCS-[0-9]*:../../editors/mule-ucs
-DEPENDS+=	navi2ch-[0-9]*:../../chat/navi2ch
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}riece-[0-9]*:../../chat/riece
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}lookup-[0-9]*:../../misc/lookup
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}mailcrypt-[0-9]*:../../mail/mailcrypt
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}matlab-mode-*:../../editors/matlab-mode
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}mew-[0-9]*:../../mail/mew3
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}navi2ch-[0-9]*:../../chat/navi2ch
 .if defined(_EMACS_VERSION_EMACS_MAJOR) && ${_EMACS_VERSION_EMACS_MAJOR} == "20"
-DEPENDS+=	pcl-cvs-[0-9]*:../../devel/pcl-cvs
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}pcl-cvs-[0-9]*:../../devel/pcl-cvs
 .endif
-#DEPENDS+=	pvs-[0-9]*:../../devel/pvs	# XXX pvs-license
-DEPENDS+=	psgml-mode-[0-9]*:../../textproc/psgml-mode
-DEPENDS+=	python-mode-[0-9]*:../../devel/python-mode
-DEPENDS+=	ruby-mode-[0-9]*:../../devel/ruby-mode
-DEPENDS+=	ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode
-DEPENDS+=	semantic-[0-9]*:../../devel/semantic
-DEPENDS+=	semi-[0-9]*:../../devel/semi
-DEPENDS+=	skk-[0-9]*:../../inputmethod/skk
-DEPENDS+=	sml-mode-[0-9]*:../../devel/sml-mode
-DEPENDS+=	speedbar-[0-9]*:../../editors/speedbar
-DEPENDS+=	tamago-[0-9]*:../../editors/tamago
-DEPENDS+=	tc-[0-9]*:../../inputmethod/tc
-DEPENDS+=	verilog-mode-[0-9]*:../../cad/verilog-mode
-DEPENDS+=	vm-[0-9]*:../../mail/vm
-DEPENDS+=	w3-[0-9]*:../../www/w3
-DEPENDS+=	wl-[0-9]*:../../mail/wl
-DEPENDS+=	zenicb-[0-9]*:../../chat/zenicb
-DEPENDS+=	zenirc-[0-9]*:../../chat/zenirc
+#DEPENDS+=	${EMACS_PKGNAME_PREFIX}pvs-[0-9]*:../../devel/pvs	# XXX pvs-license
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}psgml-mode-[0-9]*:../../textproc/psgml-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}python-mode-[0-9]*:../../devel/python-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ruby-mode-[0-9]*:../../devel/ruby-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}ruby-rd-mode-[0-9]*:../../devel/ruby-rd-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semantic-[0-9]*:../../devel/semantic
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}semi-[0-9]*:../../devel/semi
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}skk-[0-9]*:../../inputmethod/skk
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}sml-mode-[0-9]*:../../devel/sml-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}speedbar-[0-9]*:../../editors/speedbar
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}tamago-[0-9]*:../../editors/tamago
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}tc-[0-9]*:../../inputmethod/tc
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}verilog-mode-[0-9]*:../../cad/verilog-mode
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}vm-[0-9]*:../../mail/vm
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}w3-[0-9]*:../../www/w3
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}wl-[0-9]*:../../mail/wl
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}zenicb-[0-9]*:../../chat/zenicb
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}zenirc-[0-9]*:../../chat/zenirc
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes

diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/06/01 18:02:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/08/28 04:25:29 uebayasi Exp $
 
 DISTNAME=	gnuserv-3.12.7
+PKGNAME=	${EMACS_PKGNAME_PREFIX}${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	${HOMEPAGE}/src/