summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/lua-tokyocabinet/Makefile4
-rw-r--r--databases/mysql-cluster/Makefile.common4
-rw-r--r--devel/libzen/Makefile4
-rw-r--r--emulators/compat_netbsd/Makefile.common6
-rw-r--r--lang/clang/Makefile.common4
-rw-r--r--lang/gcc48-libs/Makefile4
-rw-r--r--lang/gcc49-libs/Makefile4
-rw-r--r--lang/gcc5-libs/Makefile4
-rw-r--r--lang/gcc6-libs/Makefile4
-rw-r--r--lang/libLLVM/Makefile4
-rw-r--r--lang/libLLVM34/Makefile4
-rw-r--r--lang/llvm/Makefile4
-rw-r--r--lang/oracle-jre8/Makefile4
-rw-r--r--lang/ruby/rubyversion.mk4
-rw-r--r--lang/sun-jre7/Makefile4
-rw-r--r--mk/emulator/netbsd-compat.mk6
-rw-r--r--mk/pgsql.buildlink3.mk4
-rw-r--r--multimedia/libhdhomerun/Makefile4
-rw-r--r--multimedia/libmediainfo/Makefile4
-rw-r--r--net/samba/Makefile4
-rw-r--r--net/samba4/Makefile4
-rw-r--r--security/cvm/Makefile4
-rw-r--r--textproc/py-enchant/Makefile4
-rw-r--r--x11/libXvMC/builtin.mk4
24 files changed, 48 insertions, 52 deletions
diff --git a/databases/lua-tokyocabinet/Makefile b/databases/lua-tokyocabinet/Makefile
index 8e7b7b8ea44..82cdad45fa9 100644
--- a/databases/lua-tokyocabinet/Makefile
+++ b/databases/lua-tokyocabinet/Makefile
@@ -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.tokyocabinet}/include
.include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
SOEXT= dylib
.else
SOEXT= so
diff --git a/databases/mysql-cluster/Makefile.common b/databases/mysql-cluster/Makefile.common
index a710d5dffba..006a84f0db4 100644
--- a/databases/mysql-cluster/Makefile.common
+++ b/databases/mysql-cluster/Makefile.common
@@ -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}${PREFIX}/share/doc/mysql/INFO_BIN
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 --git a/devel/libzen/Makefile b/devel/libzen/Makefile
index 88ebd892e70..4def7310d89 100644
--- a/devel/libzen/Makefile
+++ b/devel/libzen/Makefile
@@ -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
diff --git a/emulators/compat_netbsd/Makefile.common b/emulators/compat_netbsd/Makefile.common
index 824934b0500..2c0e29b502a 100644
--- a/emulators/compat_netbsd/Makefile.common
+++ b/emulators/compat_netbsd/Makefile.common
@@ -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"
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
diff --git a/mk/emulator/netbsd-compat.mk b/mk/emulator/netbsd-compat.mk
index da458d1d7b2..fc333eb97b8 100644
--- a/mk/emulator/netbsd-compat.mk
+++ b/mk/emulator/netbsd-compat.mk
@@ -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 --git a/mk/pgsql.buildlink3.mk b/mk/pgsql.buildlink3.mk
index 386a273991e..f6f61eb7d1d 100644
--- a/mk/pgsql.buildlink3.mk
+++ b/mk/pgsql.buildlink3.mk
@@ -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
diff --git a/multimedia/libhdhomerun/Makefile b/multimedia/libhdhomerun/Makefile
index e490e463932..209cbe61679 100644
--- a/multimedia/libhdhomerun/Makefile
+++ b/multimedia/libhdhomerun/Makefile
@@ -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/hdhomerun
.include "../../mk/bsd.prefs.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
SHLIBEXT= dylib
.else
SHLIBEXT= so
diff --git a/multimedia/libmediainfo/Makefile b/multimedia/libmediainfo/Makefile
index 8a2aa5eb3d1..c6cba9d17ff 100644
--- a/multimedia/libmediainfo/Makefile
+++ b/multimedia/libmediainfo/Makefile
@@ -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/Project/GNU/Library/libmediainfo.pc.in
.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 --git a/net/samba/Makefile b/net/samba/Makefile
index de4f13ccc40..c988445a024 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -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=no
.include "../../net/samba/options.mk"
-.if ${_OPSYS_SHLIB_TYPE} == "dylib"
+.if ${SHLIB_TYPE} == "dylib"
PLIST_SUBST+= LIBEXT=dylib
SAMBA_LIBEXT= dylib
.else
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 27b96a8f406..9e08d1a63e7 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -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
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index 8e7cbad2276..52802128f4b 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -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
diff --git a/textproc/py-enchant/Makefile b/textproc/py-enchant/Makefile
index a24b38650b3..dd3fd83753f 100644
--- a/textproc/py-enchant/Makefile
+++ b/textproc/py-enchant/Makefile
@@ -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.
diff --git a/x11/libXvMC/builtin.mk b/x11/libXvMC/builtin.mk
index 9a4cd5900a0..806fd91599c 100644
--- a/x11/libXvMC/builtin.mk
+++ b/x11/libXvMC/builtin.mk
@@ -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
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-11 14:23:28 +0000