diff options
| author | jlam <jlam@pkgsrc.org> | 2007-08-28 14:00:45 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-08-28 14:00:45 +0000 |
| commit | 5d44d182f5210440218debec2ea07fa9e240b1f1 (patch) | |
| tree | af8b49711fbc7ffc39530a33ca19da9f9e36125d /emulators | |
| parent | 35bb4feb2f7346ea68dd8b2971c1f93c87a646ef (diff) | |
| download | pkgsrc-5d44d182f5210440218debec2ea07fa9e240b1f1.tar.gz | |
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 (limited to 'emulators')
| -rw-r--r-- | emulators/compat_netbsd/Makefile.common | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/emulators/compat_netbsd/Makefile.common b/emulators/compat_netbsd/Makefile.common index 38052516bbc..92de0a352e8 100644 --- a/emulators/compat_netbsd/Makefile.common +++ b/emulators/compat_netbsd/Makefile.common @@ -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 @@ PKGDIR= ${NETBSD_PKGSRCDIR} .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 |