[pkgsrc/trunk]: pkgsrc/emulators MASTER_SITE_LOCAL doesn't honor DIST_SUBDIR....

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/be4036114214
branches:  trunk
changeset: 537750:be4036114214
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jan 15 15:43:48 2008 +0000

description:
MASTER_SITE_LOCAL doesn't honor DIST_SUBDIR.  Modify the MASTER_SITES
variable so that at least the compat* NetBSD packages will honor it.
This allows the compat40 packages to find their distfiles, located under
LOCAL_PORTS/20071230.

diffstat:

 emulators/compat40-extras/Makefile      |  14 +++++++-------
 emulators/compat40/Makefile             |  14 +++++++-------
 emulators/compat_netbsd/Makefile.common |   4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diffs (87 lines):

diff -r 4224c3e6c256 -r be4036114214 emulators/compat40-extras/Makefile
--- a/emulators/compat40-extras/Makefile        Tue Jan 15 14:39:00 2008 +0000
+++ b/emulators/compat40-extras/Makefile        Tue Jan 15 15:43:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/12/31 20:06:40 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/01/15 15:43:49 jlam Exp $
 
 COMPAT_PKG=            compat40        # for compat_netbsd/Makefile.common
 NETBSD_VERSION=                4.0
@@ -6,18 +6,18 @@
 HOMEPAGE=              http://www.NetBSD.org/releases/formal-4/index.html
 COMMENT=               Additional shared libraries for NetBSD 4.0 compatibility
 
+# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
+# XXX subdirectory where the date corresponds to the build of HEAD against
+# XXX which these compat40 packages were generated.
+#
+DIST_SUBDIR=           20071230
+
 EMUL_PLATFORMS=                netbsd-i386 netbsd-sparc
 
 .include "../../emulators/compat_netbsd/Makefile.common"
 
 DISTNAME=              compat40-extras-${EMUL_ARCH}-4.0
 
-# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
-# XXX subdirectory where the date corresponds to the build of HEAD against
-# XXX which these compat40 packages were generated.
-#
-DIST_SUBDIR=           20071230
-
 # This package should only be installed for COMPAT_NETBSD32 emulation
 # on machines running NetBSD-4.x.
 #
diff -r 4224c3e6c256 -r be4036114214 emulators/compat40/Makefile
--- a/emulators/compat40/Makefile       Tue Jan 15 14:39:00 2008 +0000
+++ b/emulators/compat40/Makefile       Tue Jan 15 15:43:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2007/12/31 20:06:39 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2008/01/15 15:43:48 jlam Exp $
 
 COMPAT_PKG=            compat40        # for compat_netbsd/Makefile.common
 NETBSD_VERSION=                4.0
@@ -6,6 +6,12 @@
 HOMEPAGE=              http://www.NetBSD.org/releases/formal-4/index.html
 COMMENT=               Shared libraries for NetBSD 4.0 compatibility
 
+# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
+# XXX subdirectory where the date corresponds to the build of HEAD against
+# XXX which these compat40 packages were generated.
+#
+DIST_SUBDIR=           20071230
+
 .if defined(NETBSD_COMPAT32)
 EMUL_PLATFORMS=                netbsd-i386 netbsd-sparc
 
@@ -29,12 +35,6 @@
 DISTNAME=              compat40-${EMUL_ARCH}-${COMPAT_VERSION}
 COMPAT_VERSION=                4.0
 
-# XXX Until NetBSD 5.0 is released, we fetch the distfiles into a date-specific
-# XXX subdirectory where the date corresponds to the build of HEAD against
-# XXX which these compat40 packages were generated.
-#
-DIST_SUBDIR=           20071230
-
 # For COMPAT_NETBSD32, we need to depend on the compat40-extras package
 # on NetBSD-4.0 to supply the missing shared libraries; otherwise, we
 # just depend on the compat50 package for the missing shared libraries.
diff -r 4224c3e6c256 -r be4036114214 emulators/compat_netbsd/Makefile.common
--- a/emulators/compat_netbsd/Makefile.common   Tue Jan 15 14:39:00 2008 +0000
+++ b/emulators/compat_netbsd/Makefile.common   Tue Jan 15 15:43:48 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2007/11/27 19:40:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2008/01/15 15:43:49 jlam Exp $
 #
 # Common infrastructure for NetBSD compat* packages.
 #
@@ -7,7 +7,7 @@
 #
 
 CATEGORIES=            emulators
-MASTER_SITES=          ${MASTER_SITE_LOCAL}
+MASTER_SITES=          ${MASTER_SITE_LOCAL:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 EXTRACT_SUFX=          .tar.bz2
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost