summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruebayasi <uebayasi@pkgsrc.org>2002-09-14 02:19:29 +0000
committeruebayasi <uebayasi@pkgsrc.org>2002-09-14 02:19:29 +0000
commitbf3386ac9594150ed2f0071b4398d6bc301c6727 (patch)
treee1d2972aa4514cc1961901a4d67be56d6c3a9a99
parent993a95d6b81c4a9bab47c690a5a0baa4168593f7 (diff)
downloadpkgsrc-bf3386ac9594150ed2f0071b4398d6bc301c6727.tar.gz
* Prefix PKGNAME with "xemacs-" if the package is for XEmacs.
* Do the trick in mk/emacs.mk instead of each package's Makefile.
-rw-r--r--chat/irchat/Makefile3
-rw-r--r--chat/zenicb/Makefile3
-rw-r--r--chat/zenirc/Makefile3
-rw-r--r--mk/emacs.mk8
4 files changed, 6 insertions, 11 deletions
diff --git a/chat/irchat/Makefile b/chat/irchat/Makefile
index 616ba647146..d72a447b258 100644
--- a/chat/irchat/Makefile
+++ b/chat/irchat/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2002/09/13 10:37:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.4 2002/09/14 02:19:29 uebayasi Exp $
DISTNAME= irchat-pj-2.4.24.20
-PKGNAME= ${EMACS_PKGPREFIX}${DISTNAME}
CATEGORIES= chat
MASTER_SITES= ftp://ftp.madoka.org/pub/irchat-pj/
diff --git a/chat/zenicb/Makefile b/chat/zenicb/Makefile
index 0fbb2b2cb22..789dd31c24b 100644
--- a/chat/zenicb/Makefile
+++ b/chat/zenicb/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2002/09/13 10:40:39 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2002/09/14 02:19:29 uebayasi Exp $
DISTNAME= zenicb-19981202
-PKGNAME= ${EMACS_PKGPREFIX}${DISTNAME}
CATEGORIES= chat
MASTER_SITES= ${MASTER_SITE_LOCAL}
diff --git a/chat/zenirc/Makefile b/chat/zenirc/Makefile
index b9ca6fdbf89..73bc72201f2 100644
--- a/chat/zenirc/Makefile
+++ b/chat/zenirc/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2002/09/13 10:39:54 uebayasi Exp $
+# $NetBSD: Makefile,v 1.5 2002/09/14 02:19:30 uebayasi Exp $
#
DISTNAME= zenirc-2.112
-PKGNAME= ${EMACS_PKGPREFIX}${DISTNAME}
CATEGORIES= chat
MASTER_SITES= ftp://ftp.splode.com/pub/zenirc/
diff --git a/mk/emacs.mk b/mk/emacs.mk
index e459fb201da..61f0f5ee91e 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.1 2002/09/13 10:36:20 uebayasi Exp $
+# $NetBSD: emacs.mk,v 1.2 2002/09/14 02:19:29 uebayasi Exp $
#
# A Makefile fragment for Emacs Lisp packages.
#
@@ -110,25 +110,23 @@ FOR.xemacs215= "@comment "
FOR.xemacs211= "@comment "
.if ${_EMACS_VERSION} == "emacs21"
EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.emacs21}:../../editors/emacs21
-EMACS_PKGPREFIX= ""
FOR.emacs21= ""
.if defined(EMACS_USE_LEIM)
DEPENDS+= ${BUILDLINK_DEPENDS.leim21}:../../editors/leim21
.endif
.elif ${_EMACS_VERSION} == "emacs20"
EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.emacs20}:../../editors/emacs
-EMACS_PKGPREFIX= ""
FOR.emacs20= ""
.if defined(EMACS_USE_LEIM)
DEPENDS+= ${BUILDLINK_DEPENDS.leim20}:../../editors/leim20
.endif
.elif ${_EMACS_VERSION} == "xemacs215"
EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.xemacs215}:../../editors/xemacs-current
-EMACS_PKGPREFIX= "xemacs-"
+PKGNAME= xemacs-${DISTNAME}
FOR.xemacs215= ""
.elif ${_EMACS_VERSION} == "xemacs211"
EMACS_DEPENDENCY= ${BUILDLINK_DEPENDS.xemacs211}:../../editors/xemacs
-EMACS_PKGPREFIX= "xemacs-"
+PKGNAME= xemacs-${DISTNAME}
FOR.xemacs211= ""
.else
IGNORE+= "Accepted versions are: ${EMACS_VERSIONS_ACCEPTED}"