CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Johnny C. Lam" <jlam%netbsd.org@localhost>
Date: Thu, 1 Jun 2017 13:30:27 +0000

Module Name:    pkgsrc
Committed By:   jlam
Date:           Thu Jun  1 13:30:26 UTC 2017

Modified Files:
        pkgsrc/databases/lua-tokyocabinet: Makefile
        pkgsrc/databases/mysql-cluster: Makefile.common
        pkgsrc/devel/libzen: Makefile
        pkgsrc/emulators/compat_netbsd: Makefile.common
        pkgsrc/lang/clang: Makefile.common
        pkgsrc/lang/gcc48-libs: Makefile
        pkgsrc/lang/gcc49-libs: Makefile
        pkgsrc/lang/gcc5-libs: Makefile
        pkgsrc/lang/gcc6-libs: Makefile
        pkgsrc/lang/libLLVM: Makefile
        pkgsrc/lang/libLLVM34: Makefile
        pkgsrc/lang/llvm: Makefile
        pkgsrc/lang/oracle-jre8: Makefile
        pkgsrc/lang/ruby: rubyversion.mk
        pkgsrc/lang/sun-jre7: Makefile
        pkgsrc/mk: pgsql.buildlink3.mk
        pkgsrc/mk/emulator: netbsd-compat.mk
        pkgsrc/multimedia/libhdhomerun: Makefile
        pkgsrc/multimedia/libmediainfo: Makefile
        pkgsrc/net/samba: Makefile
        pkgsrc/net/samba4: Makefile
        pkgsrc/security/cvm: Makefile
        pkgsrc/textproc/py-enchant: Makefile
        pkgsrc/x11/libXvMC: builtin.mk

