Don't rely on differences in the value of DISTNAME that rely on

"immediate" versus "lazy" evaluation of the value.  Just explicitly
define a variable (COMPAT_PKG) that holds the value that's needed in
each of the compat* packages, and use it within Makefile.common.

This was an attempt to solve PR pkg/36863, but it doesn't look like
pkglint or lintpkgsrc understand this more straightforward variable
construction either.

12 files changed, 24 insertions, 24 deletions

diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index b495acb9c95..9bf86145553 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2007/08/21 22:49:04 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2007/08/30 16:54:06 jlam Exp $
 
-DISTNAME=		compat12	# overridden below
+COMPAT_PKG=		compat12	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.2
 PKGREVISION=		1
 
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index 9fa24679568..7bbb3b752f5 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2007/08/21 22:49:06 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2007/08/30 16:54:06 jlam Exp $
 
-DISTNAME=		compat13	# overridden below
+COMPAT_PKG=		compat13	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.3
 PKGREVISION=		3
 
diff --git a/emulators/compat14/Makefile b/emulators/compat14/Makefile
index 444ba0c931b..db17ecf8a63 100644
--- a/emulators/compat14/Makefile
+++ b/emulators/compat14/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2007/08/21 22:49:08 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/08/30 16:54:07 jlam Exp $
 
-DISTNAME=		compat14	# overridden below
+COMPAT_PKG=		compat14	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.4
 PKGREVISION=		2
 
diff --git a/emulators/compat15-extras/Makefile b/emulators/compat15-extras/Makefile
index 28c4335e16a..ae925f86846 100644
--- a/emulators/compat15-extras/Makefile
+++ b/emulators/compat15-extras/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:13 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:07 jlam Exp $
 
-DISTNAME=		compat15-extras		# overridden below
+COMPAT_PKG=		compat15	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.5
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.5/index.html
diff --git a/emulators/compat15/Makefile b/emulators/compat15/Makefile
index e5cf8deae0a..61ade62743e 100644
--- a/emulators/compat15/Makefile
+++ b/emulators/compat15/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:11 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:07 jlam Exp $
 
-DISTNAME=		compat15	# overridden below
+COMPAT_PKG=		compat15	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.5
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.5/index.html
diff --git a/emulators/compat16-extras/Makefile b/emulators/compat16-extras/Makefile
index 2bedad4d3a2..26b1e81a743 100644
--- a/emulators/compat16-extras/Makefile
+++ b/emulators/compat16-extras/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:17 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
 
-DISTNAME=		compat16-extras		# overridden below
+COMPAT_PKG=		compat16	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.6
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
diff --git a/emulators/compat16/Makefile b/emulators/compat16/Makefile
index cbe99ab77ab..bff9512efea 100644
--- a/emulators/compat16/Makefile
+++ b/emulators/compat16/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2007/08/21 22:49:14 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/08/30 16:54:07 jlam Exp $
 
-DISTNAME=		compat16	# overridden below
+COMPAT_PKG=		compat16	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		1.6
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-1.6/index.html
diff --git a/emulators/compat20-extras/Makefile b/emulators/compat20-extras/Makefile
index a36a34a3a30..a4825a8d259 100644
--- a/emulators/compat20-extras/Makefile
+++ b/emulators/compat20-extras/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:19 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
 
-DISTNAME=		compat20-extras		# overridden below
+COMPAT_PKG=		compat20	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		2.0
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-2.0/index.html
diff --git a/emulators/compat20/Makefile b/emulators/compat20/Makefile
index f10c98e2cb3..b74fe5e1314 100644
--- a/emulators/compat20/Makefile
+++ b/emulators/compat20/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:18 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
 
-DISTNAME=		compat20	# overridden below
+COMPAT_PKG=		compat20	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		2.0
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-2.0/index.html
diff --git a/emulators/compat30-extras/Makefile b/emulators/compat30-extras/Makefile
index aa3e63e2334..73cdbc4e863 100644
--- a/emulators/compat30-extras/Makefile
+++ b/emulators/compat30-extras/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2007/08/27 21:44:37 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/08/30 16:54:08 jlam Exp $
 
-DISTNAME=		compat30-extras		# overridden below
+COMPAT_PKG=		compat30	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		3.0
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-3.0/index.html
diff --git a/emulators/compat30/Makefile b/emulators/compat30/Makefile
index 32a7a9c86a7..61836d1ede2 100644
--- a/emulators/compat30/Makefile
+++ b/emulators/compat30/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2007/08/21 22:49:20 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2007/08/30 16:54:08 jlam Exp $
 
-DISTNAME=		compat30	# overridden below
+COMPAT_PKG=		compat30	# for compat_netbsd/Makefile.common
 NETBSD_VERSION=		3.0
 
 HOMEPAGE=		http://www.NetBSD.org/Releases/formal-3.0/index.html
diff --git a/emulators/compat_netbsd/Makefile.common b/emulators/compat_netbsd/Makefile.common
index 92de0a352e8..72303638f13 100644
--- a/emulators/compat_netbsd/Makefile.common
+++ b/emulators/compat_netbsd/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2007/08/28 14:00:45 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2007/08/30 16:54:08 jlam Exp $
 #
 # Common infrastructure for NetBSD compat* packages.
 #
@@ -71,7 +71,7 @@ NATIVE_EXEC_FMT=	${_NATIVE_EXEC_FMT_cmd:sh}
 _NATIVE_EXEC_FMT_cmd=	sh ${.CURDIR}/../../mk/scripts/shlib-type	\
 				${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
 
-.include "${PKGSRCDIR}/emulators/${DISTNAME:C/-.*//}/emulator.mk"
+.include "${PKGSRCDIR}/emulators/${COMPAT_PKG}/emulator.mk"
 
 #
 # Different combinations of the native executable format and the emulated