From 6eaa10eaaf44900c82b263e729cea1b1f959985f Mon Sep 17 00:00:00 2001
From: Makoto Fujiwara <makoto@ki.nu>
Date: Sat, 4 May 2013 13:35:44 +0000
Subject: [PATCH] (1) Correction to PKGNAME, following new emacs meta-pkg
 naming policy     like not emacs but emacs24.       As of writing this, the
 other idea came out that it     should take different name than other emacs
 packages,     meaning not emacs24 but emacs244 (?) (2) PLIST had PKGNAME
 referenced. Now references DISTNAME.

---
 emacs-current/Makefile | 5 +++--
 emacs-current/PLIST    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emacs-current/Makefile b/emacs-current/Makefile
index 396e265afe..66942525ae 100644
--- a/emacs-current/Makefile
+++ b/emacs-current/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.65 2013/03/15 14:09:50 makoto Exp $
+# $NetBSD: Makefile,v 1.66 2013/05/04 13:35:44 makoto Exp $
 #
 
 .include	"version.mk"
 DISTNAME=	emacs-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
-#PKGNAME=	emacs-24.0.50
+PKGNAME=	emacs24-${_EMACS_VERSION_MAJOR}.${_EMACS_VERSION_MINOR}.${_EMACS_VERSION_MICRO}
 CATEGORIES=	editors
 MASTER_SITES=	#
 
@@ -40,6 +40,7 @@ BUILD_DEFS+=		VARBASE
 BUILD_DEFS+=		GAMEDATAMODE
 
 PLIST_SRC+=		PLIST
+PLIST_SUBST+=           DISTNAME=${DISTNAME}
 
 MAKE_DIRS_PERMS+=	${VARBASE}/games/emacs ${GAMEOWN:Q} ${GAMEGRP} ${GAMEDIRMODE:Q}
 CONF_FILES_PERMS+=	/dev/null ${VARBASE}/games/emacs/snake-scores ${GAMEOWN:Q} ${GAMEGRP:Q} ${GAMEDATAMODE:Q}
diff --git a/emacs-current/PLIST b/emacs-current/PLIST
index de268a104c..b180d71b55 100644
--- a/emacs-current/PLIST
+++ b/emacs-current/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.123 2013/05/03 12:20:39 makoto Exp $
+@comment $NetBSD: PLIST,v 1.124 2013/05/04 13:35:44 makoto Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
-bin/${PKGNAME}
+bin/${DISTNAME}
 bin/emacsclient
 bin/etags
 bin/grep-changelog