Log Message:
Use public SHLIB_TYPE instead of private _OPSYS_SHLIB_TYPE.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/databases/lua-tokyocabinet/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/databases/mysql-cluster/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/libzen/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/compat_netbsd/Makefile.common
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/clang/Makefile.common
cvs rdiff -u -r1.24 -r1.25 pkgsrc/lang/gcc48-libs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/gcc49-libs/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/lang/gcc5-libs/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/gcc6-libs/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/lang/libLLVM/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/libLLVM34/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/oracle-jre8/Makefile
cvs rdiff -u -r1.177 -r1.178 pkgsrc/lang/ruby/rubyversion.mk
cvs rdiff -u -r1.25 -r1.26 pkgsrc/lang/sun-jre7/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/mk/pgsql.buildlink3.mk
cvs rdiff -u -r1.5 -r1.6 pkgsrc/mk/emulator/netbsd-compat.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/libhdhomerun/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/multimedia/libmediainfo/Makefile
cvs rdiff -u -r1.261 -r1.262 pkgsrc/net/samba/Makefile
cvs rdiff -u -r1.31 -r1.32 pkgsrc/net/samba4/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/cvm/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/textproc/py-enchant/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/libXvMC/builtin.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/lua-tokyocabinet/Makefile
diff -u pkgsrc/databases/lua-tokyocabinet/Makefile:1.25 pkgsrc/databases/lua-tokyocabinet/Makefile:1.26
--- pkgsrc/databases/lua-tokyocabinet/Makefile:1.25     Sat Aug 20 18:49:33 2016
+++ pkgsrc/databases/lua-tokyocabinet/Makefile  Thu Jun  1 13:30:24 2017
@@ -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 @@ MAKE_ENV+=    INCLUDEDIR=${BUILDLINK_PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=                 dylib
 .else
 SOEXT=                 so

Index: pkgsrc/databases/mysql-cluster/Makefile.common
diff -u pkgsrc/databases/mysql-cluster/Makefile.common:1.12 pkgsrc/databases/mysql-cluster/Makefile.common:1.13
--- pkgsrc/databases/mysql-cluster/Makefile.common:1.12 Fri May  5 16:22:28 2017
+++ pkgsrc/databases/mysql-cluster/Makefile.common      Thu Jun  1 13:30:24 2017
@@ -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_FILES.fixpaths+=      ${DESTDIR}${PREFI
 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"

Index: pkgsrc/devel/libzen/Makefile
diff -u pkgsrc/devel/libzen/Makefile:1.3 pkgsrc/devel/libzen/Makefile:1.4
--- pkgsrc/devel/libzen/Makefile:1.3    Tue Jul 28 12:31:03 2015
+++ pkgsrc/devel/libzen/Makefile        Thu Jun  1 13:30:24 2017
@@ -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 @@ CONFIGURE_DIRS+=      Project/GNU/Library
 
 .include "../../mk/bsd.prefs.mk"
 # Enable shared library
-.if empty(_OPSYS_SHLIB_TYPE:Mnone)
+.if empty(SHLIB_TYPE:Mnone)
 CONFIGURE_ARGS+=       --enable-shared
 .endif
 

Index: pkgsrc/emulators/compat_netbsd/Makefile.common
diff -u pkgsrc/emulators/compat_netbsd/Makefile.common:1.12 pkgsrc/emulators/compat_netbsd/Makefile.common:1.13
--- pkgsrc/emulators/compat_netbsd/Makefile.common:1.12 Sun Oct  5 16:41:06 2014
+++ pkgsrc/emulators/compat_netbsd/Makefile.common      Thu Jun  1 13:30:25 2017
@@ -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 @@ PLIST_SRC+=           ${PKGDIR}/PLIST
 # 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"
 

Index: pkgsrc/lang/clang/Makefile.common
diff -u pkgsrc/lang/clang/Makefile.common:1.21 pkgsrc/lang/clang/Makefile.common:1.22
--- pkgsrc/lang/clang/Makefile.common:1.21      Fri May  5 22:47:00 2017
+++ pkgsrc/lang/clang/Makefile.common   Thu Jun  1 13:30:25 2017
@@ -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]
 PLIST_SUBST+=  LLVM_MAJOR=${LLVM_MAJOR}
 
 PLIST_VARS+=   notdylib
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SOEXT=         dylib
 .else
 SOEXT=         so

Index: pkgsrc/lang/gcc48-libs/Makefile
diff -u pkgsrc/lang/gcc48-libs/Makefile:1.24 pkgsrc/lang/gcc48-libs/Makefile:1.25
--- pkgsrc/lang/gcc48-libs/Makefile:1.24        Sun May 28 01:00:51 2017
+++ pkgsrc/lang/gcc48-libs/Makefile     Thu Jun  1 13:30:25 2017
@@ -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_PLATF
 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

Index: pkgsrc/lang/gcc49-libs/Makefile
diff -u pkgsrc/lang/gcc49-libs/Makefile:1.9 pkgsrc/lang/gcc49-libs/Makefile:1.10
--- pkgsrc/lang/gcc49-libs/Makefile:1.9 Sun May 28 01:42:36 2017
+++ pkgsrc/lang/gcc49-libs/Makefile     Thu Jun  1 13:30:25 2017
@@ -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_PLATF
 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

Index: pkgsrc/lang/gcc5-libs/Makefile
diff -u pkgsrc/lang/gcc5-libs/Makefile:1.8 pkgsrc/lang/gcc5-libs/Makefile:1.9
--- pkgsrc/lang/gcc5-libs/Makefile:1.8  Sun May 28 01:36:43 2017
+++ pkgsrc/lang/gcc5-libs/Makefile      Thu Jun  1 13:30:25 2017
@@ -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_PLATF
 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

Index: pkgsrc/lang/gcc6-libs/Makefile
diff -u pkgsrc/lang/gcc6-libs/Makefile:1.2 pkgsrc/lang/gcc6-libs/Makefile:1.3
--- pkgsrc/lang/gcc6-libs/Makefile:1.2  Sun May 28 01:30:27 2017
+++ pkgsrc/lang/gcc6-libs/Makefile      Thu Jun  1 13:30:25 2017
@@ -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_PLATF
 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

Index: pkgsrc/lang/libLLVM/Makefile
diff -u pkgsrc/lang/libLLVM/Makefile:1.23 pkgsrc/lang/libLLVM/Makefile:1.24
--- pkgsrc/lang/libLLVM/Makefile:1.23   Wed May  3 08:38:43 2017
+++ pkgsrc/lang/libLLVM/Makefile        Thu Jun  1 13:30:25 2017
@@ -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/^
 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

Index: pkgsrc/lang/libLLVM34/Makefile
diff -u pkgsrc/lang/libLLVM34/Makefile:1.7 pkgsrc/lang/libLLVM34/Makefile:1.8
--- pkgsrc/lang/libLLVM34/Makefile:1.7  Sat Apr 25 22:06:42 2015
+++ pkgsrc/lang/libLLVM34/Makefile      Thu Jun  1 13:30:25 2017
@@ -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=absolu
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=          SOEXT="dylib"
 .else
 PLIST_SUBST+=          SOEXT="so"

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.22 pkgsrc/lang/llvm/Makefile:1.23
--- pkgsrc/lang/llvm/Makefile:1.22      Fri May  5 23:13:05 2017
+++ pkgsrc/lang/llvm/Makefile   Thu Jun  1 13:30:25 2017
@@ -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

Index: pkgsrc/lang/oracle-jre8/Makefile
diff -u pkgsrc/lang/oracle-jre8/Makefile:1.3 pkgsrc/lang/oracle-jre8/Makefile:1.4
--- pkgsrc/lang/oracle-jre8/Makefile:1.3        Mon Sep 19 06:57:49 2016
+++ pkgsrc/lang/oracle-jre8/Makefile    Thu Jun  1 13:30:25 2017
@@ -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

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.177 pkgsrc/lang/ruby/rubyversion.mk:1.178
--- pkgsrc/lang/ruby/rubyversion.mk:1.177       Tue May 30 15:58:16 2017
+++ pkgsrc/lang/ruby/rubyversion.mk     Thu Jun  1 13:30:25 2017
@@ -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_A
 RUBY_SHLIBALIAS=       lib/libruby${_RUBY_SHLIBALIAS}
 .endif
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 RUBY_DLEXT=    bundle
 RUBY_SLEXT=    dylib
 .else

Index: pkgsrc/lang/sun-jre7/Makefile
diff -u pkgsrc/lang/sun-jre7/Makefile:1.25 pkgsrc/lang/sun-jre7/Makefile:1.26
--- pkgsrc/lang/sun-jre7/Makefile:1.25  Sun May  8 17:23:29 2016
+++ pkgsrc/lang/sun-jre7/Makefile       Thu Jun  1 13:30:25 2017
@@ -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 enabl
 .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

Index: pkgsrc/mk/pgsql.buildlink3.mk
diff -u pkgsrc/mk/pgsql.buildlink3.mk:1.44 pkgsrc/mk/pgsql.buildlink3.mk:1.45
--- pkgsrc/mk/pgsql.buildlink3.mk:1.44  Wed May 24 19:51:12 2017
+++ pkgsrc/mk/pgsql.buildlink3.mk       Thu Jun  1 13:30:26 2017
@@ -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:
 #
@@ -32,7 +32,7 @@ PGSQL_VERSIONS_ACCEPTED?=     96 95 94 93 92
 _PGSQL_VERSION_${pv}_OK=       yes
 .endfor
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PG_LIB_EXT=dylib
 .else
 PG_LIB_EXT=so

Index: pkgsrc/mk/emulator/netbsd-compat.mk
diff -u pkgsrc/mk/emulator/netbsd-compat.mk:1.5 pkgsrc/mk/emulator/netbsd-compat.mk:1.6
--- pkgsrc/mk/emulator/netbsd-compat.mk:1.5     Sun May  3 15:01:11 2015
+++ pkgsrc/mk/emulator/netbsd-compat.mk Thu Jun  1 13:30:26 2017
@@ -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>=//}

Index: pkgsrc/multimedia/libhdhomerun/Makefile
diff -u pkgsrc/multimedia/libhdhomerun/Makefile:1.4 pkgsrc/multimedia/libhdhomerun/Makefile:1.5
--- pkgsrc/multimedia/libhdhomerun/Makefile:1.4 Thu Aug 20 12:13:30 2015
+++ pkgsrc/multimedia/libhdhomerun/Makefile     Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/08/20 12:13:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.5 2017/06/01 13:30:26 jlam Exp $
 
 DISTNAME=      libhdhomerun_20140121
 PKGNAME=       ${DISTNAME:S/_/-/}
@@ -20,7 +20,7 @@ INSTALLATION_DIRS=    bin lib include/hdhom
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 SHLIBEXT=      dylib
 .else
 SHLIBEXT=      so

Index: pkgsrc/multimedia/libmediainfo/Makefile
diff -u pkgsrc/multimedia/libmediainfo/Makefile:1.5 pkgsrc/multimedia/libmediainfo/Makefile:1.6
--- pkgsrc/multimedia/libmediainfo/Makefile:1.5 Mon Sep  7 01:02:00 2015
+++ pkgsrc/multimedia/libmediainfo/Makefile     Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/09/07 01:02:00 dsainty Exp $
+# $NetBSD: Makefile,v 1.6 2017/06/01 13:30:26 jlam Exp $
 
 .include "../../multimedia/mediainfo/Makefile.common"
 
@@ -20,7 +20,7 @@ PKGCONFIG_OVERRIDE+=  MediaInfoLib/Projec
 
 .include "../../mk/bsd.prefs.mk"
 # Enable shared library
-.if empty(_OPSYS_SHLIB_TYPE:Mnone)
+.if empty(SHLIB_TYPE:Mnone)
 CONFIGURE_ARGS+=       --enable-shared
 .endif
 

Index: pkgsrc/net/samba/Makefile
diff -u pkgsrc/net/samba/Makefile:1.261 pkgsrc/net/samba/Makefile:1.262
--- pkgsrc/net/samba/Makefile:1.261     Wed May 24 15:36:42 2017
+++ pkgsrc/net/samba/Makefile   Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.261 2017/05/24 15:36:42 he Exp $
+# $NetBSD: Makefile,v 1.262 2017/06/01 13:30:26 jlam Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -75,7 +75,7 @@ CONFIGURE_ARGS+=      --enable-merged-build=n
 
 .include "../../net/samba/options.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=  LIBEXT=dylib
 SAMBA_LIBEXT=  dylib
 .else

Index: pkgsrc/net/samba4/Makefile
diff -u pkgsrc/net/samba4/Makefile:1.31 pkgsrc/net/samba4/Makefile:1.32
--- pkgsrc/net/samba4/Makefile:1.31     Mon May 29 00:24:19 2017
+++ pkgsrc/net/samba4/Makefile  Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2017/05/29 00:24:19 wiedi Exp $
+# $NetBSD: Makefile,v 1.32 2017/06/01 13:30:26 jlam Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -119,7 +119,7 @@ PLIST_VARS+=                macosx
 PLIST.macosx=          yes
 .endif
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 PLIST_SUBST+=  LIBEXT=dylib
 SAMBA_LIBEXT=  dylib
 .else

Index: pkgsrc/security/cvm/Makefile
diff -u pkgsrc/security/cvm/Makefile:1.20 pkgsrc/security/cvm/Makefile:1.21
--- pkgsrc/security/cvm/Makefile:1.20   Mon Jan  2 02:20:08 2017
+++ pkgsrc/security/cvm/Makefile        Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2017/01/02 02:20:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.21 2017/06/01 13:30:26 jlam Exp $
 #
 
 DISTNAME=              cvm-0.97
@@ -45,7 +45,7 @@ DJB_CONFIG_CMDS=                                                      \
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 CVM_LIB_EXT=dylib
 .else
 CVM_LIB_EXT=so

Index: pkgsrc/textproc/py-enchant/Makefile
diff -u pkgsrc/textproc/py-enchant/Makefile:1.13 pkgsrc/textproc/py-enchant/Makefile:1.14
--- pkgsrc/textproc/py-enchant/Makefile:1.13    Wed Jun  8 17:43:40 2016
+++ pkgsrc/textproc/py-enchant/Makefile Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2016/06/08 17:43:40 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2017/06/01 13:30:26 jlam Exp $
 
 DISTNAME=      pyenchant-1.6.6
 PKGNAME=       ${DISTNAME:S/py/${PYPKGPREFIX}-/}
@@ -19,7 +19,7 @@ USE_LANGUAGES=        # empty
 .include "../../mk/bsd.prefs.mk"
 
 DLEXT.dylib=   dylib
-DLEXT=         ${DLEXT.${_OPSYS_SHLIB_TYPE}:Uso}
+DLEXT=         ${DLEXT.${SHLIB_TYPE}:Uso}
 PYENCHANT_LIBRARY_PATH=        ${LOCALBASE}/lib/libenchant.${DLEXT}
 
 # fix the path of libenchant with patch-ab.

Index: pkgsrc/x11/libXvMC/builtin.mk
diff -u pkgsrc/x11/libXvMC/builtin.mk:1.2 pkgsrc/x11/libXvMC/builtin.mk:1.3
--- pkgsrc/x11/libXvMC/builtin.mk:1.2   Mon Mar 10 11:05:53 2014
+++ pkgsrc/x11/libXvMC/builtin.mk       Thu Jun  1 13:30:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.2 2014/03/10 11:05:53 jperkin Exp $
+# $NetBSD: builtin.mk,v 1.3 2017/06/01 13:30:26 jlam Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -7,7 +7,7 @@ BUILTIN_PKG:=   libXvMC
 BUILTIN_FIND_FILES_VAR:=       PC_LIBXVMC LIB_XVMCW
 BUILTIN_FIND_FILES.PC_LIBXVMC= ${X11BASE}/lib/pkgconfig/xvmc.pc
 BUILTIN_FIND_FILES.PC_LIBXVMC+=        ${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xvmc.pc
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
 BUILTIN_FIND_FILES.LIB_XVMCW=  ${X11BASE}/lib/libXvMCW.dylib
 .else
 BUILTIN_FIND_FILES.LIB_XVMCW=  ${X11BASE}/lib/libXvMCW.so

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc
Indexes:

Home | Main Index | Thread Index | Old Index