[pkgsrc/pkgsrc-2005Q1]: pkgsrc/mk Pullup ticket 467 - requested by Thor Lance...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b94cb0161318
branches:  pkgsrc-2005Q1
changeset: 490990:b94cb0161318
user:      salo <salo%pkgsrc.org@localhost>
date:      Wed Apr 27 02:28:04 2005 +0000

description:
Pullup ticket 467 - requested by Thor Lancelot Simon
infrastructure fix for xemacs packages

Revisions pulled up:
- pkgsrc/mk/emacs.mk    1.18

   Module Name:         pkgsrc
   Committed By:        jwise
   Date:                Fri Apr  8 19:05:29 UTC 2005

   Modified Files:
        pkgsrc/mk: emacs.mk

   Log Message:
   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.

diffstat:

 mk/emacs.mk |  6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 8ab4c4c9ea28 -r b94cb0161318 mk/emacs.mk
--- a/mk/emacs.mk       Fri Apr 22 14:40:17 2005 +0000
+++ b/mk/emacs.mk       Wed Apr 27 02:28:04 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: emacs.mk,v 1.17 2005/03/07 17:48:08 jwise Exp $
+# $NetBSD: emacs.mk,v 1.17.2.1 2005/04/27 02:28:04 salo Exp $
 #
 # A Makefile fragment for Emacs Lisp packages.
 #
@@ -175,9 +175,13 @@
 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}