Use public SHLIB_TYPE instead of private _OPSYS_SHLIB_TYPE.

11 files changed, 22 insertions, 22 deletions

diff --git a/lang/clang/Makefile.common b/lang/clang/Makefile.common
index e55ee763f68..8210f56f0d4 100644
--- a/lang/clang/Makefile.common
+++ b/lang/clang/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2017/05/05 22:47:00 kamil Exp $
+# $NetBSD: Makefile.common,v 1.22 2017/06/01 13:30:25 jlam Exp $
 # used by lang/clang/Makefile
 # used by lang/clang-static-analyzer/Makefile
 
@@ -91,7 +91,7 @@ LLVM_MAJOR=	${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 PLIST_SUBST+=	LLVM_MAJOR=${LLVM_MAJOR}
 
 PLIST_VARS+=	notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=		dylib
 .else
 SOEXT=		so
diff --git a/lang/gcc48-libs/Makefile b/lang/gcc48-libs/Makefile
index c15ebab2eb8..f67b2e1bd47 100644
--- a/lang/gcc48-libs/Makefile
+++ b/lang/gcc48-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2017/05/28 01:00:51 maya Exp $
+# $NetBSD: Makefile,v 1.25 2017/06/01 13:30:25 jlam Exp $
 
 GCC_PKGNAME=	gcc48
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -34,7 +34,7 @@ GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
 .include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=	dylib
 .else
 SHLIB_EXT=	so
diff --git a/lang/gcc49-libs/Makefile b/lang/gcc49-libs/Makefile
index 9488e62048f..3c42298d57f 100644
--- a/lang/gcc49-libs/Makefile
+++ b/lang/gcc49-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/05/28 01:42:36 maya Exp $
+# $NetBSD: Makefile,v 1.10 2017/06/01 13:30:25 jlam Exp $
 
 GCC_PKGNAME=	gcc49
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -36,7 +36,7 @@ GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
 .include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=	dylib
 .else
 SHLIB_EXT=	so
diff --git a/lang/gcc5-libs/Makefile b/lang/gcc5-libs/Makefile
index 960167abdd2..4b992fa0ce2 100644
--- a/lang/gcc5-libs/Makefile
+++ b/lang/gcc5-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/05/28 01:36:43 maya Exp $
+# $NetBSD: Makefile,v 1.9 2017/06/01 13:30:25 jlam Exp $
 
 GCC_PKGNAME=	gcc5
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -36,7 +36,7 @@ GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
 .include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=	dylib
 .else
 SHLIB_EXT=	so
diff --git a/lang/gcc6-libs/Makefile b/lang/gcc6-libs/Makefile
index 09245d436cc..e5f6c5ef349 100644
--- a/lang/gcc6-libs/Makefile
+++ b/lang/gcc6-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2017/05/28 01:30:27 maya Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/01 13:30:25 jlam Exp $
 
 GCC_PKGNAME=	gcc6
 .include	"../../lang/${GCC_PKGNAME}/version.mk"
@@ -36,7 +36,7 @@ GCC_TARGET_MACHINE?=	${MACHINE_GNU_PLATFORM}
 BUILD_DEFS+=		GCC_TARGET_MACHINE
 
 .include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SHLIB_EXT=	dylib
 .else
 SHLIB_EXT=	so
diff --git a/lang/libLLVM/Makefile b/lang/libLLVM/Makefile
index 5d58561736e..231e42b64d3 100644
--- a/lang/libLLVM/Makefile
+++ b/lang/libLLVM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2017/05/03 08:38:43 jperkin Exp $
+# $NetBSD: Makefile,v 1.24 2017/06/01 13:30:25 jlam Exp $
 
 DISTNAME=	llvm-4.0.0.src
 PKGNAME=	${DISTNAME:S/llvm/libLLVM/:S/.src//}
@@ -99,7 +99,7 @@ LLVM_MAJOR_MINOR=	${PKGVERSION_NOREV:C/^([0-9]+\.[0-9]+)\..*$/\1/}
 PLIST_SUBST+=		LLVM_MAJOR_MINOR=${LLVM_MAJOR_MINOR}
 
 PLIST_VARS+=	notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=		dylib
 LLVM_LIBNAME=	libLLVM.${SOEXT}
 .else
diff --git a/lang/libLLVM34/Makefile b/lang/libLLVM34/Makefile
index 901a904921b..28ada789a49 100644
--- a/lang/libLLVM34/Makefile
+++ b/lang/libLLVM34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/04/25 22:06:42 tnn Exp $
+# $NetBSD: Makefile,v 1.8 2017/06/01 13:30:25 jlam Exp $
 
 DISTNAME=	llvm-${PKGVERSION_NOREV}.src
 PKGNAME=	libLLVM34-3.4.2
@@ -69,7 +69,7 @@ CWRAPPERS_APPEND.cxx+=	-Wno-error=absolute-value
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=		SOEXT="dylib"
 .else
 PLIST_SUBST+=		SOEXT="so"
diff --git a/lang/llvm/Makefile b/lang/llvm/Makefile
index 986f3e9e234..af408b34e58 100644
--- a/lang/llvm/Makefile
+++ b/lang/llvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2017/05/05 23:13:05 kamil Exp $
+# $NetBSD: Makefile,v 1.23 2017/06/01 13:30:25 jlam Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -77,7 +77,7 @@ SUBST_SED.lto=		-e '/^LLVM/d'
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=	notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=		dylib
 .else
 SOEXT=		so
diff --git a/lang/oracle-jre8/Makefile b/lang/oracle-jre8/Makefile
index 829683108c2..81d112964c8 100644
--- a/lang/oracle-jre8/Makefile
+++ b/lang/oracle-jre8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/09/19 06:57:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/01 13:30:25 jlam Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -85,7 +85,7 @@ FETCH_MESSAGE+=	"	or ${ARCHIVE}"
 .if defined(EMUL_IS_NATIVE) && ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
 .  if ${X11_TYPE} == "native"
 X11_LIBDIR=	${X11BASE}/lib${LIBABISUFFIX}
-.    if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.    if ${SHLIB_TYPE} == "dylib"
 X11_LIB=${X11_LIBDIR}/libX11.dylib
 .    else
 X11_LIB=${X11_LIBDIR}/libX11.so.6
diff --git a/lang/ruby/rubyversion.mk b/lang/ruby/rubyversion.mk
index f833a07a8e3..91056c11fc3 100644
--- a/lang/ruby/rubyversion.mk
+++ b/lang/ruby/rubyversion.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.177 2017/05/30 15:58:16 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.178 2017/06/01 13:30:25 jlam Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -422,7 +422,7 @@ RUBY_STATICLIB=		${RUBY_SUFFIX}${_RUBY_API_MAJOR}${_RUBY_API_MINOR}-static.a
 RUBY_SHLIBALIAS=	lib/libruby${_RUBY_SHLIBALIAS}
 .endif
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 RUBY_DLEXT=	bundle
 RUBY_SLEXT=	dylib
 .else
diff --git a/lang/sun-jre7/Makefile b/lang/sun-jre7/Makefile
index e24661d01f6..15b4c73637b 100644
--- a/lang/sun-jre7/Makefile
+++ b/lang/sun-jre7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/05/08 17:23:29 christos Exp $
+# $NetBSD: Makefile,v 1.26 2017/06/01 13:30:25 jlam Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.sun-jre7+=sun-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -68,7 +68,7 @@ FETCH_MESSAGE+=	"As sun-jre-jce is enabled UnlimitedJCEPolicyJDK7.zip is also ne
 .if defined(EMUL_IS_NATIVE) && ${OPSYS} != "SunOS"
 .  if ${X11_TYPE} == "native"
 X11_LIBDIR=	${X11BASE}/lib${LIBABISUFFIX}
-.    if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.    if ${SHLIB_TYPE} == "dylib"
 X11_LIB=${X11_LIBDIR}/libX11.dylib
 .    else
 X11_LIB=${X11_LIBDIR}/libX11.so.6