[pkgsrc/trunk]: pkgsrc Remove the ${OPSYS} test around inclusion of dlcompat/...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90d08b128930
branches:  trunk
changeset: 478141:90d08b128930
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Jul 18 09:38:26 2004 +0000

description:
Remove the ${OPSYS} test around inclusion of dlcompat/buildlink3.mk,
as that test is now done by the buildlink3 file itself.

diffstat:

 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(-)

diffs (91 lines):

diff -r 6720ae3f8f70 -r 90d08b128930 databases/sqsh/Makefile.common
--- a/databases/sqsh/Makefile.common    Sun Jul 18 09:35:08 2004 +0000
+++ b/databases/sqsh/Makefile.common    Sun Jul 18 09:38:26 2004 +0000
@@ -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 @@
 
 .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 -r 6720ae3f8f70 -r 90d08b128930 devel/libtool-base/Makefile
--- a/devel/libtool-base/Makefile       Sun Jul 18 09:35:08 2004 +0000
+++ b/devel/libtool-base/Makefile       Sun Jul 18 09:38:26 2004 +0000
@@ -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 -B"
 .endif
 
-.if ${OPSYS} == "Darwin"
-.  include "../../devel/dlcompat/buildlink3.mk"
-.endif
-
 BUILD_SHLIBTOOL?=      YES
 
 .PHONY: fix-libtool
@@ -79,4 +75,5 @@
        ${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${PREFIX}/bin/shlibtool
 .endif
 
+.include "../../devel/dlcompat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6720ae3f8f70 -r 90d08b128930 lang/gauche/Makefile
--- a/lang/gauche/Makefile      Sun Jul 18 09:35:08 2004 +0000
+++ b/lang/gauche/Makefile      Sun Jul 18 09:38:26 2004 +0000
@@ -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 @@
 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 -r 6720ae3f8f70 -r 90d08b128930 lang/gforth/Makefile
--- a/lang/gforth/Makefile      Sun Jul 18 09:35:08 2004 +0000
+++ b/lang/gforth/Makefile      Sun Jul 18 09:38:26 2004 +0000
@@ -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 @@
 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...