libretro-*: Support Darwin by cargo-culting SOEXT. Remove bsdtar hack.

84 files changed, 322 insertions, 160 deletions

diff --git a/emulators/libretro-beetle-ngp/Makefile b/emulators/libretro-beetle-ngp/Makefile
index 0639c1f745a..e869f579181 100644
--- a/emulators/libretro-beetle-ngp/Makefile
+++ b/emulators/libretro-beetle-ngp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/25 21:37:41 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-beetle-ngp-20190203
 CATEGORIES=	emulators
@@ -15,6 +15,11 @@ USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++03
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/emulators/libretro-beetle-ngp/PLIST b/emulators/libretro-beetle-ngp/PLIST
index 579c51b3748..3ca84fae7ac 100644
--- a/emulators/libretro-beetle-ngp/PLIST
+++ b/emulators/libretro-beetle-ngp/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 00:32:25 nia Exp $
-lib/libretro/mednafen_ngp_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_ngp_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-pce-fast/Makefile b/emulators/libretro-beetle-pce-fast/Makefile
index a9f58a0c162..e4adb60aa6d 100644
--- a/emulators/libretro-beetle-pce-fast/Makefile
+++ b/emulators/libretro-beetle-pce-fast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:28 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-beetle-pce-fast-20180720
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/beetle_pce_fast/
 COMMENT=	Libretro core based on the Mednafen PC Engine emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=link.T
diff --git a/emulators/libretro-beetle-pce-fast/PLIST b/emulators/libretro-beetle-pce-fast/PLIST
index 154c1959f99..6e3759bd5fa 100644
--- a/emulators/libretro-beetle-pce-fast/PLIST
+++ b/emulators/libretro-beetle-pce-fast/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/10 23:16:12 nia Exp $
-lib/libretro/mednafen_pce_fast_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_pce_fast_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-psx-hw/PLIST b/emulators/libretro-beetle-psx-hw/PLIST
index 8863cfc196e..1fa2f7cb201 100644
--- a/emulators/libretro-beetle-psx-hw/PLIST
+++ b/emulators/libretro-beetle-psx-hw/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/18 15:50:48 nia Exp $
-lib/libretro/mednafen_psx_hw_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_psx_hw_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-psx/PLIST b/emulators/libretro-beetle-psx/PLIST
index e1ba98e90b6..20cca1deb4c 100644
--- a/emulators/libretro-beetle-psx/PLIST
+++ b/emulators/libretro-beetle-psx/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 00:19:58 nia Exp $
-lib/libretro/mednafen_psx_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_psx_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-saturn/Makefile b/emulators/libretro-beetle-saturn/Makefile
index be62df29601..ff7d881fe3f 100644
--- a/emulators/libretro-beetle-saturn/Makefile
+++ b/emulators/libretro-beetle-saturn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-beetle-saturn-20180620
 PKGREVISION=	1
@@ -12,10 +12,14 @@ HOMEPAGE=	https://docs.libretro.com/library/beetle_saturn/
 COMMENT=	Libretro core based on the Mednafen Sega Saturn emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 # "experimental, x86_64 only" - https://mednafen.github.io/
diff --git a/emulators/libretro-beetle-saturn/PLIST b/emulators/libretro-beetle-saturn/PLIST
index 8eba9b70600..c917dfbaa3e 100644
--- a/emulators/libretro-beetle-saturn/PLIST
+++ b/emulators/libretro-beetle-saturn/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/12 13:22:43 nia Exp $
-lib/libretro/mednafen_saturn_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_saturn_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-sgx/Makefile b/emulators/libretro-beetle-sgx/Makefile
index c4fac3f2f0a..e5be16ccfdc 100644
--- a/emulators/libretro-beetle-sgx/Makefile
+++ b/emulators/libretro-beetle-sgx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-beetle-sgx-20180512
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/beetle_sgx/
 COMMENT=	Libretro core based on the Mednafen SuperGrafx emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-beetle-sgx/PLIST b/emulators/libretro-beetle-sgx/PLIST
index 28c0dbbc3b6..31bafe8a866 100644
--- a/emulators/libretro-beetle-sgx/PLIST
+++ b/emulators/libretro-beetle-sgx/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 00:54:25 nia Exp $
-lib/libretro/mednafen_supergrafx_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/mednafen_supergrafx_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-vb/Makefile b/emulators/libretro-beetle-vb/Makefile
index 63397a74453..ddd44fb2385 100644
--- a/emulators/libretro-beetle-vb/Makefile
+++ b/emulators/libretro-beetle-vb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:13 nia Exp $
 
 DISTNAME=	libretro-beetle-vb-20180620
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/beetle_vb/
 COMMENT=	Libretro core based on the Mednafen VirtualBoy emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-beetle-vb/PLIST b/emulators/libretro-beetle-vb/PLIST
index 781a5bfe103..2ee7495f91f 100644
--- a/emulators/libretro-beetle-vb/PLIST
+++ b/emulators/libretro-beetle-vb/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/12 14:36:52 nia Exp $
-lib/libretro/mednafen_vb_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/mednafen_vb_libretro.${SOEXT}
diff --git a/emulators/libretro-beetle-wswan/Makefile b/emulators/libretro-beetle-wswan/Makefile
index 28b7685f9e6..efa87a2b142 100644
--- a/emulators/libretro-beetle-wswan/Makefile
+++ b/emulators/libretro-beetle-wswan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/05/09 16:27:55 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:13 nia Exp $
 
 DISTNAME=	libretro-beetle-wswan-20190402
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/beetle_cygne/
 COMMENT=	Libretro core based on the Mednafen Wonderswan emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-beetle-wswan/PLIST b/emulators/libretro-beetle-wswan/PLIST
