From 78ab676b10a8b8698ffeb80f13c90487e58430b9 Mon Sep 17 00:00:00 2001
From: jwise <jwise@pkgsrc.org>
Date: Fri, 8 Apr 2005 19:05:29 +0000
Subject: Second cut of a fix for the problem where PKGNAME is geting set to
 xemacs-${VERRSION} (not xemacs-${PKGNAME}-${VERSION}) for all packages using
 this and not explicitly setting PKGNAME>

A better way of doing this should be found, but this fixes builds.
---
 mk/emacs.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mk/emacs.mk')

diff --git a/mk/emacs.mk b/mk/emacs.mk
index a204b742727..5bb2cfcdcb6 100644
--- a/mk/emacs.mk
+++ b/mk/emacs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.17 2005/03/07 17:48:08 jwise Exp $
+# $NetBSD: emacs.mk,v 1.18 2005/04/08 19:05:29 jwise Exp $
 #
 # A Makefile fragment for Emacs Lisp packages.
 #
@@ -175,9 +175,13 @@ EMACS_BIN=	${PREFIX}/bin/xemacs
 EMACS_PKG_VERSION=	${_EMACS_VERSION_XEMACS_FULL:C|^.*-||}
 EMACS_LISPPREFIX=	${PREFIX}/lib/xemacs/site-packages/lisp
 PKGNAME_PREFIX=		xemacs-
+.if defined(PKGNAME)
 PKGNAME:=		${PKGNAME_PREFIX}${PKGNAME}
+.else
+PKGNAME:=		${PKGNAME_PREFIX}${DISTNAME}${PKGREVISION}
 CONFLICTS+=		${PKGBASE:C|^xemacs-||}-[0-9]*
 .endif
+.endif
 # strip out nb?
 EMACS_VERSION=${EMACS_PKG_VERSION:C|nb[0-9]*$||}
 PLIST_SUBST+=	EMACS_VERSION=${EMACS_VERSION}
-- 
cgit v1.2.3