[pkgsrc/trunk]: pkgsrc dlopen.buildlink3.mk will automatically include dlcomp...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/77172704f9ad
branches:  trunk
changeset: 484224:77172704f9ad
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 26 09:39:30 2004 +0000

description:
dlopen.buildlink3.mk will automatically include dlcompat/buildlink3.mk
only on Darwin, so remove OPSYS check in dlcompat/buildlink3.mk and
make packages include dlopen.buildlink3.mk instead.

diffstat:

 databases/sqsh/Makefile.common |  4 ++--
 devel/dlcompat/buildlink3.mk   |  6 +-----
 devel/libltdl/Makefile         |  4 ++--
 devel/libtool-base/Makefile    |  4 ++--
 lang/gauche/Makefile           |  4 ++--
 lang/gauche/buildlink3.mk      |  4 ++--
 lang/gforth/Makefile           |  4 ++--
 7 files changed, 13 insertions(+), 17 deletions(-)

diffs (121 lines):

diff -r 8840613d98a1 -r 77172704f9ad databases/sqsh/Makefile.common
--- a/databases/sqsh/Makefile.common    Fri Nov 26 09:32:06 2004 +0000
+++ b/databases/sqsh/Makefile.common    Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/08/27 06:29:07 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2004/11/26 09:39:30 jlam Exp $
 
 DISTNAME=      sqsh-2.1-src
 CATEGORIES=    databases
@@ -51,6 +51,6 @@
 .  include "../../databases/freetds/buildlink3.mk"
 .endif
 
-.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8840613d98a1 -r 77172704f9ad devel/dlcompat/buildlink3.mk
--- a/devel/dlcompat/buildlink3.mk      Fri Nov 26 09:32:06 2004 +0000
+++ b/devel/dlcompat/buildlink3.mk      Fri Nov 26 09:39:30 2004 +0000
@@ -1,6 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/07/18 09:35:08 schmonz Exp $
-
-.if ${OPSYS} == "Darwin"
+# $NetBSD: buildlink3.mk,v 1.7 2004/11/26 09:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 DLCOMPAT_BUILDLINK3_MK:=       ${DLCOMPAT_BUILDLINK3_MK}+
@@ -18,5 +16,3 @@
 .endif  # DLCOMPAT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH:S/+$//}
-
-.endif # OPSYS
diff -r 8840613d98a1 -r 77172704f9ad devel/libltdl/Makefile
--- a/devel/libltdl/Makefile    Fri Nov 26 09:32:06 2004 +0000
+++ b/devel/libltdl/Makefile    Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/14 19:03:45 tv Exp $
+# $NetBSD: Makefile,v 1.2 2004/11/26 09:39:30 jlam Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -16,5 +16,5 @@
 CONFIGURE_DIRS=        ${WRKSRC}/libltdl
 BUILD_DIRS=    ${WRKSRC}/libltdl
 
-.include "../../devel/dlcompat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8840613d98a1 -r 77172704f9ad devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Fri Nov 26 09:32:06 2004 +0000
+++ b/devel/libtool-base/Makefile       Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/11/11 22:29:03 tv Exp $
+# $NetBSD: Makefile,v 1.47 2004/11/26 09:39:30 jlam Exp $
 #
 
 .include "../../devel/libtool/Makefile.common"
@@ -54,5 +54,5 @@
 
 BUILDLINK_DEPMETHOD.dlcompat=  build
 
-.include "../../devel/dlcompat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 8840613d98a1 -r 77172704f9ad lang/gauche/Makefile
--- a/lang/gauche/Makefile      Fri Nov 26 09:32:06 2004 +0000
+++ b/lang/gauche/Makefile      Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/10/03 00:15:00 tv Exp $
+# $NetBSD: Makefile,v 1.27 2004/11/26 09:39:30 jlam Exp $
 #
 
 DISTNAME=      Gauche-0.8.1
@@ -32,8 +32,8 @@
 .endif
 
 .include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if !empty(_WITH_ICONV_LIB)
diff -r 8840613d98a1 -r 77172704f9ad lang/gauche/buildlink3.mk
--- a/lang/gauche/buildlink3.mk Fri Nov 26 09:32:06 2004 +0000
+++ b/lang/gauche/buildlink3.mk Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/08/18 13:52:38 minoura Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/11/26 09:39:30 jlam Exp $
 
 BUILDLINK_DEPTH:=      ${BUILDLINK_DEPTH}+
 GAUCHE_BUILDLINK3_MK:= ${GAUCHE_BUILDLINK3_MK}+
@@ -16,7 +16,7 @@
 .endif # GAUCHE_BUILDLINK3_MK
 
 .include "../../devel/boehm-gc/buildlink3.mk"
-.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff -r 8840613d98a1 -r 77172704f9ad lang/gforth/Makefile
--- a/lang/gforth/Makefile      Fri Nov 26 09:32:06 2004 +0000
+++ b/lang/gforth/Makefile      Fri Nov 26 09:39:30 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/10/03 00:15:01 tv Exp $
+# $NetBSD: Makefile,v 1.20 2004/11/26 09:39:30 jlam Exp $
 
 DISTNAME=              gforth-0.6.2
 PKGREVISION=   1
@@ -28,7 +28,7 @@
 KERNEL_FI=     `cd ${WRKSRC} && (${ECHO} 'prkern:'; ${ECHO} '  @${ECHO} $$(kernel_fi)'; ${ECHO}; ${CAT} Makefile) | ${MAKE} -f - prkern`
 
 # XXX Need test.
-#.include "../../devel/dlcompat/buildlink3.mk"
+#.include "../../mk/dlopen.buildlink3.mk"
 
 post-build:
        @${ECHO}; ${ECHO} building PLIST...