[pkgsrc/trunk]: pkgsrc/emulators/compat_netbsd Fix derivation of PKGNAME in t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62f12f4c4ad9
branches:  trunk
changeset: 532670:62f12f4c4ad9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 28 14:00:45 2007 +0000

description:
Fix derivation of PKGNAME in the COMPAT_NETBSD32 case so that DISTNAME
may be defined after the inclusion of compat_netbsd/Makefile.common in
a package Makefile.  This should fix the problem (reported in private
by Juan Romero Pardines) where the "-extras" packages did not have a
version number in PKGNAME.

diffstat:

 emulators/compat_netbsd/Makefile.common |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 001107f9dec8 -r 62f12f4c4ad9 emulators/compat_netbsd/Makefile.common
--- a/emulators/compat_netbsd/Makefile.common   Tue Aug 28 00:32:25 2007 +0000
+++ b/emulators/compat_netbsd/Makefile.common   Tue Aug 28 14:00:45 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2007/08/23 20:11:53 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2007/08/28 14:00:45 jlam Exp $
 #
 # Common infrastructure for NetBSD compat* packages.
 #
@@ -6,7 +6,6 @@
 # defined and before EMUL_PLATFORM is used.
 #
 
-PKGNAME=               ${DISTNAME:S/-${EMUL_ARCH}-/-/}
 CATEGORIES=            emulators
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
 EXTRACT_SUFX=          .tar.bz2
@@ -32,10 +31,11 @@
 
 .if ((${EMUL_ARCH} == "i386") && (${MACHINE_ARCH} == "x86_64")) || \
     ((${EMUL_ARCH} == "sparc") && (${MACHINE_ARCH} == "sparc64"))
-PKGNAME:=              ${PKGNAME:S/^/netbsd32_/}
+PKGNAME=               netbsd32_${DISTNAME:S/-${EMUL_ARCH}-/-/}
 COMMENT:=              ${COMMENT:S/NetBSD/NetBSD 32-bit/}
 NETBSD_BASE=           netbsd32_
 .else
+PKGNAME=               ${DISTNAME:S/-${EMUL_ARCH}-/-/}
 NETBSD_BASE=           # empty
 .endif