index 8b2d1cc0e15..19588b0072c 100644
--- a/emulators/libretro-beetle-wswan/PLIST
+++ b/emulators/libretro-beetle-wswan/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/12 12:52:52 nia Exp $
-lib/libretro/mednafen_wswan_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/mednafen_wswan_libretro.${SOEXT}
diff --git a/emulators/libretro-bluemsx/Makefile b/emulators/libretro-bluemsx/Makefile
index 7f0bd9632c6..de872c86fa2 100644
--- a/emulators/libretro-bluemsx/Makefile
+++ b/emulators/libretro-bluemsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/04/25 13:46:11 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:13 nia Exp $
 
 DISTNAME=	libretro-bluemsx-20190420
 CATEGORIES=	emulators
@@ -11,11 +11,15 @@ HOMEPAGE=	https://docs.libretro.com/library/bluemsx/
 COMMENT=	Libretro core for MSX/MSX2/ColecoVision/SVI/SG-1000 emulation
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++03
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/libretro-bluemsx/PLIST b/emulators/libretro-bluemsx/PLIST
index 32da47b834c..e98689481e9 100644
--- a/emulators/libretro-bluemsx/PLIST
+++ b/emulators/libretro-bluemsx/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 16:34:07 nia Exp $
-lib/libretro/bluemsx_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/bluemsx_libretro.${SOEXT}
diff --git a/emulators/libretro-bsnes-mercury-accuracy/PLIST b/emulators/libretro-bsnes-mercury-accuracy/PLIST
index 39935ba5e0f..e72f7793337 100644
--- a/emulators/libretro-bsnes-mercury-accuracy/PLIST
+++ b/emulators/libretro-bsnes-mercury-accuracy/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 14:37:25 nia Exp $
-lib/libretro/bsnes_mercury_accuracy_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/bsnes_mercury_accuracy_libretro.${SOEXT}
diff --git a/emulators/libretro-bsnes-mercury-performance/PLIST b/emulators/libretro-bsnes-mercury-performance/PLIST
index 3be766b0d5b..4d49ee2c475 100644
--- a/emulators/libretro-bsnes-mercury-performance/PLIST
+++ b/emulators/libretro-bsnes-mercury-performance/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 14:37:25 nia Exp $
-lib/libretro/bsnes_mercury_performance_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/bsnes_mercury_performance_libretro.${SOEXT}
diff --git a/emulators/libretro-bsnes-mercury/Makefile.common b/emulators/libretro-bsnes-mercury/Makefile.common
index 4112ce5893b..14f82f5dc49 100644
--- a/emulators/libretro-bsnes-mercury/Makefile.common
+++ b/emulators/libretro-bsnes-mercury/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2019/05/18 09:42:03 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2020/05/26 09:45:13 nia Exp $
 #
 # used by emulators/libretro-bsnes-mercury/Makefile
 # used by emulators/libretro-bsnes-mercury-accuracy/Makefile
@@ -15,10 +15,14 @@ LICENSE=	gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c gnu++11
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	profile=${BSNES_PROFILE}
 MAKE_FLAGS+=	compiler=${CXX:Q}
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
diff --git a/emulators/libretro-bsnes-mercury/PLIST b/emulators/libretro-bsnes-mercury/PLIST
index 5f683e03704..6f80bac6695 100644
--- a/emulators/libretro-bsnes-mercury/PLIST
+++ b/emulators/libretro-bsnes-mercury/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 14:37:25 nia Exp $
-lib/libretro/bsnes_mercury_balanced_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/bsnes_mercury_balanced_libretro.${SOEXT}
diff --git a/emulators/libretro-cap32/Makefile b/emulators/libretro-cap32/Makefile
index 8814852a292..72bf8577514 100644
--- a/emulators/libretro-cap32/Makefile
+++ b/emulators/libretro-cap32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/02/01 10:11:03 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:13 nia Exp $
 
 DISTNAME=	libretro-cap32-20190128
 CATEGORIES=	emulators
@@ -10,10 +10,14 @@ HOMEPAGE=	https://docs.libretro.com/library/caprice32/
 COMMENT=	Libretro core based on the Caprice32 Amstrad CPC emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c99
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/emulators/libretro-cap32/PLIST b/emulators/libretro-cap32/PLIST
index bef45e012db..e3da8820a81 100644
--- a/emulators/libretro-cap32/PLIST
+++ b/emulators/libretro-cap32/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/13 17:58:08 nia Exp $
-lib/libretro/cap32_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:13 nia Exp $
+lib/libretro/cap32_libretro.${SOEXT}
diff --git a/emulators/libretro-core-info/Makefile b/emulators/libretro-core-info/Makefile
index ad110262e59..8cbb2640b81 100644
--- a/emulators/libretro-core-info/Makefile
+++ b/emulators/libretro-core-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/05/08 12:40:05 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:13 nia Exp $
 
 DISTNAME=	libretro-core-info-${RETROARCH_VERSION}
 CATEGORIES=	emulators
@@ -10,7 +10,6 @@ HOMEPAGE=	https://www.libretro.com/
 COMMENT=	Libretro core information
 LICENSE=	public-domain
 
-EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
 
diff --git a/emulators/libretro-database/Makefile b/emulators/libretro-database/Makefile
index 59538307a87..c8781c53355 100644
--- a/emulators/libretro-database/Makefile
+++ b/emulators/libretro-database/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/09/06 09:33:38 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-database-20180904
 CATEGORIES=	emulators
@@ -11,7 +11,6 @@ HOMEPAGE=	https://www.libretro.com/
 COMMENT=	ROM scanning data provided by the libretro project
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
 
diff --git a/emulators/libretro-desmume/Makefile b/emulators/libretro-desmume/Makefile
index 387edea7d57..ee65c139ab4 100644
--- a/emulators/libretro-desmume/Makefile
+++ b/emulators/libretro-desmume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/05/20 10:32:32 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-desmume-20190426
 PKGREVISION=	2
@@ -12,12 +12,16 @@ HOMEPAGE=	https://docs.libretro.com/library/desmume/
 COMMENT=	Libretro core based on the DeSmuME Nintendo DS emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 BUILD_DIRS=	desmume/src/frontend/libretro
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c99 gnu++11
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_ARCH:M*arm*)
diff --git a/emulators/libretro-desmume/PLIST b/emulators/libretro-desmume/PLIST
index b96813621cb..c3ac4968a06 100644
--- a/emulators/libretro-desmume/PLIST
+++ b/emulators/libretro-desmume/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 12:57:23 nia Exp $
-lib/libretro/desmume_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/desmume_libretro.${SOEXT}
diff --git a/emulators/libretro-dolphin/Makefile b/emulators/libretro-dolphin/Makefile
index 5754dcec175..34747efabab 100644
--- a/emulators/libretro-dolphin/Makefile
+++ b/emulators/libretro-dolphin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2020/05/22 10:56:05 adam Exp $
+# $NetBSD: Makefile,v 1.16 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-dolphin-20180827
 PKGREVISION=	10
@@ -12,12 +12,16 @@ HOMEPAGE=	https://docs.libretro.com/library/dolphin/
 COMMENT=	Libretro core based on the Dolphin GameCube/Wii emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	pkg-config
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++14
 GCC_REQD+=	6
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_ARGS+=	-DTRY_X11=OFF
 CMAKE_ARGS+=	-DUSE_DISCORD_PRESENCE=OFF
diff --git a/emulators/libretro-dolphin/PLIST b/emulators/libretro-dolphin/PLIST
index d70da50dd36..1b4f4a9d3b7 100644
--- a/emulators/libretro-dolphin/PLIST
+++ b/emulators/libretro-dolphin/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/15 17:20:21 nia Exp $
-lib/libretro/dolphin_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/dolphin_libretro.${SOEXT}
diff --git a/emulators/libretro-fbalpha/Makefile b/emulators/libretro-fbalpha/Makefile
index 8761d13b056..f78cf900101 100644
--- a/emulators/libretro-fbalpha/Makefile
+++ b/emulators/libretro-fbalpha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2018/11/13 17:16:25 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-fbalpha-0.2.97.43.20181022
 PKGREVISION=	1
@@ -12,11 +12,15 @@ HOMEPAGE=	https://github.com/libretro/fbalpha
 COMMENT=	Libretro core based on the FB Alpha arcade game emulator
 LICENSE=	fbalpha-license AND mame-license
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 MAKE_FILE=	makefile.libretro
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-fbalpha/PLIST b/emulators/libretro-fbalpha/PLIST
index ee3132ae28c..87c63fb5216 100644
--- a/emulators/libretro-fbalpha/PLIST
+++ b/emulators/libretro-fbalpha/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/17 12:54:48 nia Exp $
-lib/libretro/fbalpha_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/fbalpha_libretro.${SOEXT}
diff --git a/emulators/libretro-fceumm/Makefile b/emulators/libretro-fceumm/Makefile
index 434be8625de..8f45f990764 100644
--- a/emulators/libretro-fceumm/Makefile
+++ b/emulators/libretro-fceumm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/01 09:53:20 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-fceumm-20190106
 CATEGORIES=	emulators
@@ -10,10 +10,14 @@ HOMEPAGE=	https://docs.libretro.com/library/fceumm/
 COMMENT=	Libretro core based on the FCEUmm Famicom/NES emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-fceumm/PLIST b/emulators/libretro-fceumm/PLIST
