From f435776445e223bde685a9f18096324e3bddf642 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Sun, 18 Jul 2004 09:38:26 +0000
Subject: Remove the ${OPSYS} test around inclusion of dlcompat/buildlink3.mk,
 as that test is now done by the buildlink3 file itself.

---
 databases/sqsh/Makefile.common | 7 ++-----
 devel/libtool-base/Makefile    | 7 ++-----
 lang/gauche/Makefile           | 6 ++----
 lang/gforth/Makefile           | 6 ++----
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common
index 86b822b7678..02748ccc8bf 100644
--- a/databases/sqsh/Makefile.common
+++ b/databases/sqsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/05/03 22:46:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/07/18 09:38:26 schmonz Exp $
 
 DISTNAME=	sqsh-2.1-src
 CATEGORIES=	databases
@@ -47,13 +47,10 @@ do-install:
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Darwin"
-.  include "../../devel/dlcompat/buildlink3.mk"
-.endif
-
 .if !defined(USE_SYBASE_OPENCLIENT)
 .  include "../../databases/freetds/buildlink3.mk"
 .endif
 
+.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libtool-base/Makefile b/devel/libtool-base/Makefile
index 76feb0745c2..7e254a1fed8 100644
--- a/devel/libtool-base/Makefile
+++ b/devel/libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/06/17 03:49:15 tv Exp $
+# $NetBSD: Makefile,v 1.38 2004/07/18 09:38:26 schmonz Exp $
 #
 
 PKGNAME=	${DISTNAME:C/-/-base-/}
@@ -49,10 +49,6 @@ CONFIGURE_ENV+=		lt_cv_path_NM="nm -p"
 CONFIGURE_ENV+=		lt_cv_path_NM="nm -B"
 .endif
 
-.if ${OPSYS} == "Darwin"
-.  include "../../devel/dlcompat/buildlink3.mk"
-.endif
-
 BUILD_SHLIBTOOL?=	YES
 
 .PHONY: fix-libtool
@@ -79,4 +75,5 @@ post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool
 .endif
 
+.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 7a84d4a190d..00c6b2ed4e1 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/05/09 14:23:55 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/07/18 09:38:26 schmonz Exp $
 #
 
 DISTNAME=	Gauche-0.7.4.2
@@ -41,10 +41,8 @@ INFO_FILES=		gauche-refe.info gauche-refj.info
 CONFIGURE_ARGS+=	--enable-multibyte=${GAUCHE_MULTIBYTE}
 .endif
 
-.if ${OPSYS} == "Darwin"
-.  include "../../devel/dlcompat/buildlink3.mk"
-.endif
 .include "../../devel/boehm-gc/buildlink3.mk"
+.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
 
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 56bc106d51f..11d10aedd88 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/05/02 04:59:23 snj Exp $
+# $NetBSD: Makefile,v 1.18 2004/07/18 09:38:26 schmonz Exp $
 
 DISTNAME=		gforth-0.6.2
 CATEGORIES=		lang
@@ -27,9 +27,7 @@ TEST_TARGET=	test
 KERNEL_FI=	`cd ${WRKSRC} && (${ECHO} 'prkern:'; ${ECHO} '	@${ECHO} $$(kernel_fi)'; ${ECHO}; ${CAT} Makefile) | ${MAKE} -f - prkern`
 
 # XXX Need test.
-#.if ${OPSYS} == "Darwin"
-#.  include "../../devel/dlcompat/buildlink3.mk"
-#.endif
+#.include "../../devel/dlcompat/buildlink3.mk"
 
 post-build:
 	@${ECHO}; ${ECHO} building PLIST...
-- 
cgit v1.2.3