[pkgsrc/trunk]: pkgsrc Use public SHLIB_TYPE instead of private _OPSYS_SHLIB_...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/039d08d48b9a
branches:  trunk
changeset: 363123:039d08d48b9a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jun 01 13:30:24 2017 +0000

description:
Use public SHLIB_TYPE instead of private _OPSYS_SHLIB_TYPE.

diffstat:

 databases/lua-tokyocabinet/Makefile     |  4 ++--
 databases/mysql-cluster/Makefile.common |  4 ++--
 devel/libzen/Makefile                   |  4 ++--
 emulators/compat_netbsd/Makefile.common |  6 ++----
 lang/clang/Makefile.common              |  4 ++--
 lang/gcc48-libs/Makefile                |  4 ++--
 lang/gcc49-libs/Makefile                |  4 ++--
 lang/gcc5-libs/Makefile                 |  4 ++--
 lang/gcc6-libs/Makefile                 |  4 ++--
 lang/libLLVM/Makefile                   |  4 ++--
 lang/libLLVM34/Makefile                 |  4 ++--
 lang/llvm/Makefile                      |  4 ++--
 lang/oracle-jre8/Makefile               |  4 ++--
 lang/ruby/rubyversion.mk                |  4 ++--
 lang/sun-jre7/Makefile                  |  4 ++--
 mk/emulator/netbsd-compat.mk            |  6 ++----
 mk/pgsql.buildlink3.mk                  |  4 ++--
 multimedia/libhdhomerun/Makefile        |  4 ++--
 multimedia/libmediainfo/Makefile        |  4 ++--
 net/samba/Makefile                      |  4 ++--
 net/samba4/Makefile                     |  4 ++--
 security/cvm/Makefile                   |  4 ++--
 textproc/py-enchant/Makefile            |  4 ++--
 x11/libXvMC/builtin.mk                  |  4 ++--
 24 files changed, 48 insertions(+), 52 deletions(-)

diffs (truncated from 436 to 300 lines):

diff -r 4064f825d838 -r 039d08d48b9a databases/lua-tokyocabinet/Makefile
--- a/databases/lua-tokyocabinet/Makefile       Thu Jun 01 13:30:14 2017 +0000
+++ b/databases/lua-tokyocabinet/Makefile       Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2016/08/20 18:49:33 sevan Exp $
+# $NetBSD: Makefile,v 1.26 2017/06/01 13:30:24 jlam Exp $
 #
 
 DISTNAME=      tokyocabinet-lua-1.10
@@ -27,7 +27,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=                 dylib
 .else
 SOEXT=                 so
diff -r 4064f825d838 -r 039d08d48b9a databases/mysql-cluster/Makefile.common
--- a/databases/mysql-cluster/Makefile.common   Thu Jun 01 13:30:14 2017 +0000
+++ b/databases/mysql-cluster/Makefile.common   Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2017/05/05 16:22:28 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.13 2017/06/01 13:30:24 jlam Exp $
 #
 # used by databases/mysql-cluster/Makefile
 
@@ -120,7 +120,7 @@
 SUBST_SED.fixpaths=    -e "s,${WRAPPER_BINDIR}/gcc,${CCPATH},g"
 SUBST_SED.fixpaths+=   -e "s,${WRAPPER_BINDIR}/g++,${CXXPATH},g"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT="dylib"
 .else
 SOEXT="so"
diff -r 4064f825d838 -r 039d08d48b9a devel/libzen/Makefile
--- a/devel/libzen/Makefile     Thu Jun 01 13:30:14 2017 +0000
+++ b/devel/libzen/Makefile     Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/28 12:31:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/01 13:30:24 jlam Exp $
 
 DISTNAME=      libzen_0.4.31
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -25,7 +25,7 @@
 
 .include "../../mk/bsd.prefs.mk"
 # Enable shared library
-.if empty(_OPSYS_SHLIB_TYPE:Mnone)
+.if empty(SHLIB_TYPE:Mnone)
 CONFIGURE_ARGS+=       --enable-shared
 .endif
 
diff -r 4064f825d838 -r 039d08d48b9a emulators/compat_netbsd/Makefile.common
--- a/emulators/compat_netbsd/Makefile.common   Thu Jun 01 13:30:14 2017 +0000
+++ b/emulators/compat_netbsd/Makefile.common   Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2014/10/05 16:41:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.13 2017/06/01 13:30:25 jlam Exp $
 #
 # Common infrastructure for NetBSD compat* packages.
 #
@@ -98,9 +98,7 @@
 # Directly set NATIVE_EXEC_FMT and include the correct emulator.mk file
 # to define EMUL_EXEC_FMT.
 #
