9 files changed, 147 insertions, 268 deletions

diff --git a/emulators/ares/Makefile b/emulators/ares/Makefile
index 5703ded03159..b01b1c3afee9 100644
--- a/emulators/ares/Makefile
+++ b/emulators/ares/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	ares
 DISTVERSIONPREFIX=	v
-DISTVERSION=	141
-PORTREVISION=	2
+DISTVERSION=	142
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
@@ -11,202 +10,163 @@ WWW=		https://ares-emu.net
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		compiler:c++17-lang gmake gnome localbase:ldflags pkgconfig \
-		xorg
+BUILD_DEPENDS=	librashader>0:devel/librashader
+
+USES=		cmake compiler:c++17-lang gl gnome pkgconfig xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	ares-emulator
-USE_GNOME=	gtksourceview3
-USE_XORG=	x11 xext xrandr
-
-MAKEFILE=	GNUmakefile
-MAKE_ARGS=	compiler=${CC} \
-		cores= \
-		hiro=gtk3-se \
-		local=false \
-		lto=false \
-		prefix=${PREFIX} \
-		ruby=video.none \
-		sdl2=false \
-		symbols=false \
-		threaded=true
-
-OPTIONS_DEFINE=		DEBUG DOCS HOTKEYS OPENMP SHADER
-OPTIONS_DEFAULT=	A26 ALSA AO CV FC GB GBA GLX MD MS MSX MYVISION N64 NG \
-			NGP OPENAL OPENMP OSS PCE PERFORMANCE PS1 SDLAUDIO \
-			SDLINPUT SFC SG SHADER SPEC UDEV UHID WS XLIB XVIDEO
-OPTIONS_GROUP=		AUDIO CORES INPUT VIDEO
-OPTIONS_GROUP_AUDIO=	ALSA AO OPENAL OSS PULSEAUDIO SDLAUDIO
-OPTIONS_GROUP_CORES=	A26 CV FC GB GBA MD MS MSX MYVISION N64 NG NGP PCE PS1 \
-			SFC SG SPEC WS
-OPTIONS_GROUP_INPUT=	SDLINPUT UDEV UHID XLIB
-OPTIONS_GROUP_VIDEO=	GLX XVIDEO
-OPTIONS_SINGLE=		PROFILE
-OPTIONS_SINGLE_PROFILE=	ACCURACY PERFORMANCE
+USE_GL=		opengl
+USE_GNOME=	gtk30
+USE_XORG=	x11 xext xrandr xrender
+
+CMAKE_ARGS=	-DARES_CORES="${_CORES:S/ /;/gW}" \
+		-DARES_VERSION_OVERRIDE=${DISTVERSIONFULL} \
+		-DENABLE_CCACHE=${CCACHE_ENABLED}
+CMAKE_ON=	ARES_SKIP_DEPS \
+		ARES_UNITY_CORES \
+		WITH_SYSTEM_ZLIB
+CMAKE_OFF=	ARES_BUILD_LOCAL \
+		ARES_BUNDLE_SHADERS \
+		ARES_ENABLE_MINIMUM_CPU
+
+EXTRACT_AFTER_ARGS=	--exclude thirdparty/librashader \
+			--exclude thirdparty/slang-shaders \
+			--no-same-owner --no-same-permissions
+
+OPTIONS_DEFINE=			SDL TOOLS
+OPTIONS_DEFAULT=		A26 ALSA AO CV FC GB GBA LIBRASHADER LIBRETRO \
+				LTO MD MS MSX MYVISION N64 NG NGP OPENAL \
+				OPTIMIZED_CFLAGS OSS PCE PS1 SDL SFC SG SPEC \
+				UDEV USBHID WS
+OPTIONS_GROUP=			AUDIO CORES INPUT OPTIMIZATION SHADER
+OPTIONS_GROUP_AUDIO=		ALSA AO OPENAL OSS PULSEAUDIO
+OPTIONS_GROUP_CORES=		A26 CV FC GB GBA MD MS MSX MYVISION N64 NG NGP \
+				PCE PS1 SFC SG SPEC WS
+OPTIONS_GROUP_INPUT=		HOTKEYS UDEV USBHID
+OPTIONS_GROUP_OPTIMIZATION=	ACCURACY LTO OPTIMIZED_CFLAGS
+OPTIONS_GROUP_SHADER=		LIBRASHADER LIBRETRO
+
+# linking openal fails on i386, LLD_UNSAFE workaround fails with
+# /usr/local/bin/i386-unknown-freebsd14.1-ld.bfd: /usr/bin/../lib/LLVMgold.so:
+# error loading plugin: Cannot open "/usr/bin/../lib/LLVMgold.so"
+# on tools/sourcery target, so exclude OPENAL on i386
+OPTIONS_EXCLUDE_i386=	OPENAL
+
+OPTIONS_SUB=	yes
 
 A26_DESC=		Atari 2600