index 4e0bbccc6b1..2f45fe25490 100644
--- a/emulators/libretro-fceumm/PLIST
+++ b/emulators/libretro-fceumm/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/04 22:57:29 jmcneill Exp $
-lib/libretro/fceumm_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/fceumm_libretro.${SOEXT}
diff --git a/emulators/libretro-freeintv/Makefile b/emulators/libretro-freeintv/Makefile
index 6bdc9635312..ae711d90046 100644
--- a/emulators/libretro-freeintv/Makefile
+++ b/emulators/libretro-freeintv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-freeintv-20180729
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/freeintv/
 COMMENT=	Libretro core for Mattel Intellivision emulation
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/emulators/libretro-freeintv/PLIST b/emulators/libretro-freeintv/PLIST
index ed4aa1077cd..a481c88de38 100644
--- a/emulators/libretro-freeintv/PLIST
+++ b/emulators/libretro-freeintv/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/12 16:14:27 nia Exp $
-lib/libretro/freeintv_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/freeintv_libretro.${SOEXT}
diff --git a/emulators/libretro-fuse/Makefile b/emulators/libretro-fuse/Makefile
index 568db8677b0..58ff183010e 100644
--- a/emulators/libretro-fuse/Makefile
+++ b/emulators/libretro-fuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-fuse-20180419
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/fuse/
 COMMENT=	Libretro core based on the FUSE ZX Spectrum emulator
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 MAKE_FILE=	Makefile.libretro
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/emulators/libretro-fuse/PLIST b/emulators/libretro-fuse/PLIST
index 006df6aa7e1..80ec5daa02b 100644
--- a/emulators/libretro-fuse/PLIST
+++ b/emulators/libretro-fuse/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 15:42:09 nia Exp $
-lib/libretro/fuse_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/fuse_libretro.${SOEXT}
diff --git a/emulators/libretro-gambatte/Makefile b/emulators/libretro-gambatte/Makefile
index 84c45caa63c..71a1b492865 100644
--- a/emulators/libretro-gambatte/Makefile
+++ b/emulators/libretro-gambatte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/04/25 13:50:19 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/26 09:45:14 nia Exp $
 
 DISTNAME=	libretro-gambatte-20190412
 CATEGORIES=	emulators
@@ -11,11 +11,15 @@ HOMEPAGE=	https://docs.libretro.com/library/gambatte/
 COMMENT=	Libretro core based on the Gambatte Game Boy Color emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	c c++03
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 CFLAGS.SunOS+=	-DBSD_COMP
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-version-script=libgambatte/libretro/link.T
diff --git a/emulators/libretro-gambatte/PLIST b/emulators/libretro-gambatte/PLIST
index 9018c3f3517..29b006d83d6 100644
--- a/emulators/libretro-gambatte/PLIST
+++ b/emulators/libretro-gambatte/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/05 01:40:45 jmcneill Exp $
-lib/libretro/gambatte_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:14 nia Exp $
+lib/libretro/gambatte_libretro.${SOEXT}
diff --git a/emulators/libretro-genesis-plus-gx/Makefile b/emulators/libretro-genesis-plus-gx/Makefile
index cb67ac8bc05..aaedfc88ad4 100644
--- a/emulators/libretro-genesis-plus-gx/Makefile
+++ b/emulators/libretro-genesis-plus-gx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/10/02 21:09:29 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-genesis-plus-gx-20180607
 CATEGORIES=	emulators
@@ -11,9 +11,13 @@ HOMEPAGE=	https://docs.libretro.com/library/genesis_plus_gx/
 COMMENT=	Libretro core based on the Genesis Plus Sega 8/16 bit emulator
 LICENSE=	mame-license
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FILE=	Makefile.libretro
 
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
diff --git a/emulators/libretro-genesis-plus-gx/PLIST b/emulators/libretro-genesis-plus-gx/PLIST
index 80dd319a033..d450a173f26 100644
--- a/emulators/libretro-genesis-plus-gx/PLIST
+++ b/emulators/libretro-genesis-plus-gx/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 15:12:21 nia Exp $
-lib/libretro/genesis_plus_gx_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/genesis_plus_gx_libretro.${SOEXT}
diff --git a/emulators/libretro-mame2010/Makefile b/emulators/libretro-mame2010/Makefile
index bac1cd9f4c4..385b54cb635 100644
--- a/emulators/libretro-mame2010/Makefile
+++ b/emulators/libretro-mame2010/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/01/02 13:24:29 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-mame2010-20180417
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/mame_2010/
 COMMENT=	Libretro core based on the MAME 0.139 arcade game emulator
 LICENSE=	mame-license
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	platform=unix
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 MAKE_FLAGS+=	BUILD_ZLIB=0
diff --git a/emulators/libretro-mame2010/PLIST b/emulators/libretro-mame2010/PLIST
index 318dcb38e0f..7bd00d23cac 100644
--- a/emulators/libretro-mame2010/PLIST
+++ b/emulators/libretro-mame2010/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2019/01/02 13:24:29 nia Exp $
-lib/libretro/mame2010_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/mame2010_libretro.${SOEXT}
diff --git a/emulators/libretro-mgba/Makefile b/emulators/libretro-mgba/Makefile
index db1a23d0f13..bd9899ba6f8 100644
--- a/emulators/libretro-mgba/Makefile
+++ b/emulators/libretro-mgba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/02/18 13:29:48 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	mgba-0.8.1
 PKGNAME=	libretro-${DISTNAME}
@@ -11,12 +11,15 @@ HOMEPAGE=	https://docs.libretro.com/library/mgba/
 COMMENT=	Libretro core based on the mGBA emulator
 LICENSE=	mpl-2.0
 
-EXTRACT_USING=	bsdtar
-
 USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 WRKSRC=		${WRKDIR}/mgba-${PKGVERSION_NOREV}
 
 CMAKE_ARGS+=	-DUSE_DEBUGGERS=OFF
