git: 9bc7f181ca0b - main - emulators/pcsxr: Remove expired port:

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Fri, 31 Mar 2023 00:01:42 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9bc7f181ca0ba066be6d69e2eb6e7b7333f3930d

commit 9bc7f181ca0ba066be6d69e2eb6e7b7333f3930d
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2023-03-25 14:06:14 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2023-03-30 23:59:38 +0000

    emulators/pcsxr: Remove expired port:
    
    2023-03-31 emulators/pcsxr: Abandoned upstream and no development in 5+ years, consider using games/retroarch
---
 MOVED                                              |  1 +
 emulators/Makefile                                 |  1 -
 emulators/pcsxr/Makefile                           | 90 ----------------------
 emulators/pcsxr/distinfo                           |  3 -
 emulators/pcsxr/files/patch-doc-CMakeLists.txt     | 19 -----
 emulators/pcsxr/files/patch-gui-CMakeLists.txt     | 23 ------
 emulators/pcsxr/files/patch-gui-Linux.h            | 13 ----
 emulators/pcsxr/files/patch-gui-LnxMain.c          | 31 --------
 emulators/pcsxr/files/patch-gui-po-CMakeLists.txt  | 16 ----
 .../pcsxr/files/patch-libpcsxcore-CMakeLists.txt   | 24 ------
 .../patch-libpcsxcore-ix86_64-ix86_cpudetect.c     | 11 ---
 .../pcsxr/files/patch-libpcsxcore-psxcommon.h      | 11 ---
 .../files/patch-plugins-bladesio1-CMakeLists.txt   | 23 ------
 .../pcsxr/files/patch-plugins-bladesio1-gui.c      | 46 -----------
 .../pcsxr/files/patch-plugins-bladesio1-sio1.c     | 11 ---
 .../files/patch-plugins-dfcdrom-CMakeLists.txt     | 24 ------
 emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h  | 11 ---
 .../files/patch-plugins-dfinput-CMakeLists.txt     | 24 ------
 emulators/pcsxr/files/patch-plugins-dfinput-pad.h  | 11 ---
 .../pcsxr/files/patch-plugins-dfnet-CMakeLists.txt | 23 ------
 emulators/pcsxr/files/patch-plugins-dfnet-cfg.c    | 11 ---
 emulators/pcsxr/files/patch-plugins-dfnet-dfnet.h  | 50 ------------
 .../files/patch-plugins-dfsound-CMakeLists.txt     | 23 ------
 .../files/patch-plugins-dfxvideo-CMakeLists.txt    | 24 ------
 .../files/patch-plugins-peopsxgl-CMakeLists.txt    | 24 ------
 emulators/pcsxr/pkg-descr                          |  4 -
 emulators/pcsxr/pkg-plist                          | 28 -------
 27 files changed, 1 insertion(+), 579 deletions(-)

diff --git a/MOVED b/MOVED
index 4f3c3fb4f452..3388b5b5185d 100644
--- a/MOVED
+++ b/MOVED
@@ -17851,3 +17851,4 @@ deskutils/horde-groupware||2023-03-31|Has expired: Requires php74
 devel/horde-whups||2023-03-31|Has expired: Requires php74
 devel/phpunit6||2023-03-31|Has expired: End of Life since February 1, 2019
 devel/phpunit7||2023-03-31|Has expired: End of Life since February 7, 2020
+emulators/pcsxr||2023-03-31|Has expired: Abandoned upstream and no development in 5+ years, consider using games/retroarch
diff --git a/emulators/Makefile b/emulators/Makefile
index cd5ae84b3afe..a79b838c91ae 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -103,7 +103,6 @@
     SUBDIR += pcem
     SUBDIR += pcemu
     SUBDIR += pcsx2
-    SUBDIR += pcsxr
     SUBDIR += playonbsd
     SUBDIR += ppsspp
     SUBDIR += ppsspp-qt5
diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
deleted file mode 100644
index 926268c7bea3..000000000000
--- a/emulators/pcsxr/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-PORTNAME=	pcsxr
-PORTVERSION=	1.9.95.20180604
-PORTREVISION=	6
-CATEGORIES=	emulators
-
-MAINTAINER=	martymac@FreeBSD.org
-COMMENT=	Playstation (PSX) emulator
-WWW=		http://pcsxr.codeplex.com
-
-LICENSE=	GPLv3+
-
-DEPRECATED=	Abandoned upstream and no development in 5+ years, consider using games/retroarch
-EXPIRATION_DATE=2023-03-31
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
-		libcdio.so:sysutils/libcdio \
-		libavformat.so:multimedia/ffmpeg
-
-USES=		cmake desktop-file-utils dos2unix gettext gl gnome iconv \
-		libarchive libtool pkgconfig sdl tar:bzip2 xorg
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	martymac
-GH_TAGNAME=	codeplex-final
-
-USE_LDCONFIG=	yes
-
-USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool glib20
-USE_XORG=	ice sm x11 xv xext xxf86vm xtst
-USE_SDL=	sdl2
-USE_GL=	gl
-
-WRKSRC_SUBDIR=	${PORTNAME}
-
-CFLAGS+=	-I${LOCALBASE}/include/harfbuzz
-
-CMAKE_ARGS+=	-DDL_LIB:STRING="" \
-		-DMANPREFIX:STRING="${MANPREFIX}" \
-		-DBUILD_OPENGL:BOOL=ON \
-		-DBUILD_SIO1:BOOL=ON \
-		-DUSE_LIBCDIO:BOOL=ON \
-		-DENABLE_CCDDA:BOOL=ON \
-		-DUSE_LIBARCHIVE:BOOL=ON
-
-DOS2UNIX_REGEX=	.*\.(c|h|cpp|hpp|am)
-
-PORTDOCS=	ChangeLog README
-
-# Default CDROM device to use with dfcdrom,
-# accessed through libcdio (using cam(4) and pass(4))
-DEFAULT_DVD_DEVICE?=	/dev/cd0
-
-# XXX Gettext support is mandatory and cannot really be disabled.
-# The following option only enables/disables building *additional* translations
-OPTIONS_DEFINE=	NLS DOCS
-OPTIONS_SUB=	yes
-NLS_DESC=	Build additional NLS translations
-NLS_CMAKE_ON=	-DDISABLE_NLS_TRANSLATIONS:BOOL=OFF
-NLS_CMAKE_OFF=	-DDISABLE_NLS_TRANSLATIONS:BOOL=ON
-
-.include <bsd.port.pre.mk>
-
-post-patch:
-	# Add ${PREFIX} to plugins' lookup directories
-	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \
-		${WRKSRC}/gui/LnxMain.c
-	# Set default CDROM device
-	@${REINPLACE_CMD} "s|%%DVD_DEVICE%%|${DEFAULT_DVD_DEVICE}|" \
-		${WRKSRC}/plugins/dfcdrom/cdr.h
-	# Fix PSEMU_DATA_DIR and DEF_PLUGIN_DIR
-	@${REINPLACE_CMD} \
-		-e "s|games/||g" \
-		-e "s|psemu|${PORTNAME}|g" \
-			${WRKSRC}/gui/CMakeLists.txt \
-			${WRKSRC}/plugins/bladesio1/CMakeLists.txt \
-			${WRKSRC}/plugins/dfcdrom/CMakeLists.txt \
-			${WRKSRC}/plugins/dfinput/CMakeLists.txt \
-			${WRKSRC}/plugins/dfnet/CMakeLists.txt \
-			${WRKSRC}/plugins/dfsound/CMakeLists.txt \
-			${WRKSRC}/plugins/dfxvideo/CMakeLists.txt \
-			${WRKSRC}/plugins/nullsio1/CMakeLists.txt \
-			${WRKSRC}/plugins/peopsxgl/CMakeLists.txt
-
-post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.post.mk>
diff --git a/emulators/pcsxr/distinfo b/emulators/pcsxr/distinfo
deleted file mode 100644
index 47749a4100b6..000000000000
--- a/emulators/pcsxr/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1528487875
-SHA256 (martymac-pcsxr-1.9.95.20180604-codeplex-final_GH0.tar.gz) = 476b6c7aa5467151846cbed949f1024fa9f6109b51d3bee94698c46f53d85eb3
-SIZE (martymac-pcsxr-1.9.95.20180604-codeplex-final_GH0.tar.gz) = 2262175
diff --git a/emulators/pcsxr/files/patch-doc-CMakeLists.txt b/emulators/pcsxr/files/patch-doc-CMakeLists.txt
deleted file mode 100644
index 8ba2f9e28549..000000000000
--- a/emulators/pcsxr/files/patch-doc-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Disable doc installation (handled by the port's Makefile)
-
---- doc/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ doc/CMakeLists.txt
-@@ -1,8 +1,8 @@
--install(FILES pcsxr.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
--install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
--install(FILES tweaks.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
-+install(FILES pcsxr.1 DESTINATION ${MANPREFIX}/man/man1)
-+#install(FILES keys.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
-+#install(FILES tweaks.txt DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
- 
--install(FILES ../AUTHORS DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
--install(FILES ../COPYING DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
--install(FILES ../README DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
-+#install(FILES ../AUTHORS DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
-+#install(FILES ../COPYING DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
-+#install(FILES ../README DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/pcsxr)
- 
diff --git a/emulators/pcsxr/files/patch-gui-CMakeLists.txt b/emulators/pcsxr/files/patch-gui-CMakeLists.txt
deleted file mode 100644
index f8d740298903..000000000000
--- a/emulators/pcsxr/files/patch-gui-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- gui/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ gui/CMakeLists.txt
-@@ -17,6 +17,11 @@ endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+
- find_package(Threads REQUIRED)
- find_package(ZLIB REQUIRED)
- include_directories(${ZLIB_INCLUDE_DIRS})
-@@ -89,7 +94,7 @@ compile_gresources(RESOURCE_FILE
- add_custom_target(resource DEPENDS ${RESOURCE_FILE})
- add_executable(pcsxr ${SRCS} ${RESOURCE_FILE} )
- add_dependencies(pcsxr resource)
--target_link_libraries(pcsxr pcsxcore ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${RT_LIB} ${DL_LIB} ${X11_XTest_LIB})
-+target_link_libraries(pcsxr pcsxcore ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ZLIB_LIBRARIES} ${RT_LIB} ${DL_LIB} ${X11_XTest_LIB} ${Intl_LIBRARIES})
- 
- install(TARGETS pcsxr RUNTIME DESTINATION bin)
- install(FILES data/pcsxr.desktop DESTINATION share/applications)
diff --git a/emulators/pcsxr/files/patch-gui-Linux.h b/emulators/pcsxr/files/patch-gui-Linux.h
deleted file mode 100644
index af98e9bf4b7b..000000000000
--- a/emulators/pcsxr/files/patch-gui-Linux.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- gui/Linux.h.orig	2020-09-07 22:26:22 UTC
-+++ gui/Linux.h
-@@ -43,8 +43,8 @@
- 
- extern gboolean UseGui;
- extern int StatesC;
--char cfgfile[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
--char cfgfile_basename[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
-+extern char cfgfile[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
-+extern char cfgfile_basename[MAXPATHLEN];	/* ADB Comment this out - make a local var, or at least use gchar funcs */
- 
- int LoadConfig();
- void SaveConfig();
diff --git a/emulators/pcsxr/files/patch-gui-LnxMain.c b/emulators/pcsxr/files/patch-gui-LnxMain.c
deleted file mode 100644
index f50e4b3d6b96..000000000000
--- a/emulators/pcsxr/files/patch-gui-LnxMain.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- gui/LnxMain.c.orig	2020-09-07 22:26:22 UTC
-+++ gui/LnxMain.c
-@@ -42,6 +42,9 @@
- 
- #include <X11/extensions/XTest.h>
- 
-+char cfgfile[MAXPATHLEN];
-+char cfgfile_basename[MAXPATHLEN];
-+
- enum {
- 	RUN = 0,
- 	RUN_CD,
-@@ -187,6 +190,9 @@ static void ScanAllPlugins (void) {
- 	gchar *currentdir;
- 
- 	// scan some default locations to find plugins
-+	ScanPlugins("%%PREFIX%%/lib/pcsxr/");
-+	ScanPlugins("%%PREFIX%%/lib/pcsxr/lib");
-+	ScanPlugins("%%PREFIX%%/lib/pcsxr/config");
- 	ScanPlugins("/usr/lib/games/psemu/");
- 	ScanPlugins("/usr/lib/games/psemu/lib/");
- 	ScanPlugins("/usr/lib/games/psemu/config/");
-@@ -212,6 +218,8 @@ static void ScanAllPlugins (void) {
- 	ScanPlugins(DEF_PLUGIN_DIR "/config");
- 
- 	// scan some default locations to find bioses
-+	ScanBios("%%PREFIX%%/lib/pcsxr/");
-+	ScanBios("%%PREFIX%%/lib/pcsxr/bios");
- 	ScanBios("/usr/lib/games/psemu");
- 	ScanBios("/usr/lib/games/psemu/bios");
- 	ScanBios("/usr/lib64/games/psemu");
diff --git a/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt b/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt
deleted file mode 100644
index dff3d76582ab..000000000000
--- a/emulators/pcsxr/files/patch-gui-po-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
---- gui/po/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ gui/po/CMakeLists.txt
-@@ -1,6 +1,9 @@
--message("Configuring langs")
--include(Gettext)
-+option(DISABLE_NLS_TRANSLATIONS "Disable building additional NLS translations" OFF)
-+if(NOT DISABLE_NLS_TRANSLATIONS)
-+	message("Configuring langs")
-+	include(Gettext)
- 
--#find_package(LibArchive REQUIRED)
-+	#find_package(LibArchive REQUIRED)
- 
--GETTEXT_CREATE_TRANSLATIONS(pcsxr.pot ALL es fr hu it ko_KR pt_BR ru zh_CN zh_TW)
-+	GETTEXT_CREATE_TRANSLATIONS(pcsxr.pot ALL es fr hu it ko_KR pt_BR ru zh_CN zh_TW)
-+endif()
diff --git a/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt b/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt
deleted file mode 100644
index fbd3f6ce1a3b..000000000000
--- a/emulators/pcsxr/files/patch-libpcsxcore-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- libpcsxcore/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ libpcsxcore/CMakeLists.txt
-@@ -18,6 +18,12 @@ if (USE_LIBARCHIVE)
-   add_definitions(-DHAVE_LIBARCHIVE)
- endif()
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
-+
- # Architecture detection and arch specific settings
- message(${CMAKE_SYSTEM_PROCESSOR})
- if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^powerpc")
-@@ -25,6 +31,8 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^powerpc")
- elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i.86")
-     set(_ARCH_32 1)
- elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^x86_64")
-+    set(_ARCH_64 1)
-+elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^amd64")
-     set(_ARCH_64 1)
- else()
-     message("Unsupported arch. Will not build dynarec")
diff --git a/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c b/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c
deleted file mode 100644
index 75dccf9e9d89..000000000000
--- a/emulators/pcsxr/files/patch-libpcsxcore-ix86_64-ix86_cpudetect.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpcsxcore/ix86_64/ix86_cpudetect.c.orig	2020-09-07 22:26:22 UTC
-+++ libpcsxcore/ix86_64/ix86_cpudetect.c
-@@ -145,7 +145,7 @@ u64 GetCPUTick( void ) 
- #endif
- }
- 
--#if defined(__linux__) || defined(__APPLE__)
-+#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__)
- 
- #include <sys/time.h>
- #include <errno.h>
diff --git a/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h b/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h
deleted file mode 100644
index 557d7ff237c1..000000000000
--- a/emulators/pcsxr/files/patch-libpcsxcore-psxcommon.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- libpcsxcore/psxcommon.h.orig	2020-09-07 22:26:22 UTC
-+++ libpcsxcore/psxcommon.h
-@@ -71,7 +71,7 @@ typedef uint8_t boolean;
- #include "system.h"
- #include "debug.h"
- 
--#if defined (__linux__) || defined (__MACOSX__)
-+#if defined (__linux__) || defined (__MACOSX__) || defined (__FreeBSD__)
- #define strnicmp strncasecmp
- #endif
- #define __inline inline
diff --git a/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt
deleted file mode 100644
index 0634097fcece..000000000000
--- a/emulators/pcsxr/files/patch-plugins-bladesio1-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- plugins/bladesio1/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/bladesio1/CMakeLists.txt
-@@ -17,6 +17,11 @@ endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
- 
- #defs
- add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
-@@ -55,7 +60,7 @@ add_library(BladeSio1 MODULE ${PLUGIN_SRCS})
- 
- add_executable(cfgBladeSio1 ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgBladeSio1 bladesio1_resource)
--target_link_libraries(cfgBladeSio1 ${GTK_LIBRARIES})
-+target_link_libraries(cfgBladeSio1 ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS BladeSio1 LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgBladeSio1 RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-bladesio1-gui.c b/emulators/pcsxr/files/patch-plugins-bladesio1-gui.c
deleted file mode 100644
index 5ba589539290..000000000000
--- a/emulators/pcsxr/files/patch-plugins-bladesio1-gui.c
+++ /dev/null
@@ -1,46 +0,0 @@
---- plugins/bladesio1/gui.c.orig	2020-09-07 22:26:23 UTC
-+++ plugins/bladesio1/gui.c
-@@ -26,8 +26,6 @@
- #include <gtk/gtk.h>
- 
- #include <sys/socket.h>
--#include <sys/ioctl.h>
--#include <linux/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -40,6 +38,11 @@
- 
- /***************************************************************************/
- 
-+#ifdef __linux__
-+
-+#include <sys/ioctl.h>
-+#include <linux/if.h>
-+
- #define MAXINTERFACES 16
- 
- void sockGetIP(char *IPAddress) {
-@@ -66,6 +69,22 @@ void sockGetIP(char *IPAddress) {
- 		close(fd);
- 	}
- }
-+
-+#else
-+
-+void sockGetIP(char *IPAddress) {
-+    struct hostent *host;
-+    char str[256];
-+
-+    gethostname(str, 256);
-+    host = gethostbyname(str);
-+
-+    if (host != NULL)
-+        strcpy(IPAddress, inet_ntoa(*((struct in_addr *)host->h_addr_list[0])));
-+    else strcpy(IPAddress, "127.0.0.1");
-+}
-+
-+#endif
- 
- void cfgSysMessage(const char *fmt, ...) {
- 	GtkWidget *MsgDlg;
diff --git a/emulators/pcsxr/files/patch-plugins-bladesio1-sio1.c b/emulators/pcsxr/files/patch-plugins-bladesio1-sio1.c
deleted file mode 100644
index 6bc813776075..000000000000
--- a/emulators/pcsxr/files/patch-plugins-bladesio1-sio1.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/bladesio1/sio1.c.orig	2020-09-07 22:26:23 UTC
-+++ plugins/bladesio1/sio1.c
-@@ -55,8 +55,6 @@ static const unsigned char build	= 1;
- 
- static void (CALLBACK *irqCallback)() = 0;
- 
--Settings settings;
--
- /* sio status flags.
-  */
- enum {
diff --git a/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt
deleted file mode 100644
index e9a437b67052..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfcdrom-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/dfcdrom/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfcdrom/CMakeLists.txt
-@@ -27,6 +27,12 @@ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GD
- 
- find_package(Threads REQUIRED)
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
-+
- #defs
- add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
- 
-@@ -66,7 +72,7 @@ target_link_libraries(DFCdrom ${CDIO_LIBRARIES} ${CMAK
- 
- add_executable(cfgDFCdrom ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgDFCdrom dfcdrom_resource)
--target_link_libraries(cfgDFCdrom ${GTK_LIBRARIES})
-+target_link_libraries(cfgDFCdrom ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS DFCdrom LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgDFCdrom RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h b/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h
deleted file mode 100644
index 76c3d46cbf5c..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/dfcdrom/cdr.h.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfcdrom/cdr.h
-@@ -104,7 +104,7 @@ struct cdrom_msf {
- #define CD_FRAMESIZE_SUB	96
- 
- #if defined (__FreeBSD__)
--#define DEV_DEF		"/dev/cd0"
-+#define DEV_DEF		"%%DVD_DEVICE%%"
- #else
- #define DEV_DEF		""
- #endif
diff --git a/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt
deleted file mode 100644
index 735f6ca7b437..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfinput-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/dfinput/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfinput/CMakeLists.txt
-@@ -17,6 +17,12 @@ endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
-+
- set(USE_SDL2 0)
- find_package(SDL2)
- if(NOT SDL2_FOUND)
-@@ -76,7 +82,7 @@ target_link_libraries(DFInput ${SDL_LIBRARY} ${SDL2_LI
- 
- add_executable(cfgDFInput ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgDFInput dfinput_resource)
--target_link_libraries(cfgDFInput ${GTK_LIBRARIES} ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES})
-+target_link_libraries(cfgDFInput ${GTK_LIBRARIES} ${SDL_LIBRARY} ${SDL2_LIBRARY} ${X11_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS DFInput LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgDFInput RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-dfinput-pad.h b/emulators/pcsxr/files/patch-plugins-dfinput-pad.h
deleted file mode 100644
index ffdcee2607bc..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfinput-pad.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/dfinput/pad.h.orig	2020-09-07 22:26:22 UTC
-+++ plugins/dfinput/pad.h
-@@ -151,7 +151,7 @@ typedef struct tagKeyDef {
- enum { ANALOG_XP = 0, ANALOG_XM, ANALOG_YP, ANALOG_YM };
- 
- #if SDL_VERSION_ATLEAST(2,0,0)
--SDL_GameControllerButton controllerMap[DKEY_TOTAL];	
-+extern SDL_GameControllerButton controllerMap[DKEY_TOTAL];	
- #endif
- 
- typedef struct tagPadDef {
diff --git a/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt
deleted file mode 100644
index 60ebc2ed2309..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfnet-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- plugins/dfnet/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfnet/CMakeLists.txt
-@@ -17,6 +17,11 @@ endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
- 
- #defs
- add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
-@@ -54,7 +59,7 @@ add_library(DFNet MODULE ${PLUGIN_SRCS})
- 
- add_executable(cfgDFNet ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgDFNet dfnet_resource)
--target_link_libraries(cfgDFNet ${GTK_LIBRARIES})
-+target_link_libraries(cfgDFNet ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS DFNet LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgDFNet RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-dfnet-cfg.c b/emulators/pcsxr/files/patch-plugins-dfnet-cfg.c
deleted file mode 100644
index 4449f861322d..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfnet-cfg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/dfnet/cfg.c.orig	2020-09-07 22:26:23 UTC
-+++ plugins/dfnet/cfg.c
-@@ -13,6 +13,8 @@
- 
- #define CFG_FILENAME "dfnet.cfg"
- 
-+Config conf;
-+
- void SaveConf() {
- 	FILE *f;
- 
diff --git a/emulators/pcsxr/files/patch-plugins-dfnet-dfnet.h b/emulators/pcsxr/files/patch-plugins-dfnet-dfnet.h
deleted file mode 100644
index dc7e4aea828c..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfnet-dfnet.h
+++ /dev/null
@@ -1,50 +0,0 @@
---- plugins/dfnet/dfnet.h.orig	2020-09-07 22:26:23 UTC
-+++ plugins/dfnet/dfnet.h
-@@ -56,7 +56,7 @@ __private_extern char* PLUGLOC(char* toloc);
- 
- typedef void* HWND;
- 
--struct timeval tm;
-+extern struct timeval tm;
- 
- #define CALLBACK
- 
-@@ -70,24 +70,24 @@ typedef struct {
- 	char ipAddress[32];
- } Config;
- 
--Config conf;
-+extern Config conf;
- 
- void LoadConf();
- void SaveConf();
- 
--int sock;
--char *PadSendData;
--char *PadRecvData;
--char PadSendSize;
--char PadRecvSize;
--char PadSize[2];
--int PadCount;
--int PadCountMax;
--int PadInit;
--int Ping;
--volatile int WaitCancel;
--fd_set rset;
--fd_set wset;
-+extern int sock;
-+extern char *PadSendData;
-+extern char *PadRecvData;
-+extern char PadSendSize;
-+extern char PadRecvSize;
-+extern char PadSize[2];
-+extern int PadCount;
-+extern int PadCountMax;
-+extern int PadInit;
-+extern int Ping;
-+extern volatile int WaitCancel;
-+extern fd_set rset;
-+extern fd_set wset;
- 
- long sockInit();
- long sockShutdown();
diff --git a/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt
deleted file mode 100644
index dd7f5534dad4..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfsound-CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
---- plugins/dfsound/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfsound/CMakeLists.txt
-@@ -20,6 +20,11 @@  endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
- 
- if (${SND_BACKEND} STREQUAL "oss")
-   find_package(OSS REQUIRED)
-@@ -129,7 +134,7 @@ endif()
- 
- add_executable(cfgDFSound ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgDFSound dfsound_resource)
--target_link_libraries(cfgDFSound ${GTK_LIBRARIES})
-+target_link_libraries(cfgDFSound ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS DFSound LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgDFSound RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt
deleted file mode 100644
index eb2e2c8db248..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfxvideo-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/dfxvideo/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/dfxvideo/CMakeLists.txt
-@@ -20,6 +20,12 @@ set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GD
- 
- find_package(X11 REQUIRED)
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
-+
- #defs
- add_definitions(-DLOCALE_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale/" -DPSEMU_DATA_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/psemu" -DDEF_PLUGIN_DIR="${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu")
- 
-@@ -63,7 +69,7 @@ target_link_libraries(DFXVideo ${X11_LIBRARIES} ${X11_
- 
- add_executable(cfgDFXVideo ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgDFXVideo dfxvideo_resource)
--target_link_libraries(cfgDFXVideo ${GTK_LIBRARIES})
-+target_link_libraries(cfgDFXVideo ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS DFXVideo LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgDFXVideo RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt b/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt
deleted file mode 100644
index 8f30d38a3796..000000000000
--- a/emulators/pcsxr/files/patch-plugins-peopsxgl-CMakeLists.txt
+++ /dev/null
@@ -1,24 +0,0 @@
---- plugins/peopsxgl/CMakeLists.txt.orig	2017-02-18 21:40:07 UTC
-+++ plugins/peopsxgl/CMakeLists.txt
-@@ -17,6 +17,12 @@ endif(NOT GTK3_FOUND)
- include_directories(${GTK3_INCLUDE_DIRS})
- set(GTK_LIBRARIES ${GTK3_LIBRARY} ${GDK3_LIBRARY} ${GDKPixbuf_LIBRARY} ${Pango_LIBRARY} ${Cairo_LIBRARY} ${GObject_LIBRARY} ${GLib_LIBRARY} ${GIO_LIBRARY})
- 
-+find_package (Intl REQUIRED)
-+if(NOT Intl_FOUND)
-+    message(FATAL_ERROR "Intl library not found")
-+endif(NOT Intl_FOUND)
-+include_directories(${Intl_INCLUDE_DIRS})
-+
- find_package(X11 REQUIRED)
- 
- find_package(OpenGL REQUIRED)
-@@ -69,7 +75,7 @@ target_link_libraries(peopsxgl ${X11_LIBRARIES} ${X11_
- 
- add_executable(cfgpeopsxgl ${GUI_SRCS} ${RESOURCE_FILE})
- add_dependencies(cfgpeopsxgl dfinput_resource)
--target_link_libraries(cfgpeopsxgl ${GTK_LIBRARIES})
-+target_link_libraries(cfgpeopsxgl ${GTK_LIBRARIES} ${Intl_LIBRARIES})
- 
- install(TARGETS peopsxgl LIBRARY DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
- install(TARGETS cfgpeopsxgl RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/games/psemu)
diff --git a/emulators/pcsxr/pkg-descr b/emulators/pcsxr/pkg-descr
deleted file mode 100644
index 8fa8599e7453..000000000000
--- a/emulators/pcsxr/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Pcsx-reloaded is a Playstation (PSX) emulator.
-
-It is an improved version of pcsx-df, which is
-itself of fork of pcsx.
diff --git a/emulators/pcsxr/pkg-plist b/emulators/pcsxr/pkg-plist
deleted file mode 100644
index 43de994d8fd3..000000000000
--- a/emulators/pcsxr/pkg-plist
+++ /dev/null
@@ -1,28 +0,0 @@
-bin/pcsxr
-man/man1/pcsxr.1.gz
-%%NLS%%share/locale/es/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/it/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/ko_KR/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsxr.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsxr.mo
-share/icons/hicolor/48x48/apps/pcsxr-icon.png
-share/applications/pcsxr.desktop
-lib/pcsxr/cfgBladeSio1
-lib/pcsxr/cfgDFXVideo
-lib/pcsxr/cfgpeopsxgl
-lib/pcsxr/cfgDFInput
-lib/pcsxr/cfgDFCdrom
-lib/pcsxr/cfgDFSound
-lib/pcsxr/cfgDFNet
-lib/pcsxr/libBladeSio1.so
-lib/pcsxr/libDFXVideo.so
-lib/pcsxr/libpeopsxgl.so
-lib/pcsxr/libDFInput.so
-lib/pcsxr/libDFSound.so
-lib/pcsxr/libDFCdrom.so
-lib/pcsxr/libDFNet.so
-lib/pcsxr/libNullSio1.so