-ACCURACY_DESC=		Slower but more accurate
+ACCURACY_DESC=		Emulation accuracy over performance
 CV_DESC=		ColecoVision
 FC_DESC=		NES / Famicom
 GBA_DESC=		Game Boy Advance
-GB_DESC=		Game Boy
+GB_DESC=		Game Boy / Game Boy Color
 HOTKEYS_DESC=		Inofficial hotkeys locking patch
-MD_DESC=		Mega Drive / Genesis
-MSX_DESC=		MSX
-MS_DESC=		Master System / Mark III
+LIBRASHADER_DESC=	Slang-shader support via librashader
+LIBRETRO_DESC=		Install slang-shaders from libretro
+MD_DESC=		Sega Mega Drive / Genesis
+MSX_DESC=		Microsoft MSX
+MS_DESC=		Sega Master System / Mark III
 MYVISION_DESC=		My Vision
 N64_DESC=		Nintendo 64
-NGP_DESC=		Neo Geo Pocket
+NGP_DESC=		Neo Geo Pocket / Neo Geo Pocket Color
 NG_DESC=		Neo Geo (AES/MVS)
 PCE_DESC=		PC-Engine / TurboGrafx
-PERFORMANCE_DESC=	Faster but less accurate
-PROFILE_DESC=
 PS1_DESC=		PlayStation
-SDLAUDIO_DESC=		${SDL_DESC}
-SDLINPUT_DESC=		${SDL_DESC}
 SFC_DESC=		SNES / Super Famicom
-SG_DESC=		SG-1000
-SHADER_DESC=		Build with shader support
+SG_DESC=		Sega SG-1000
 SPEC_DESC=		ZX Spectrum
-UDEV_DESC=		UDEV input support
-UHID_DESC=		UHID input support
-VIDEO_DESC=
-WS_DESC=		WonderSwan
-XLIB_DESC=		XLIB input support
-
-A26_MAKE_ARGS=		cores+=a26
-
-ACCURACY_MAKE_ARGS=	profile=accuracy
-
-ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_MAKE_ARGS=		ruby+=audio.alsa
+TOOLS_DESC=		Include supplemental tools and tests
+UDEV_DESC=		Input support via UDEV
+USBHID_DESC=		Input support via USBHID
+WS_DESC=		WonderSwan / WonderSwan Color
 
-AO_LIB_DEPENDS=		libao.so:audio/libao
-AO_MAKE_ARGS=		ruby+=audio.ao
+A26_VARS=			_CORES+=a26
 
-CV_MAKE_ARGS=		cores+=cv
+ACCURACY_CMAKE_BOOL=		ARES_PROFILE_ACCURACY
 
-DEBUG_MAKE_ARGS=	build=debug
-DEBUG_MAKE_ARGS_OFF=	build=release
+ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_CMAKE_BOOL=		ARES_ENABLE_ALSA
 
-FC_MAKE_ARGS=		cores+=fc
+AO_LIB_DEPENDS=			libao.so:audio/libao
+AO_CMAKE_BOOL=			ARES_ENABLE_AO
 
-GBA_MAKE_ARGS=		cores+=gba
+CV_VARS=			_CORES+=cv
 
-GB_MAKE_ARGS=		cores+=gb
+FC_VARS=			_CORES+=fc
 
-GLX_USES=		gl
-GLX_USE=		GL=gl
-GLX_MAKE_ARGS=		ruby+=video.glx
+GBA_VARS=			_CORES+=gba
 
-HOTKEYS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-hotkeys
+GB_VARS=			_CORES+=gb
 
-MD_MAKE_ARGS=		cores+=md
+HOTKEYS_EXTRA_PATCHES=		${PATCHDIR}/extra-patch-desktop-ui_input_hotkeys.cpp
 
-MSX_MAKE_ARGS=		cores+=msx
+LIBRASHADER_LIB_DEPENDS=	librashader.so:devel/librashader
+LIBRASHADER_CMAKE_BOOL=		ARES_ENABLE_LIBRASHADER
 
-MS_MAKE_ARGS=		cores+=ms
+LIBRETRO_IMPLIES=		LIBRASHADER
+LIBRETRO_BUILD_DEPENDS=		${_LIBRETRO_BR_DEPENDS}
+LIBRETRO_RUN_DEPENDS=		${_LIBRETRO_BR_DEPENDS}
 
-MYVISION_MAKE_ARGS=	cores+=myvision
+LTO_CMAKE_BOOL=			ENABLE_IPO
 
-N64_RUN_DEPENDS=	${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader
-N64_MAKE_ARGS=		cores+=n64 \
-			vulkan=true
-N64_MAKE_ARGS_OFF=	vulkan=false
+MD_VARS=			_CORES+=md
 
-NGP_MAKE_ARGS=		cores+=ngp
+MSX_VARS=			_CORES+=msx
 
-NG_MAKE_ARGS=		cores+=ng
+MS_VARS=			_CORES+=ms
 
-OPENAL_USES=		openal
-OPENAL_MAKE_ARGS=	ruby+=audio.openal
+MYVISION_VARS=			_CORES+=myvision
 
-OPENMP_MAKE_ARGS=	openmp=true
-OPENMP_MAKE_ARGS_OFF=	openmp=false
+N64_BUILD_DEPENDS=		${_N64_BR_DEPENDS}
+N64_RUN_DEPENDS=		${_N64_BR_DEPENDS}
+N64_VARS=			_CORES+=n64
 
-OSS_MAKE_ARGS=		ruby+=audio.oss
+NGP_VARS=			_CORES+=ngp
 
-PCE_MAKE_ARGS=		cores+=pce
+NG_VARS=			_CORES+=ng
 
-PERFORMANCE_MAKE_ARGS=	profile=performance
+OPENAL_USES=			openal
+OPENAL_CMAKE_BOOL=		ARES_ENABLE_OPENAL
 
-PS1_MAKE_ARGS=		cores+=ps1
+OPTIMIZED_CFLAGS_CFLAGS=	-O3
 
-PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:audio/pulseaudio \
-			libpulse.so:audio/pulseaudio
-PULSEAUDIO_MAKE_ARGS=	ruby+=audio.pulseaudio \
-			ruby+=audio.pulseaudiosimple
+OSS_CMAKE_BOOL=			ARES_ENABLE_OSS
 
-SDLAUDIO_USES=		sdl
-SDLAUDIO_USE=		SDL=sdl2
-SDLAUDIO_MAKE_ARGS=	ruby+=audio.sdl \
-			sdl2=true
+PCE_VARS=			_CORES+=pce
 
-SDLINPUT_USES=		sdl
-SDLINPUT_USE=		SDL=sdl2
-SDLINPUT_MAKE_ARGS=	ruby+=input.sdl \
-			sdl2=true
+PS1_VARS=			_CORES+=ps1
 
-SFC_MAKE_ARGS=		cores+=sfc
+PULSEAUDIO_LIB_DEPENDS=		libpulse-simple.so:audio/pulseaudio \
+				libpulse.so:audio/pulseaudio
+PULSEAUDIO_CMAKE_BOOL=		ARES_ENABLE_PULSEAUDIO
 
-SG_MAKE_ARGS=		cores+=sg
+SDL_USES=			sdl
+SDL_USE=			SDL=sdl2
+SDL_CMAKE_BOOL=			ARES_ENABLE_SDL
 
-SHADER_BUILD_DEPENDS=	${LOCALBASE}/include/librashader/librashader.h:devel/librashader
-SHADER_RUN_DEPENDS=	${LOCALBASE}/${_SHADERS}/bilinear.slangp:games/libretro-shaders-slang \
-			${LOCALBASE}/lib/librashader.so:devel/librashader
-SHADER_MAKE_ARGS=	librashader=true
-SHADER_MAKE_ARGS_OFF=	librashader=false
-SHADER_CFLAGS=		-DLIBRA_RUNTIME_OPENGL
-SHADER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-desktop-ui_desktop-ui.cpp
+SFC_VARS=			_CORES+=sfc
 
-SPEC_MAKE_ARGS=		cores+=spec
+SG_VARS=			_CORES+=sg
 
-UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
-UDEV_MAKE_ARGS=		ruby+=input.udev
+SPEC_VARS=			_CORES+=spec
 
-UHID_MAKE_ARGS=		ruby+=input.uhid
+TOOLS_CMAKE_BOOL=		ARES_BUILD_OPTIONAL_TARGETS
 
-WS_MAKE_ARGS=		cores+=ws
+UDEV_LIB_DEPENDS=		libudev.so:devel/libudev-devd
+UDEV_CMAKE_BOOL=		ARES_ENABLE_UDEV
 
-XLIB_MAKE_ARGS=		ruby+=input.xlib
+USBHID_CMAKE_BOOL=		ARES_ENABLE_USBHID
 
-XVIDEO_USE=		XORG=xv
-XVIDEO_MAKE_ARGS=	ruby+=video.xvideo
+WS_VARS=			_CORES+=ws
 
-_SHADERS=		share/libretro/shaders/shaders_slang
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENAL} && ${ARCH} == "i386"
-LLD_UNSAFE=	yes
-.endif
+_LIBRETRO_BR_DEPENDS=	libretro-shaders-slang<0:games/libretro-shaders-slang
+_N64_BR_DEPENDS=	vulkan-loader>0:graphics/vulkan-loader
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/hiro/GNUmakefile
-
-post-patch-SHADER-on:
-	${REINPLACE_CMD} 's|-I../thirdparty/librashader/include||g' \
-		${WRKSRC}/desktop-ui/GNUmakefile
-	${REINPLACE_CMD} 's|"librashader_ld.h"|<librashader/librashader_ld.h>|g' \
-		${WRKSRC}/ruby/video/opengl/opengl.hpp
-	${REINPLACE_CMD} 's|@@SHADERS@@|${LOCALBASE}/${_SHADERS}/|g' \
-		${WRKSRC}/desktop-ui/desktop-ui.cpp
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/desktop-ui/out/ares \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/desktop-ui/resource/ares.desktop \
-		${STAGEDIR}${PREFIX}/share/applications
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
-	${INSTALL_DATA} ${WRKSRC}/desktop-ui/resource/ares.png \
-		${STAGEDIR}${PREFIX}/share/icons/hicolor/256x256/apps
-	${MKDIR} ${STAGEDIR}${DATADIR}/Database
-	(cd ${WRKSRC}/mia/Database && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/Database)
-
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md \
-		${STAGEDIR}${DOCSDIR}
+		${WRKSRC}/cmake/finders/*
+
+post-install-LIBRETRO-on:
+	${LN} -s ${LOCALBASE}/share/libretro/shaders/shaders_slang ${STAGEDIR}${DATADIR}/Shaders
 
 .include <bsd.port.mk>
diff --git a/emulators/ares/distinfo b/emulators/ares/distinfo
index 0ee21855907e..3e7d170cccdb 100644
--- a/emulators/ares/distinfo
+++ b/emulators/ares/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730736685
-SHA256 (ares-emulator-ares-v141_GH0.tar.gz) = 14448699130aa9ef681c7b69672b48c9cb9303d279f699c125b3b237e2e1480f
-SIZE (ares-emulator-ares-v141_GH0.tar.gz) = 54262443
+TIMESTAMP = 1738783730
+SHA256 (ares-emulator-ares-v142_GH0.tar.gz) = 004b7dc4ae3344871b63e9c6682c9b6b14b699c0426c2719465e3a9a32a9dd25
+SIZE (ares-emulator-ares-v142_GH0.tar.gz) = 53365899
diff --git a/emulators/ares/files/extra-patch-desktop-ui_desktop-ui.cpp b/emulators/ares/files/extra-patch-desktop-ui_desktop-ui.cpp
deleted file mode 100644
index 8fa08f942694..000000000000
--- a/emulators/ares/files/extra-patch-desktop-ui_desktop-ui.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- desktop-ui/desktop-ui.cpp.orig	2024-07-28 14:18:09 UTC
-+++ desktop-ui/desktop-ui.cpp
-@@ -22,6 +22,12 @@ auto locate(const string& name) -> string {
-   location = {Path::sharedData(), "ares/", name};
-   if(inode::exists(location)) return location;
- 
-+  // 3a. The thirdparty shaders directory
-+  if(name == "Shaders/") {
-+    location = "@@SHADERS@@";
-+    if(inode::exists(location)) return location;
-+  }
-+
-   // 4. The application bundle resource directory (macOS only)
- #if defined(PLATFORM_MACOS)
-   location = {Path::resources(), name};
diff --git a/emulators/ares/files/extra-patch-desktop-ui_input_hotkeys.cpp b/emulators/ares/files/extra-patch-desktop-ui_input_hotkeys.cpp
new file mode 100644
index 000000000000..076049e6773b
--- /dev/null
+++ b/emulators/ares/files/extra-patch-desktop-ui_input_hotkeys.cpp
@@ -0,0 +1,12 @@
+--- desktop-ui/input/hotkeys.cpp.orig	2024-11-22 20:50:39 UTC
++++ desktop-ui/input/hotkeys.cpp
+@@ -149,6 +149,9 @@ auto InputManager::pollHotkeys() -> void {
+   }
+ 
+   for(auto& hotkey : hotkeys) {
++    if(emulator && !hotkey.name.equals("Pause Emulation") && !program.paused) {
++      continue;
++    }
+     auto state = hotkey.value();
+     if(hotkey.state == 0 && state == 1 && hotkey.press) hotkey.press();
+     if(hotkey.state == 1 && state == 0 && hotkey.release) hotkey.release();
diff --git a/emulators/ares/files/extra-patch-hotkeys b/emulators/ares/files/extra-patch-hotkeys
deleted file mode 100644
index c97e5d0471f4..000000000000
--- a/emulators/ares/files/extra-patch-hotkeys
+++ /dev/null
@@ -1,35 +0,0 @@
---- desktop-ui/input/hotkeys.cpp.orig	2024-08-16 07:21:59 UTC
-+++ desktop-ui/input/hotkeys.cpp
-@@ -106,7 +106,9 @@ auto InputManager::createHotkeys() -> void {
-     program.showMessage({"Selected state slot ", program.state.slot});
-   }));
- 
--  hotkeys.append(InputHotkey("Pause Emulation").onPress([&] {
-+  InputHotkey pause("Pause Emulation");
-+  pause.isPause = true;
-+  hotkeys.append(pause.onPress([&] {
-     if(!emulator) return;
-     program.pause(!program.paused);
-   }));
-@@ -149,6 +151,9 @@ auto InputManager::pollHotkeys() -> void {
-   }
- 
-   for(auto& hotkey : hotkeys) {
-+    if(emulator && !hotkey.isPause && !program.paused) {
-+      continue;
-+    }
-     auto state = hotkey.value();
-     if(hotkey.state == 0 && state == 1 && hotkey.press) hotkey.press();
-     if(hotkey.state == 1 && state == 0 && hotkey.release) hotkey.release();
-
---- desktop-ui/input/input.hpp.orig	2024-08-16 07:21:40 UTC
-+++ desktop-ui/input/input.hpp
-@@ -73,6 +73,8 @@ struct InputHotkey : InputDigital {
- 
-   const string name;
- 
-+  bool isPause = false;
-+
- private:
-   function<void ()> press;
-   function<void ()> release;
diff --git a/emulators/ares/files/patch-desktop-ui_GNUmakefile b/emulators/ares/files/patch-desktop-ui_GNUmakefile
deleted file mode 100644
index 99f77d976d74..000000000000
--- a/emulators/ares/files/patch-desktop-ui_GNUmakefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- desktop-ui/GNUmakefile.orig	2024-08-09 17:39:54 UTC
-+++ desktop-ui/GNUmakefile
-@@ -8,6 +8,8 @@ flags += -I. -I.. -I../ares -I../thirdparty -I../third
- lto := true
- librashader	:= true
- flags += -I. -I.. -I../ares -I../thirdparty -I../thirdparty/librashader/include -DMIA_LIBRARY
-+flags += $(CFLAGS)
-+options += $(LDFLAGS)
- 
- nall.path := ../nall
- include $(nall.path)/GNUmakefile
-@@ -16,9 +18,6 @@ ifneq ($(filter $(arch),x86 amd64),)
-   ifeq ($(filter cl,$(compiler)),)
-     ifeq ($(local),true)
-       flags += -march=native
--    else
--      # For official builds, default to x86-64-v2 (Intel Nehalem, AMD Bulldozer) which supports up to SSE 4.2.
--      flags += -march=x86-64-v2
-     endif
-   endif
- endif
diff --git a/emulators/ares/files/patch-nall_GNUmakefile b/emulators/ares/files/patch-nall_GNUmakefile
deleted file mode 100644
index 178b51348abd..000000000000
--- a/emulators/ares/files/patch-nall_GNUmakefile
+++ /dev/null
@@ -1,29 +0,0 @@
---- nall/GNUmakefile.orig	2024-08-16 16:33:46 UTC
-+++ nall/GNUmakefile
-@@ -169,8 +169,6 @@ ifeq ($(build),debug)
-   lto = false
-   ifeq ($(cl),true)
-     flags += -Od
--  else
--    flags += -Og
-   endif
-   flags += -DBUILD_DEBUG
- else ifeq ($(build),stable)
-@@ -178,7 +176,7 @@ else ifeq ($(build),release)
- else ifeq ($(build),minified)
-   flags += -Os -DBUILD_MINIFIED
- else ifeq ($(build),release)
--  flags += -O2 -DBUILD_RELEASE
-+  flags += -DBUILD_RELEASE
- else ifeq ($(build),optimized)
-   ifeq ($(cl),true)
-     flags += -O2
-@@ -323,8 +321,6 @@ ifeq ($(platform),bsd)
- 
- # bsd settings
- ifeq ($(platform),bsd)
--  flags   += -I/usr/local/include
--  options += -Wl,-rpath=/usr/local/lib
-   options += -lstdc++ -lm
- endif
- 
diff --git a/emulators/ares/pkg-message b/emulators/ares/pkg-message
index 50cb22a05134..66f4063ffcb7 100644
--- a/emulators/ares/pkg-message
+++ b/emulators/ares/pkg-message
@@ -1,28 +1,28 @@
 [
 { type: install
   message: <<EOM
-Users are encouraged to compile the port on their systems with
+Users are encouraged to compile the port on their systems with an appropriatley
+set CPUTYPE in make.conf in order to improve the performance of demanding cores
+like the N64. Possible values for CPUTYPE are found in
 
-    CFLAGS   ?= -O3
-    CPUTYPE  ?= native | ... | x86-64-v3 | ... | skylake | ...
-    WITH_LTO =  yes
+    /usr/share/examples/etc/make.conf.
 
-This can improve the performance of demanding cores like the N64.
+The binding space for game inputs and hotkey actions is shared in ares. This can
+be an inconvenience for gamepad-only users, who want to assign hotkey actions to
+gamepad buttons without enough free unassigned buttons left on the gamepad.
+Users can compile the port with the HOTKEYS option enabled in order to mitigate
+this problem. This applies an inofficial patch, which locks all hotkey execution
+in the unpaused state of the emulator.
 
-The port provides the HOTKEYS option. This applies an inofficial patch which
-locks all hotkey execution in the unpaused state of the emulator. This can be a
-convenience for gamepad-only users who want to assign hotkey actions to gamepad
-buttons but who don't have enough free unassigned buttons left on the gamepad.
+The port installs and uses the slang-shaders from games/libretro-shaders-slang
+by default. Users can curate and utilize their own provided collection of
+shaders by putting them into the user data directory
 
-The port uses the shaders from games/libretro-shaders-slang by default. Users
-can curate and utilize their own provided collection of shaders by putting them
-into the user data directory
+    ${XDG_DATA_HOME}/ares/Shaders
 
-    ${HOME}/.local/share/ares/Shaders/
-
-ares won't process its own installed shaders if it finds any shaders in the user
-data directory. Delete or rename the local shaders directory in order to make
-ares use its own shaders again.
+ares won't process the system-provided shaders if it finds any shaders in the
+user data directory. Delete or rename the user data directory in order for ares
+to use the system-provided shaders again.
 EOM
 }
 ]
diff --git a/emulators/ares/pkg-plist b/emulators/ares/pkg-plist
index 1f5561d1700e..035623ec753e 100644
--- a/emulators/ares/pkg-plist
+++ b/emulators/ares/pkg-plist
@@ -1,4 +1,11 @@
 bin/ares
+%%TOOLS%%bin/arm7tdmi
+%%TOOLS%%bin/genius
+%%TOOLS%%bin/i8080
+%%TOOLS%%bin/m68000
+%%TOOLS%%bin/mame2bml
+%%TOOLS%%bin/mia
+bin/sourcery
 share/applications/ares.desktop
 %%DATADIR%%/Database/Arcade.bml
 %%DATADIR%%/Database/BS Memory.bml
@@ -9,5 +16,5 @@ share/applications/ares.desktop
 %%DATADIR%%/Database/Sufami Turbo.bml
 %%DATADIR%%/Database/Super Famicom Boards.bml
 %%DATADIR%%/Database/Super Famicom.bml
-%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%LIBRETRO%%%%DATADIR%%/Shaders
 share/icons/hicolor/256x256/apps/ares.png