diff --git a/emulators/libretro-mgba/PLIST b/emulators/libretro-mgba/PLIST
index f2718b0abf5..782dec91680 100644
--- a/emulators/libretro-mgba/PLIST
+++ b/emulators/libretro-mgba/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.4 2019/09/22 15:19:29 nia Exp $
-lib/libretro/mgba_libretro.so
+@comment $NetBSD: PLIST,v 1.5 2020/05/26 09:45:15 nia Exp $
+lib/libretro/mgba_libretro.${SOEXT}
diff --git a/emulators/libretro-mupen64plus/Makefile b/emulators/libretro-mupen64plus/Makefile
index 84d5d4ae187..8a92655db8d 100644
--- a/emulators/libretro-mupen64plus/Makefile
+++ b/emulators/libretro-mupen64plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2019/07/05 07:43:42 nia Exp $
+# $NetBSD: Makefile,v 1.22 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-mupen64plus-20190426
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/mupen64plus/
 COMMENT=	Libretro core based on the Mupen64Plus emulator
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_LANGUAGES=	c c++03
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 SUBST_CLASSES+=		vc
 SUBST_STAGE.vc=		pre-configure
 SUBST_MESSAGE.vc=	Fixing path to VideoCore libraries.
diff --git a/emulators/libretro-mupen64plus/PLIST b/emulators/libretro-mupen64plus/PLIST
index 76409a56f81..da6d688bd58 100644
--- a/emulators/libretro-mupen64plus/PLIST
+++ b/emulators/libretro-mupen64plus/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/04 23:02:12 jmcneill Exp $
-lib/libretro/mupen64plus_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/mupen64plus_libretro.${SOEXT}
diff --git a/emulators/libretro-nestopia/Makefile b/emulators/libretro-nestopia/Makefile
index 7a9d0e6b327..311c449ca3f 100644
--- a/emulators/libretro-nestopia/Makefile
+++ b/emulators/libretro-nestopia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/01/04 12:29:45 nia Exp $
+# $NetBSD: Makefile,v 1.7 2020/05/26 09:45:15 nia Exp $
 
 .include "../../emulators/nestopia/Makefile.common"
 
@@ -12,6 +12,11 @@ BUILD_DIRS=	libretro
 
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,-version-script=link.T
diff --git a/emulators/libretro-nestopia/PLIST b/emulators/libretro-nestopia/PLIST
index b9a61d46912..d31c1afc062 100644
--- a/emulators/libretro-nestopia/PLIST
+++ b/emulators/libretro-nestopia/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2020/01/04 12:29:45 nia Exp $
-lib/libretro/nestopia_libretro.so
+@comment $NetBSD: PLIST,v 1.3 2020/05/26 09:45:15 nia Exp $
+lib/libretro/nestopia_libretro.${SOEXT}
diff --git a/emulators/libretro-np2kai/Makefile b/emulators/libretro-np2kai/Makefile
index 239b56d492d..e4b5b5c0e19 100644
--- a/emulators/libretro-np2kai/Makefile
+++ b/emulators/libretro-np2kai/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/02/24 15:26:50 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:15 nia Exp $
 
 NP2KAI_REV=	18
 DISTNAME=	libretro-np2kai-0.86.${NP2KAI_REV}
@@ -12,10 +12,14 @@ HOMEPAGE=	https://docs.libretro.com/library/neko_project_ii_kai/
 COMMENT=	Libretro core based on the Neko Project II PC-9801 emulator
 LICENSE=	mit
 
-EXTRACT_USING=	bsdtar
 BUILD_DIRS=	sdl2
 MAKE_FILE=	Makefile.libretro
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
diff --git a/emulators/libretro-np2kai/PLIST b/emulators/libretro-np2kai/PLIST
index 864aa6cad4f..ec0a0ccc887 100644
--- a/emulators/libretro-np2kai/PLIST
+++ b/emulators/libretro-np2kai/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/14 16:44:07 nia Exp $
-lib/libretro/np2kai_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/np2kai_libretro.${SOEXT}
diff --git a/emulators/libretro-o2em/Makefile b/emulators/libretro-o2em/Makefile
index b1090a69369..120fc115d78 100644
--- a/emulators/libretro-o2em/Makefile
+++ b/emulators/libretro-o2em/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-o2em-20180812
 CATEGORIES=	emulators
@@ -10,9 +10,13 @@ HOMEPAGE=	https://docs.libretro.com/library/o2em/
 COMMENT=	Libretro core for Magnavox Odyssey 2 and VideoPac emulation
 LICENSE=	artistic
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-o2em/PLIST b/emulators/libretro-o2em/PLIST
index 16fbf398c4a..d4127fe3509 100644
--- a/emulators/libretro-o2em/PLIST
+++ b/emulators/libretro-o2em/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 18:35:14 nia Exp $
-lib/libretro/o2em_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/o2em_libretro.${SOEXT}
diff --git a/emulators/libretro-pcsx-rearmed/Makefile b/emulators/libretro-pcsx-rearmed/Makefile
index 0c79d66a42d..276579e5b94 100644
--- a/emulators/libretro-pcsx-rearmed/Makefile
+++ b/emulators/libretro-pcsx-rearmed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/01/26 17:31:09 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-pcsx-rearmed-0.22
 CATEGORIES=	emulators
@@ -15,6 +15,11 @@ USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
 MAKE_FILE=	Makefile.libretro
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 BUILDLINK_TRANSFORM+=	rm:-ldl
diff --git a/emulators/libretro-pcsx-rearmed/PLIST b/emulators/libretro-pcsx-rearmed/PLIST
index 5792c73e751..25f4dfe188c 100644
--- a/emulators/libretro-pcsx-rearmed/PLIST
+++ b/emulators/libretro-pcsx-rearmed/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/04 23:04:17 jmcneill Exp $
-lib/libretro/pcsx_rearmed_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/pcsx_rearmed_libretro.${SOEXT}
diff --git a/emulators/libretro-picodrive/Makefile b/emulators/libretro-picodrive/Makefile
index d20758bf23c..b830e5be72e 100644
--- a/emulators/libretro-picodrive/Makefile
+++ b/emulators/libretro-picodrive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/01/02 13:56:32 nia Exp $
+# $NetBSD: Makefile,v 1.8 2020/05/26 09:45:15 nia Exp $
 
 DISTNAME=	libretro-picodrive-20180722
 PKGREVISION=	1