-NATIVE_EXEC_FMT=       ${_NATIVE_EXEC_FMT_cmd:sh}
-_NATIVE_EXEC_FMT_cmd=  sh ${.CURDIR}/../../mk/scripts/shlib-type       \
-                               ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
+NATIVE_EXEC_FMT=       ${SHLIB_TYPE}
 
 .include "${PKGSRCDIR}/emulators/${COMPAT_PKG}/emulator.mk"
 
diff -r 4064f825d838 -r 039d08d48b9a lang/clang/Makefile.common
--- a/lang/clang/Makefile.common        Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/clang/Makefile.common        Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 PLIST_SUBST+=  LLVM_MAJOR=${LLVM_MAJOR}
 
 PLIST_VARS+=   notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=         dylib
 .else
 SOEXT=         so
diff -r 4064f825d838 -r 039d08d48b9a lang/gcc48-libs/Makefile
--- a/lang/gcc48-libs/Makefile  Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/gcc48-libs/Makefile  Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 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 -r 4064f825d838 -r 039d08d48b9a lang/gcc49-libs/Makefile
--- a/lang/gcc49-libs/Makefile  Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/gcc49-libs/Makefile  Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 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 -r 4064f825d838 -r 039d08d48b9a lang/gcc5-libs/Makefile
--- a/lang/gcc5-libs/Makefile   Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/gcc5-libs/Makefile   Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 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 -r 4064f825d838 -r 039d08d48b9a lang/gcc6-libs/Makefile
--- a/lang/gcc6-libs/Makefile   Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/gcc6-libs/Makefile   Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 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 -r 4064f825d838 -r 039d08d48b9a lang/libLLVM/Makefile
--- a/lang/libLLVM/Makefile     Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/libLLVM/Makefile     Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 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 -r 4064f825d838 -r 039d08d48b9a lang/libLLVM34/Makefile
--- a/lang/libLLVM34/Makefile   Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/libLLVM34/Makefile   Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=          SOEXT="dylib"
 .else
 PLIST_SUBST+=          SOEXT="so"
diff -r 4064f825d838 -r 039d08d48b9a lang/llvm/Makefile
--- a/lang/llvm/Makefile        Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/llvm/Makefile        Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 .include "../../mk/bsd.prefs.mk"
 
 PLIST_VARS+=   notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=         dylib
 .else
 SOEXT=         so
diff -r 4064f825d838 -r 039d08d48b9a lang/oracle-jre8/Makefile
--- a/lang/oracle-jre8/Makefile Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/oracle-jre8/Makefile Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 .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 -r 4064f825d838 -r 039d08d48b9a lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/ruby/rubyversion.mk  Thu Jun 01 13:30:24 2017 +0000
@@ -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_SHLIBALIAS=       lib/libruby${_RUBY_SHLIBALIAS}
 .endif
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 RUBY_DLEXT=    bundle
 RUBY_SLEXT=    dylib
 .else
diff -r 4064f825d838 -r 039d08d48b9a lang/sun-jre7/Makefile
--- a/lang/sun-jre7/Makefile    Thu Jun 01 13:30:14 2017 +0000
+++ b/lang/sun-jre7/Makefile    Thu Jun 01 13:30:24 2017 +0000
@@ -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 @@
 .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
diff -r 4064f825d838 -r 039d08d48b9a mk/emulator/netbsd-compat.mk
--- a/mk/emulator/netbsd-compat.mk      Thu Jun 01 13:30:14 2017 +0000
+++ b/mk/emulator/netbsd-compat.mk      Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: netbsd-compat.mk,v 1.5 2015/05/03 15:01:11 spz Exp $
+# $NetBSD: netbsd-compat.mk,v 1.6 2017/06/01 13:30:26 jlam Exp $
 #
 # COMPAT_* for NetBSD -- see options(4).
 #
@@ -11,9 +11,7 @@
 #       The executable format of the native operating system.
 #
 
-NATIVE_EXEC_FMT=       ${_NATIVE_EXEC_FMT_cmd:sh}
-_NATIVE_EXEC_FMT_cmd=  sh ${.CURDIR}/../../mk/scripts/shlib-type       \
-                               ${_OPSYS_SHLIB_TYPE:Q} ${MAKE:Q}
+NATIVE_EXEC_FMT=       ${SHLIB_TYPE}
 
 # Most NetBSD (i386) software need netbsd>=1.6
 .for _version_ in ${EMUL_REQD:Mnetbsd>=*:S/netbsd>=//}
diff -r 4064f825d838 -r 039d08d48b9a mk/pgsql.buildlink3.mk
--- a/mk/pgsql.buildlink3.mk    Thu Jun 01 13:30:14 2017 +0000
+++ b/mk/pgsql.buildlink3.mk    Thu Jun 01 13:30:24 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: pgsql.buildlink3.mk,v 1.44 2017/05/24 19:51:12 adam Exp $
+# $NetBSD: pgsql.buildlink3.mk,v 1.45 2017/06/01 13:30:26 jlam Exp $
 #
 # User-settable variables: