[pkgsrc/trunk]: pkgsrc/emulators Don't rely on differences in the value of DI...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators Don't rely on differences in the value of DI...
From: jlam <jlam%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 05:15:03 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/f23760b11045
branches:  trunk
changeset: 532778:f23760b11045
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Aug 30 16:54:06 2007 +0000

description:
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.

diffstat:

 emulators/compat12/Makefile             |  4 ++--
 emulators/compat13/Makefile             |  4 ++--
 emulators/compat14/Makefile             |  4 ++--
 emulators/compat15-extras/Makefile      |  4 ++--
 emulators/compat15/Makefile             |  4 ++--
 emulators/compat16-extras/Makefile      |  4 ++--
 emulators/compat16/Makefile             |  4 ++--
 emulators/compat20-extras/Makefile      |  4 ++--
 emulators/compat20/Makefile             |  4 ++--
 emulators/compat30-extras/Makefile      |  4 ++--
 emulators/compat30/Makefile             |  4 ++--
 emulators/compat_netbsd/Makefile.common |  4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diffs (150 lines):

diff -r 2fabf57c63a8 -r f23760b11045 emulators/compat12/Makefile
--- a/emulators/compat12/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat12/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat13/Makefile
--- a/emulators/compat13/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat13/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat14/Makefile
--- a/emulators/compat14/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat14/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat15-extras/Makefile
--- a/emulators/compat15-extras/Makefile        Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat15-extras/Makefile        Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat15/Makefile
--- a/emulators/compat15/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat15/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat16-extras/Makefile
--- a/emulators/compat16-extras/Makefile        Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat16-extras/Makefile        Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat16/Makefile
--- a/emulators/compat16/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat16/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat20-extras/Makefile
--- a/emulators/compat20-extras/Makefile        Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat20-extras/Makefile        Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat20/Makefile
--- a/emulators/compat20/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat20/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat30-extras/Makefile
--- a/emulators/compat30-extras/Makefile        Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat30-extras/Makefile        Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat30/Makefile
--- a/emulators/compat30/Makefile       Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat30/Makefile       Thu Aug 30 16:54:06 2007 +0000
@@ -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 -r 2fabf57c63a8 -r f23760b11045 emulators/compat_netbsd/Makefile.common
--- a/emulators/compat_netbsd/Makefile.common   Thu Aug 30 16:45:39 2007 +0000
+++ b/emulators/compat_netbsd/Makefile.common   Thu Aug 30 16:54:06 2007 +0000
@@ -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_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
Prev by Date: [pkgsrc/trunk]: pkgsrc/databases/sqlrelay Use RCD_SCRIPT_SRC instead of copyi...
Next by Date: [pkgsrc/trunk]: pkgsrc/devel/guile-gnome Add an explicit cast to fix the buil...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/databases/sqlrelay Use RCD_SCRIPT_SRC instead of copyi...
Next by Thread: [pkgsrc/trunk]: pkgsrc/devel/guile-gnome Add an explicit cast to fix the buil...
Indexes:
Home | Main Index | Thread Index | Old Index