@@ -12,10 +12,14 @@ HOMEPAGE=	https://docs.libretro.com/library/picodrive/
 COMMENT=	Libretro core based on the Picodrive MegaDrive/MegaCD/32X emulator
 LICENSE=	mame-license
 
-EXTRACT_USING=	bsdtar
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/libretro-picodrive/PLIST b/emulators/libretro-picodrive/PLIST
index 1b3ce77510f..e12295c62f6 100644
--- a/emulators/libretro-picodrive/PLIST
+++ b/emulators/libretro-picodrive/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/04 22:58:13 jmcneill Exp $
-lib/libretro/picodrive_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:15 nia Exp $
+lib/libretro/picodrive_libretro.${SOEXT}
diff --git a/emulators/libretro-ppsspp/Makefile b/emulators/libretro-ppsspp/Makefile
index ec957225af3..7692a7230d0 100644
--- a/emulators/libretro-ppsspp/Makefile
+++ b/emulators/libretro-ppsspp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/11/03 19:24:33 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/26 09:45:16 nia Exp $
 
 PKGNAME=	libretro-ppsspp-1.7.5
 CATEGORIES=	emulators
@@ -31,13 +31,17 @@ SITES.ppsspp-glslang.tar.gz= \
 SITES.ppsspp-spriv.tar.gz= \
 	-https://github.com/KhronosGroup/SPIRV-Cross/archive/${SPRIV_TAG}.tar.gz
 
-EXTRACT_USING=	bsdtar
 WRKSRC=		${WRKDIR}/ppsspp-${PKGVERSION_NOREV}
 BUILD_DIRS=	libretro
 
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++11
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/bsd.prefs.mk"
 
 ONLY_FOR_PLATFORM=	*-*-*arm* *-*-x86_64 *-*-i386
diff --git a/emulators/libretro-ppsspp/PLIST b/emulators/libretro-ppsspp/PLIST
index 76fc70df11c..d10154f9653 100644
--- a/emulators/libretro-ppsspp/PLIST
+++ b/emulators/libretro-ppsspp/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/14 12:55:41 nia Exp $
-lib/libretro/ppsspp_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/ppsspp_libretro.${SOEXT}
diff --git a/emulators/libretro-prosystem/Makefile b/emulators/libretro-prosystem/Makefile
index b10ed349419..aa91d159c80 100644
--- a/emulators/libretro-prosystem/Makefile
+++ b/emulators/libretro-prosystem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:16 nia Exp $
 
 DISTNAME=	libretro-prosystem-20180812
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/prosystem/
 COMMENT=	Libretro core based on the ProSystem Atari 7800 emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/emulators/libretro-prosystem/PLIST b/emulators/libretro-prosystem/PLIST
index 19c0a3de048..cdbded2d91a 100644
--- a/emulators/libretro-prosystem/PLIST
+++ b/emulators/libretro-prosystem/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/13 18:04:15 nia Exp $
-lib/libretro/prosystem_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/prosystem_libretro.${SOEXT}
diff --git a/emulators/libretro-reicast/Makefile b/emulators/libretro-reicast/Makefile
index 859eabd2851..b04842e6c6f 100644
--- a/emulators/libretro-reicast/Makefile
+++ b/emulators/libretro-reicast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/05/09 23:24:17 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/26 09:45:16 nia Exp $
 
 DISTNAME=	libretro-reicast-20190508
 CATEGORIES=	emulators
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/reicast/
 COMMENT=	Libretro core based on the Reicast Sega Dreamcast emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++11
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	platform=unix
 MAKE_FLAGS+=	HAVE_OPENMP=0
 MAKE_FLAGS+=	HAVE_LTCG=0
diff --git a/emulators/libretro-reicast/PLIST b/emulators/libretro-reicast/PLIST
index 0026eaa88c2..ff480c15d65 100644
--- a/emulators/libretro-reicast/PLIST
+++ b/emulators/libretro-reicast/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/13 17:02:16 nia Exp $
-lib/libretro/reicast_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/reicast_libretro.${SOEXT}
diff --git a/emulators/libretro-sameboy/Makefile b/emulators/libretro-sameboy/Makefile
index 01a8057f7a1..799ff576169 100644
--- a/emulators/libretro-sameboy/Makefile
+++ b/emulators/libretro-sameboy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/07/18 10:44:57 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/05/26 09:45:16 nia Exp $
 
 .include "../../emulators/sameboy/Makefile.common"
 
@@ -12,6 +12,11 @@ BUILD_DIRS=	libretro
 
 MAKE_FLAGS+=	GIT_VERSION="${PKGVERSION}-pkgsrc"
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
 
 do-install:
