[pkgsrc/trunk]: pkgsrc/mk Darwin>=7.0 does not need devel/dlcompat.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba10f45ab218
branches:  trunk
changeset: 496339:ba10f45ab218
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sun Jun 26 13:11:22 2005 +0000

description:
Darwin>=7.0 does not need devel/dlcompat.

diffstat:

 devel/dlcompat/Makefile |  4 ++--
 mk/dlopen.buildlink3.mk |  4 ++--
 mk/dlopen.builtin.mk    |  8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diffs (62 lines):

diff -r d717736d0b99 -r ba10f45ab218 devel/dlcompat/Makefile
--- a/devel/dlcompat/Makefile   Sun Jun 26 10:28:04 2005 +0000
+++ b/devel/dlcompat/Makefile   Sun Jun 26 13:11:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/26 13:11:22 minskim Exp $
 #
 
 DISTNAME=      dlcompat-20030629
@@ -9,7 +9,7 @@
 HOMEPAGE=      http://fink.sourceforge.net/
 COMMENT=       Library for dlopen() emulation on Darwin
 
-ONLY_FOR_PLATFORM=     Darwin-*-*
+ONLY_FOR_PLATFORM=     Darwin-[56].*-*
 
 GNU_CONFIGURE=         yes
 
diff -r d717736d0b99 -r ba10f45ab218 mk/dlopen.buildlink3.mk
--- a/mk/dlopen.buildlink3.mk   Sun Jun 26 10:28:04 2005 +0000
+++ b/mk/dlopen.buildlink3.mk   Sun Jun 26 13:11:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.buildlink3.mk,v 1.8 2004/11/26 09:32:06 jlam Exp $
+# $NetBSD: dlopen.buildlink3.mk,v 1.9 2005/06/26 13:11:22 minskim Exp $
 #
 # This Makefile fragment is included by package Makefiles and
 # buildlink3.mk files for the packages that use dlopen().
@@ -20,7 +20,7 @@
 BUILDLINK_PACKAGES+=           dl
 BUILDLINK_BUILTIN_MK.dl=       ../../mk/dlopen.builtin.mk
 BUILDLINK_AUTO_VARS.dl=                ${DL_AUTO_VARS}
-.elif ${OPSYS} == "Darwin"
+.elif !empty(MACHINE_PLATFORM:MDarwin-[56].*)
 .  include "../../devel/dlcompat/buildlink3.mk"
 BUILDLINK_AUTO_VARS.dlcompat=  ${DL_AUTO_VARS}
 .else
diff -r d717736d0b99 -r ba10f45ab218 mk/dlopen.builtin.mk
--- a/mk/dlopen.builtin.mk      Sun Jun 26 10:28:04 2005 +0000
+++ b/mk/dlopen.builtin.mk      Sun Jun 26 13:11:22 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.builtin.mk,v 1.13 2005/06/09 05:59:51 jlam Exp $
+# $NetBSD: dlopen.builtin.mk,v 1.14 2005/06/26 13:11:22 minskim Exp $
 
 BUILTIN_PKG:=  dl
 
@@ -27,13 +27,13 @@
 ###
 #
 # We ignore the value of PREFER_PKGSRC and PREFER_NATIVE because for
-# every platform except for Darwin, we can only use the built-in
+# every platform except for Darwin-[56].*, we can only use the built-in
 # dynamic linker functions, so USE_BUILTIN.dl must match IS_BUILTIN.dl.
 #
 .if !defined(USE_BUILTIN.dl)
 USE_BUILTIN.dl=                ${IS_BUILTIN.dl}
-.  if ${OPSYS} == "Darwin"
-USE_BUILTIN.dl=                no      # Darwin uses devel/dlcompat
+.  if !empty(MACHINE_PLATFORM:MDarwin-[56].*)
+USE_BUILTIN.dl=                no      # Darwin-[56].* uses devel/dlcompat
 .  endif
 .endif
 MAKEVARS+=     USE_BUILTIN.dl