diff --git a/emulators/libretro-sameboy/PLIST b/emulators/libretro-sameboy/PLIST
index 4282582735c..e60d81b813e 100644
--- a/emulators/libretro-sameboy/PLIST
+++ b/emulators/libretro-sameboy/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/15 15:32:11 nia Exp $
-lib/libretro/sameboy_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/sameboy_libretro.${SOEXT}
diff --git a/emulators/libretro-snes9x/Makefile b/emulators/libretro-snes9x/Makefile
index 6d1e0c8c289..6556c6b7dc6 100644
--- a/emulators/libretro-snes9x/Makefile
+++ b/emulators/libretro-snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/01/01 22:16:15 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:16 nia Exp $
 
 .include "../../emulators/snes9x/Makefile.common"
 
@@ -12,6 +12,11 @@ BUILD_DIRS=	libretro
 
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 MAKE_FLAGS+=	LTO=
 
diff --git a/emulators/libretro-snes9x/PLIST b/emulators/libretro-snes9x/PLIST
index aba6df9ccf3..f12798440c2 100644
--- a/emulators/libretro-snes9x/PLIST
+++ b/emulators/libretro-snes9x/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/12 15:32:10 nia Exp $
-lib/libretro/snes9x_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/snes9x_libretro.${SOEXT}
diff --git a/emulators/libretro-snes9x2005/Makefile b/emulators/libretro-snes9x2005/Makefile
index 06f52d471f3..73c4fa85149 100644
--- a/emulators/libretro-snes9x2005/Makefile
+++ b/emulators/libretro-snes9x2005/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/10 20:34:01 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:16 nia Exp $
 
 DISTNAME=	libretro-snes9x2005-20180626
 CATEGORIES=	emulators
@@ -13,6 +13,11 @@ LICENSE=	snes9x-license
 
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 INSTALLATION_DIRS+=	${PREFIX}/lib/libretro
diff --git a/emulators/libretro-snes9x2005/PLIST b/emulators/libretro-snes9x2005/PLIST
index 0df73980d68..8b6813925a5 100644
--- a/emulators/libretro-snes9x2005/PLIST
+++ b/emulators/libretro-snes9x2005/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/10 20:14:29 nia Exp $
-lib/libretro/snes9x2005_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/snes9x2005_libretro.${SOEXT}
diff --git a/emulators/libretro-snes9x2010/Makefile b/emulators/libretro-snes9x2010/Makefile
index b3995dd630a..2f3a5ff911b 100644
--- a/emulators/libretro-snes9x2010/Makefile
+++ b/emulators/libretro-snes9x2010/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:16 nia Exp $
 
 DISTNAME=	libretro-snes9x2010-20180626
 CATEGORIES=	emulators
@@ -14,6 +14,11 @@ LICENSE=	snes9x-license
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-snes9x2010/PLIST b/emulators/libretro-snes9x2010/PLIST
index 73d1351444a..7e3c7df7473 100644
--- a/emulators/libretro-snes9x2010/PLIST
+++ b/emulators/libretro-snes9x2010/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/10 20:55:13 nia Exp $
-lib/libretro/snes9x2010_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/snes9x2010_libretro.${SOEXT}
diff --git a/emulators/libretro-stella/Makefile b/emulators/libretro-stella/Makefile
index ea66b1b3818..9382c9a17dd 100644
--- a/emulators/libretro-stella/Makefile
+++ b/emulators/libretro-stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/05/18 12:27:37 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:16 nia Exp $
 
 .include "../../emulators/stella/Makefile.common"
 
@@ -12,6 +12,11 @@ BUILD_DIRS=	src/libretro
 
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-${PKGVERSION_NOREV}-pkgsrc"
 MAKE_FLAGS+=	LTO=
 
diff --git a/emulators/libretro-stella/PLIST b/emulators/libretro-stella/PLIST
index fd898a68a68..fb0c1474761 100644
--- a/emulators/libretro-stella/PLIST
+++ b/emulators/libretro-stella/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/05 22:38:59 jmcneill Exp $
-lib/libretro/stella_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:16 nia Exp $
+lib/libretro/stella_libretro.${SOEXT}
diff --git a/emulators/libretro-vba-next/Makefile b/emulators/libretro-vba-next/Makefile
index 5009f81ffee..a7bcc7f7240 100644
--- a/emulators/libretro-vba-next/Makefile
+++ b/emulators/libretro-vba-next/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:17 nia Exp $
 
 DISTNAME=	libretro-vba-next-20180603
 CATEGORIES=	emulators games
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/vba_next/
 COMMENT=	Libretro core based on the VBA Next Game Boy Advance emulator
 LICENSE=	gnu-gpl-v2
 
-EXTRACT_USING=	bsdtar
 USE_LANGUAGES+=	c c++03
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FILE=	Makefile.libretro
 
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
diff --git a/emulators/libretro-vba-next/PLIST b/emulators/libretro-vba-next/PLIST
index c404c610725..b2b1908578e 100644
--- a/emulators/libretro-vba-next/PLIST
+++ b/emulators/libretro-vba-next/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2015/02/13 21:21:03 snj Exp $
-lib/libretro/vba_next_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:17 nia Exp $
+lib/libretro/vba_next_libretro.${SOEXT}
diff --git a/emulators/libretro-vecx/Makefile b/emulators/libretro-vecx/Makefile
index 858ab15ad10..dfbe6564f78 100644
--- a/emulators/libretro-vecx/Makefile
+++ b/emulators/libretro-vecx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/10/02 21:09:30 nia Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:17 nia Exp $
 
 DISTNAME=	libretro-vecx-20180412
 CATEGORIES=	emulators
@@ -10,10 +10,14 @@ HOMEPAGE=	https://docs.libretro.com/library/vecx/
 COMMENT=	Libretro core for Vectrex emulation
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 MAKE_FILE=	Makefile.libretro
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 BUILDLINK_TRANSFORM.SunOS+=	rm:-Wl,--version-script=./link.T
diff --git a/emulators/libretro-vecx/PLIST b/emulators/libretro-vecx/PLIST
index 30ec3303be5..fdeb6f33a62 100644
--- a/emulators/libretro-vecx/PLIST
+++ b/emulators/libretro-vecx/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 16:09:55 nia Exp $
-lib/libretro/vecx_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:17 nia Exp $
+lib/libretro/vecx_libretro.${SOEXT}
diff --git a/emulators/libretro-virtualjaguar/Makefile b/emulators/libretro-virtualjaguar/Makefile
index 238fb486250..bed134da126 100644
--- a/emulators/libretro-virtualjaguar/Makefile
+++ b/emulators/libretro-virtualjaguar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2018/10/13 16:19:31 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/26 09:45:17 nia Exp $
 
 DISTNAME=	libretro-virtualjaguar-20180812
 CATEGORIES=	emulators
@@ -11,9 +11,13 @@ HOMEPAGE=	https://docs.libretro.com/library/virtual_jaguar/
 COMMENT=	Libretro core based on the Virtual Jaguar Atari Jaguar emulation
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
 
 .include "../../mk/endian.mk"
diff --git a/emulators/libretro-virtualjaguar/PLIST b/emulators/libretro-virtualjaguar/PLIST
index 803a283064c..4d890b9eade 100644
--- a/emulators/libretro-virtualjaguar/PLIST
+++ b/emulators/libretro-virtualjaguar/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/10/13 16:19:31 nia Exp $
-lib/libretro/virtualjaguar_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:17 nia Exp $
+lib/libretro/virtualjaguar_libretro.${SOEXT}
diff --git a/games/libretro-2048/Makefile b/games/libretro-2048/Makefile
index 88ba73d0073..f2484716062 100644
--- a/games/libretro-2048/Makefile
+++ b/games/libretro-2048/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2019/02/10 12:39:10 nia Exp $
+# $NetBSD: Makefile,v 1.2 2020/05/26 09:45:11 nia Exp $
 
 DISTNAME=	libretro-2048-20181229
 CATEGORIES=	games
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/2048/
 COMMENT=	Libretro core based on the 2048 puzzle game
 LICENSE=	unlicense
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 MAKE_FILE=	Makefile.libretro
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 CHECK_PORTABILITY_SKIP+=	pixman/configure
 
 MAKE_FLAGS+=	GIT_VERSION="-pkgsrc"
diff --git a/games/libretro-2048/PLIST b/games/libretro-2048/PLIST
index 8313f2c01cb..bbd72417e32 100644
--- a/games/libretro-2048/PLIST
+++ b/games/libretro-2048/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2019/02/10 12:39:10 nia Exp $
-lib/libretro/2048_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:11 nia Exp $
+lib/libretro/2048_libretro.${SOEXT}
diff --git a/games/libretro-craft/Makefile b/games/libretro-craft/Makefile
index 09ee8354ccc..1fd4d23a636 100644
--- a/games/libretro-craft/Makefile
+++ b/games/libretro-craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/05/20 06:09:06 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-craft-20180803
 CATEGORIES=	games
@@ -13,6 +13,11 @@ LICENSE=	mit
 
 USE_TOOLS+=	gmake
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 MAKE_FILE=	Makefile.libretro
 MAKE_FLAGS+=	GIT_VERSION=" \(pkgsrc\)"
 
diff --git a/games/libretro-craft/PLIST b/games/libretro-craft/PLIST
index c80854bd86e..a4f135b2830 100644
--- a/games/libretro-craft/PLIST
+++ b/games/libretro-craft/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/08/11 00:48:50 nia Exp $
-lib/libretro/craft_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/craft_libretro.${SOEXT}
diff --git a/games/libretro-nxengine/Makefile b/games/libretro-nxengine/Makefile
index 39a84e5ecd9..906f00a7c2a 100644
--- a/games/libretro-nxengine/Makefile
+++ b/games/libretro-nxengine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/05/20 06:09:06 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2020/05/26 09:45:12 nia Exp $
 
 DISTNAME=	libretro-nxengine-20181126
 CATEGORIES=	games
@@ -11,10 +11,14 @@ HOMEPAGE=	https://docs.libretro.com/library/nxengine/
 COMMENT=	Libretro core based on the NXEngine game engine for Cave Story
 LICENSE=	gnu-gpl-v3
 
-EXTRACT_USING=	bsdtar
 USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 
+OPSYSVARS+=	SOEXT
+SOEXT.Darwin=	dylib
+SOEXT.*=	so
+PLIST_SUBST+=	SOEXT=${SOEXT}
+
 .include "../../mk/endian.mk"
 
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/games/libretro-nxengine/PLIST b/games/libretro-nxengine/PLIST
index 3ac8a158c98..eaed099e470 100644
--- a/games/libretro-nxengine/PLIST
+++ b/games/libretro-nxengine/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/23 15:05:52 nia Exp $
-lib/libretro/nxengine_libretro.so
+@comment $NetBSD: PLIST,v 1.2 2020/05/26 09:45:12 nia Exp $
+lib/libretro/nxengine_libretro.${SOEXT}