17 files changed, 260 insertions, 151 deletions

diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index ed7c382dab81..c072aca7c740 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	pcsxr
-PORTVERSION=	1.9.91
-PORTREVISION=	3
+PORTVERSION=	1.9.92.r62569
 CATEGORIES=	emulators
-# Original URLs :
-# http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=pcsxr&DownloadId=98581&FileTime=129064504645100000&Build=16694
-# http://sourceforge.net/projects/pcsx-df/files/pcsx-df/1.10/pcsx-df-1.10.tar.gz/download
-MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/
+MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
+		LOCAL/martymac
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX}
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -21,7 +18,8 @@ MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Playstation (PSX) emulator
 
 BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis \
+		cdio.12:${PORTSDIR}/sysutils/libcdio
 
 LICENSE=	GPLv2
 
@@ -34,7 +32,7 @@ GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-CONFIGURE_ARGS=	--enable-opengl
+CONFIGURE_ARGS=	--enable-opengl --enable-libcdio
 USE_LDCONFIG=	yes
 
 USE_DOS2UNIX=	yes
@@ -49,10 +47,11 @@ USE_GL=	gl
 MAN1=	pcsx.1
 PORTDOCS=	ChangeLog README
 
-.include <bsd.port.pre.mk>
+# Default CDROM device to use with dfcdrom,
+# accessed through libcdio (using cam(4) and pass(4))
+DEFAULT_DVD_DEVICE?=	/dev/cd0
 
-# XXX
-# dfxvideo plugin seems buggy, remove it in future updates ?
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-dynarec=x86_64
@@ -69,11 +68,15 @@ PLIST_SUB+=	NLS="@comment "
 
 # Extract dfbinimage2 plugin
 post-extract:
-	@(cd ${WRKSRC} && ${TAR} -xjf ${DISTDIR}/pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX})
+	@(cd ${WRKSRC} && \
+		${TAR} -xjf ${DISTDIR}/pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX})
 
-# Add ${PREFIX} to plugins' lookup directories
+# Add ${PREFIX} to plugins' lookup directories and set default CDROM device
 post-patch:
-	@${SED} -i.bak "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/gui/LnxMain.c
+	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \
+		${WRKSRC}/gui/LnxMain.c
+	@${REINPLACE_CMD} "s|%%DVD_DEVICE%%|${DEFAULT_DVD_DEVICE}|" \
+		${WRKSRC}/plugins/dfcdrom/cdr.h
 
 pre-configure:
 	@(cd ${WRKSRC} && ${AUTORECONF} -fi)
diff --git a/emulators/pcsxr/distinfo b/emulators/pcsxr/distinfo
index 67d62230cd0d..84b7a7037396 100644
--- a/emulators/pcsxr/distinfo
+++ b/emulators/pcsxr/distinfo
@@ -1,4 +1,4 @@
-SHA256 (pcsxr-1.9.91.tar.bz2) = 82f685dc2699d8a325f77ddd9bf99c25e6e0d90380cc045c0723d13b971bfa3d
-SIZE (pcsxr-1.9.91.tar.bz2) = 1220648
+SHA256 (pcsxr-1.9.92.r62569.tar.bz2) = 2250c7535e4687623704299595a5395f130e73bc7277ac79d7285428bd150251
+SIZE (pcsxr-1.9.92.r62569.tar.bz2) = 1345120
 SHA256 (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 175b71a0a6aff1defdf4d8f9246fcc259fb72876c7ba0bcf607b1e1228fa5a9f
 SIZE (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 40654
diff --git a/emulators/pcsxr/files/patch-Makefile.am b/emulators/pcsxr/files/patch-Makefile.am
index 364e8ee08797..753861a616eb 100644
--- a/emulators/pcsxr/files/patch-Makefile.am
+++ b/emulators/pcsxr/files/patch-Makefile.am
@@ -1,8 +1,10 @@
---- Makefile.am.orig	2010-05-20 17:39:27.936729388 +0000
-+++ Makefile.am	2010-05-20 17:40:11.929625133 +0000
-@@ -1,4 +1,4 @@
--SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfcdrom
-+SUBDIRS = data doc po libpcsxcore gui pixmaps plugins/dfinput plugins/dfsound plugins/dfxvideo plugins/dfbinimage2
- SUBDIRS += $(PEOPSXGL)
+--- Makefile.am.orig	2011-01-21 18:00:03.924565814 +0100
++++ Makefile.am	2011-01-21 18:00:57.355641272 +0100
+@@ -1,6 +1,6 @@
+ SUBDIRS = data doc po libpcsxcore gui pixmaps
+ SUBDIRS += plugins/dfinput plugins/dfsound
+-SUBDIRS += plugins/dfxvideo plugins/dfcdrom plugins/dfnet
++SUBDIRS += plugins/dfxvideo plugins/dfcdrom plugins/dfbinimage2 plugins/dfnet
+ 
+ SUBDIRS += plugins/bladesio1 plugins/gxvideo
  
- EXTRA_DIST = AUTHORS COPYING INSTALL NEWS README ChangeLog ChangeLog.df
diff --git a/emulators/pcsxr/files/patch-configure.ac b/emulators/pcsxr/files/patch-configure.ac
index 9018d6391fb6..84b3f6a243a4 100644
--- a/emulators/pcsxr/files/patch-configure.ac
+++ b/emulators/pcsxr/files/patch-configure.ac
@@ -1,19 +1,18 @@
---- configure.ac.orig	2009-12-25 18:27:52.000000000 +0000
-+++ configure.ac	2010-06-08 06:01:19.057047473 +0000
+--- configure.ac.orig	2011-01-25 06:54:07.000000000 +0100
++++ configure.ac	2011-01-26 14:35:39.236296066 +0100
 @@ -8,6 +8,7 @@
  AC_CONFIG_HEADERS([include/config.h:include/config.h.in])
  
  AC_PROG_CC
 +AC_PROG_CXX
- AC_PROG_RANLIB
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL
-@@ -34,7 +35,7 @@
- AC_SUBST(GLADE2_CFLAGS)
- AC_SUBST(GLADE2_LIBS)
- 
--AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfcdrom/Makefile pixmaps/Makefile po/Makefile.in])
-+AC_CONFIG_FILES([Makefile data/Makefile doc/Makefile libpcsxcore/Makefile gui/Makefile plugins/dfinput/Makefile plugins/dfsound/Makefile plugins/dfxvideo/Makefile plugins/dfbinimage2/Makefile pixmaps/Makefile po/Makefile.in])
- 
- dnl Check for -fno-dse option support
- saved_CFLAGS="$CFLAGS"
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_STDC_HEADERS
+@@ -46,6 +47,7 @@
+ plugins/dfxvideo/Makefile
+ plugins/gxvideo/Makefile
+ plugins/dfcdrom/Makefile
++plugins/dfbinimage2/Makefile
+ plugins/dfnet/Makefile
+ plugins/bladesio1/Makefile
+ pixmaps/Makefile
diff --git a/emulators/pcsxr/files/patch-gui-ConfDlg.c b/emulators/pcsxr/files/patch-gui-ConfDlg.c
deleted file mode 100644
index 52be51377ed8..000000000000
--- a/emulators/pcsxr/files/patch-gui-ConfDlg.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- gui/ConfDlg.c.orig	2010-06-03 07:59:39.428023393 +0000
-+++ gui/ConfDlg.c	2010-06-03 08:01:49.836121070 +0000
-@@ -632,7 +632,7 @@
- 		}
- 
- 		PSE_getLibType = (PSEgetLibType)dlsym(Handle, "PSEgetLibType");
--		if (dlerror() != NULL) {
-+		if (PSE_getLibType == NULL) {
- 			if (strstr(linkname, "gpu") != NULL) type = PSE_LT_GPU;
- 			else if (strstr(linkname, "cdr") != NULL) type = PSE_LT_CDR;
- 			else if (strstr(linkname, "spu") != NULL) type = PSE_LT_SPU;
-@@ -642,10 +642,10 @@
- 		else type = PSE_getLibType();
- 
- 		PSE_getLibName = (PSEgetLibName) dlsym(Handle, "PSEgetLibName");
--		if (dlerror() == NULL) {
-+		if (PSE_getLibName != NULL) {
- 			sprintf(name, "%s", PSE_getLibName());
- 			PSE_getLibVersion = (PSEgetLibVersion) dlsym(Handle, "PSEgetLibVersion");
--			if (dlerror() == NULL) {
-+			if (PSE_getLibVersion != NULL) {
- 				char ver[32];
- 
- 				v = PSE_getLibVersion();
-@@ -720,17 +720,17 @@
- 			if (Handle == NULL) continue;
- 
- 			PSE_getLibType = (PSEgetLibType) dlsym(Handle, "PSEgetLibType");
--			if (dlerror() != NULL) {
-+			if (PSE_getLibType == NULL) {
- 				if (strstr(plugin, "net") != NULL) type = PSE_LT_NET;
- 				else continue;
- 			}
- 			else type = PSE_getLibType();
- 
- 			PSE_getLibName = (PSEgetLibName) dlsym(Handle, "PSEgetLibName");
--			if (dlerror() == NULL) {
-+			if (PSE_getLibName != NULL) {
- 				sprintf(name, "%s", PSE_getLibName());
- 				PSE_getLibVersion = (PSEgetLibVersion) dlsym(Handle, "PSEgetLibVersion");
--				if (dlerror() == NULL) {
-+				if (PSE_getLibVersion != NULL) {
- 					char ver[32];
- 
- 					v = PSE_getLibVersion();
diff --git a/emulators/pcsxr/files/patch-gui-Makefile.am b/emulators/pcsxr/files/patch-gui-Makefile.am
index 6081c0824027..a7551daf3434 100644
--- a/emulators/pcsxr/files/patch-gui-Makefile.am
+++ b/emulators/pcsxr/files/patch-gui-Makefile.am
@@ -1,8 +1,8 @@
---- gui/Makefile.am.orig	2009-12-25 18:25:24.000000000 +0000
-+++ gui/Makefile.am	2010-06-11 08:23:55.837551420 +0000
+--- gui/Makefile.am.orig	2011-01-25 07:07:29.144904305 +0100
++++ gui/Makefile.am	2011-01-25 07:15:13.989942292 +0100
 @@ -1,10 +1,10 @@
--INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
-+INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
+-AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
++AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
  	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
  	-DLOCALE_DIR=\"${datadir}/locale/\" \
  	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
@@ -14,11 +14,10 @@
  
  bin_PROGRAMS = pcsx
  
-@@ -18,5 +18,6 @@
- 	Cheat.c
+@@ -21,4 +21,5 @@
  
  pcsx_LDADD = \
--	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst \
-+	$(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL \
- 	../libpcsxcore/libpcsxcore.a
+ 	../libpcsxcore/libpcsxcore.a \
+-	$(GTK2_LIBS) $(GLADE2_LIBS) -lpthread -lz -lm -lXext -lXtst
++	$(GTK2_LIBS) $(GLADE2_LIBS) -lz -lm -lXext -lXtst -lGL
 +pcsx_LDFLAGS = -pthread
diff --git a/emulators/pcsxr/files/patch-libpcsxcore-socket.c b/emulators/pcsxr/files/patch-libpcsxcore-socket.c
index dfed5cd135b5..ab9af5367cef 100644
--- a/emulators/pcsxr/files/patch-libpcsxcore-socket.c
+++ b/emulators/pcsxr/files/patch-libpcsxcore-socket.c
@@ -1,14 +1,10 @@
---- libpcsxcore/socket.c.orig	2010-05-19 17:43:40.987010639 +0000
-+++ libpcsxcore/socket.c	2010-05-19 17:46:42.625194542 +0000
-@@ -19,9 +19,11 @@
- #ifdef _WIN32
- #include <winsock2.h>
- #else
+--- libpcsxcore/socket.c.orig	2011-01-21 18:06:44.210865888 +0100
++++ libpcsxcore/socket.c	2011-01-21 18:07:58.238538120 +0100
+@@ -23,6 +23,7 @@
+ #include "socket.h"
+ 
+ #ifndef _WIN32
 +#include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/ioctl.h>
  #include <arpa/inet.h>
-+#include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
- #endif
diff --git a/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am b/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am
new file mode 100644
index 000000000000..752f87ee863b
--- /dev/null
+++ b/emulators/pcsxr/files/patch-plugins-bladesio1-Makefile.am
@@ -0,0 +1,26 @@
+--- plugins/bladesio1/Makefile.am.orig	2011-01-25 07:30:23.176137395 +0100
++++ plugins/bladesio1/Makefile.am	2011-01-25 16:41:47.451078804 +0100
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/pcsxr/
++libdir = @libdir@/pcsxr/
+ 
+ lib_LTLIBRARIES = libBladeSio1.la
+ 
+@@ -7,7 +7,7 @@
+ libBladeSio1_la_LDFLAGS = -module -avoid-version
+ 
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+-	-DDATADIR=\"${datadir}/psemu/\" \
++	-DDATADIR=\"${datadir}/pcsxr/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
+ 
+@@ -16,5 +16,5 @@
+ cfgBladeSio1_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+ 
+ glade_DATA = sio1.glade2
+-gladedir = $(datadir)/psemu/
++gladedir = $(datadir)/pcsxr
+ EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am
new file mode 100644
index 000000000000..5e41486f13b7
--- /dev/null
+++ b/emulators/pcsxr/files/patch-plugins-dfcdrom-Makefile.am
@@ -0,0 +1,37 @@
+--- plugins/dfcdrom/Makefile.am.orig	2011-01-26 14:37:30.887292632 +0100
++++ plugins/dfcdrom/Makefile.am	2011-01-26 14:40:33.221965684 +0100
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/pcsxr/
++libdir = @libdir@/pcsxr/
+ 
+ lib_LTLIBRARIES = libDFCdrom.la
+ 
+@@ -13,8 +13,8 @@
+ 	util.c
+ 
+ libDFCdrom_la_CFLAGS =
+-libDFCdrom_la_LDFLAGS = -module -avoid-version 
+-libDFCdrom_la_LIBADD = -lpthread
++libDFCdrom_la_LDFLAGS = -module -avoid-version -pthread
++libDFCdrom_la_LIBADD =
+ 
+ if USE_LIBCDIO
+ libDFCdrom_la_CFLAGS += -DUSE_LIBCDIO=1 $(LIBCDIO_CFLAGS)
+@@ -22,7 +22,7 @@
+ endif
+ 
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+-	-DDATADIR=\"${datadir}/psemu/\" \
++	-DDATADIR=\"${datadir}/pcsxr/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
+ 
+@@ -31,5 +31,5 @@
+ cfgDFCdrom_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+ 
+ glade_DATA = cdrcfg-0.1df/dfcdrom.glade2
+-gladedir = $(datadir)/psemu/
++gladedir = $(datadir)/pcsxr
+ EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h b/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h
new file mode 100644
index 000000000000..0036a15b178f
--- /dev/null
+++ b/emulators/pcsxr/files/patch-plugins-dfcdrom-cdr.h
@@ -0,0 +1,11 @@
+--- plugins/dfcdrom/cdr.h.orig	2011-01-27 06:48:33.209766794 +0100
++++ plugins/dfcdrom/cdr.h	2011-01-27 06:52:51.789416162 +0100
+@@ -78,7 +78,7 @@
+ #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-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
index da04564b599b..219ce8f8ca0b 100644
--- a/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
+++ b/emulators/pcsxr/files/patch-plugins-dfinput-Makefile.am
@@ -1,6 +1,6 @@
---- plugins/dfinput/Makefile.am.orig	2009-12-25 18:26:35.000000000 +0000
-+++ plugins/dfinput/Makefile.am	2010-05-21 17:21:03.238298722 +0000
-@@ -1,15 +1,15 @@
+--- plugins/dfinput/Makefile.am.orig	2011-01-21 18:22:58.498759182 +0100
++++ plugins/dfinput/Makefile.am	2011-01-21 18:23:49.747937779 +0100
+@@ -1,14 +1,14 @@
 -bindir = @libdir@/games/psemu/
 -libdir = @libdir@/games/psemu/
 +bindir = @libdir@/pcsxr/
@@ -9,21 +9,21 @@
  lib_LTLIBRARIES = libDFInput.la
  
  libDFInput_la_SOURCES = cfg.c pad.c pad.h sdljoy.c xkb.c analog.c
--libDFInput_la_LDFLAGS = -module -avoid-version -lpthread -lX11 \
-+libDFInput_la_LDFLAGS = -module -avoid-version -pthread -lX11 \
- 	`$(SDL_CONFIG) --libs` -L/usr/X11R6/lib64 -L/usr/X11R6/lib
+-libDFInput_la_LDFLAGS = -module -avoid-version 
+-libDFInput_la_LIBADD = -lpthread -lX11 $(SDL_LIBS)
++libDFInput_la_LDFLAGS = -module -avoid-version -pthread
++libDFInput_la_LIBADD = -lX11 $(SDL_LIBS)
  
- INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
- 	-DLOCALE_DIR=\"${datadir}/locale/\" \
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 -	-DDATADIR=\"${datadir}/psemu/\" \
 +	-DDATADIR=\"${datadir}/pcsxr/\" \
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
- 	-I../../include -I../../libpcsxcore `$(SDL_CONFIG) --cflags`
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../include -I../../libpcsxcore $(SDL_CFLAGS)
  
-@@ -19,5 +19,5 @@
- cfgDFInput_LDFLAGS = `$(SDL_CONFIG) --libs`
+@@ -17,5 +17,5 @@
+ cfgDFInput_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) $(SDL_LIBS) -lX11
  
- glade_DATA = dfinput.glade2
+ glade_DATA = dfinput.ui
 -gladedir = $(datadir)/psemu/
 +gladedir = $(datadir)/pcsxr/
  EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am
new file mode 100644
index 000000000000..b7193a5dd25b
--- /dev/null
+++ b/emulators/pcsxr/files/patch-plugins-dfnet-Makefile.am
@@ -0,0 +1,26 @@
+--- plugins/dfnet/Makefile.am.orig	2011-01-25 07:30:51.232551129 +0100
++++ plugins/dfnet/Makefile.am	2011-01-25 16:39:03.458776989 +0100
+@@ -1,5 +1,5 @@
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/pcsxr/
++libdir = @libdir@/pcsxr/
+ 
+ lib_LTLIBRARIES = libDFNet.la
+ 
+@@ -7,7 +7,7 @@
+ libDFNet_la_LDFLAGS = -module -avoid-version
+ 
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+-	-DDATADIR=\"${datadir}/psemu/\" \
++	-DDATADIR=\"${datadir}/pcsxr/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
+ 
+@@ -16,5 +16,5 @@
+ cfgDFNet_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+ 
+ glade_DATA = dfnet.ui
+-gladedir = $(datadir)/psemu/
++gladedir = $(datadir)/pcsxr
+ EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
index 5dadca946224..13f787a557b2 100644
--- a/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
+++ b/emulators/pcsxr/files/patch-plugins-dfsound-Makefile.am
@@ -1,12 +1,7 @@
---- plugins/dfsound/Makefile.am.orig	2009-12-25 18:26:41.000000000 +0000
-+++ plugins/dfsound/Makefile.am	2010-05-21 17:21:11.042375497 +0000
-@@ -1,11 +1,11 @@
- INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
- 	-DLOCALE_DIR=\"${datadir}/locale/\" \
--	-DDATADIR=\"${datadir}/psemu/\" \
-+	-DDATADIR=\"${datadir}/pcsxr/\" \
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
- 	-I../../include
+--- plugins/dfsound/Makefile.am.orig	2011-01-21 18:22:58.487759739 +0100
++++ plugins/dfsound/Makefile.am	2011-01-21 18:24:59.271659928 +0100
+@@ -1,15 +1,15 @@
+ AM_CPPFLAGS = -I../../include
  
 -bindir = @libdir@/games/psemu/
 -libdir = @libdir@/games/psemu/
@@ -15,16 +10,24 @@
  
  lib_LTLIBRARIES = libDFSound.la
  
-@@ -13,7 +13,7 @@
- 	alsa.c oss.c nullsnd.c
+ libDFSound_la_SOURCES = spu.c cfg.c dma.c freeze.c registers.c
+ 
+ libDFSound_la_CPPFLAGS = $(AM_CPPFLAGS)
+-libDFSound_la_LDFLAGS = -module -avoid-version 
+-libDFSound_la_LIBADD = -lpthread -lm
++libDFSound_la_LDFLAGS = -module -avoid-version -pthread
++libDFSound_la_LIBADD = -lm
  
- libDFSound_la_CFLAGS =
--libDFSound_la_LDFLAGS = -module -avoid-version -lpthread -lm
-+libDFSound_la_LDFLAGS = -module -avoid-version -pthread -lm
+ if SOUND_ALSA
+ libDFSound_la_SOURCES += alsa.c
+@@ -41,11 +41,11 @@
  
- if HAVE_ALSA
- libDFSound_la_CFLAGS += -DUSEALSA=1
-@@ -29,5 +29,5 @@
+ bin_PROGRAMS = cfgDFSound
+ cfgDFSound_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+-	-DDATADIR=\"${datadir}/psemu/\" \
++	-DDATADIR=\"${datadir}/pcsxr/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) $(AM_CPPFLAGS)
+ cfgDFSound_SOURCES = spucfg-0.1df/main.c
  cfgDFSound_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
  
  glade_DATA = spucfg-0.1df/dfsound.glade2
diff --git a/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
index e1b9ccf5b67a..1367ad217314 100644
--- a/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
+++ b/emulators/pcsxr/files/patch-plugins-dfxvideo-Makefile.am
@@ -1,12 +1,12 @@
---- plugins/dfxvideo/Makefile.am.orig	2010-05-25 06:01:00.630057102 +0000
-+++ plugins/dfxvideo/Makefile.am	2010-05-25 05:59:52.000000000 +0000
-@@ -8,13 +8,13 @@
+--- plugins/dfxvideo/Makefile.am.orig	2011-01-21 18:16:02.202890852 +0100
++++ plugins/dfxvideo/Makefile.am	2011-01-21 18:17:12.618830029 +0100
+@@ -7,13 +7,13 @@
+ 	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
  
- INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
- 	-DLOCALE_DIR=\"${datadir}/locale/\" \
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 -	-DDATADIR=\"${datadir}/psemu/\" \
 +	-DDATADIR=\"${datadir}/pcsxr/\" \
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
  	-I../../libpcsxcore \
  	-I../../include
  
@@ -17,8 +17,8 @@
  
  lib_LTLIBRARIES = libDFXVideo.la
  
-@@ -32,5 +32,5 @@
- cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -L/usr/X11R6/lib -lXext
+@@ -30,5 +30,5 @@
+ cfgDFXVideo_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS) -lXext
  
  glade_DATA = gpucfg-0.1df/dfxvideo.glade2
 -gladedir = $(datadir)/psemu/
diff --git a/emulators/pcsxr/files/patch-plugins-gxvideo-Makefile.am b/emulators/pcsxr/files/patch-plugins-gxvideo-Makefile.am
new file mode 100644
index 000000000000..4a080cde6d87
--- /dev/null
+++ b/emulators/pcsxr/files/patch-plugins-gxvideo-Makefile.am
@@ -0,0 +1,26 @@
+--- plugins/gxvideo/Makefile.am.orig	2011-01-25 16:43:11.515454304 +0100
++++ plugins/gxvideo/Makefile.am	2011-01-25 16:44:47.751561128 +0100
+@@ -7,13 +7,13 @@
+ 	$(STRIP_FPIC) $(NASM) -f elf -d ELF -I${srcdir}/ $<
+ 
+ AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
+-	-DDATADIR=\"${datadir}/psemu/\" \
++	-DDATADIR=\"${datadir}/pcsxr/\" \
+ 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+ 	-I../../libpcsxcore \
+ 	-I../../include
+ 
+-bindir = @libdir@/games/psemu/
+-libdir = @libdir@/games/psemu/
++bindir = @libdir@/pcsxr/
++libdir = @libdir@/pcsxr/
+ 
+ noinst_LTLIBRARIES = libcfg.la libglobals.la
+ libcfg_la_SOURCES = cfg.c
+@@ -35,5 +35,5 @@
+ cfgGXVideo_LDADD = libcfg.la libglobals.la $(GTK2_LIBS) $(GLADE2_LIBS) -lXext 
+ 
+ glade_DATA = gpucfg/gxvideo.glade
+-gladedir = $(datadir)/psemu/
++gladedir = $(datadir)/pcsxr
+ EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am b/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
index cb65a3f6cd08..df78277005c1 100644
--- a/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
+++ b/emulators/pcsxr/files/patch-plugins-peopsxgl-Makefile.am
@@ -1,12 +1,12 @@
---- plugins/peopsxgl/Makefile.am.orig	2010-05-25 06:02:09.577693393 +0000
-+++ plugins/peopsxgl/Makefile.am	2010-05-25 06:00:10.000000000 +0000
+--- plugins/peopsxgl/Makefile.am.orig	2011-01-21 18:18:40.882339497 +0100
++++ plugins/peopsxgl/Makefile.am	2011-01-21 18:20:06.105901151 +0100
 @@ -1,11 +1,11 @@
- INCLUDES = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
+ AM_CPPFLAGS = -DPIXMAPDIR=\"${datadir}/pixmaps/\" \
  	-DLOCALE_DIR=\"${datadir}/locale/\" \
 -	-DDATADIR=\"${datadir}/psemu/\" \
 +	-DDATADIR=\"${datadir}/pcsxr/\" \
- 	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) -I/usr/X11R6/include \
- 	-I../../libpcsxcore -I../../include -fPIC
+ 	$(GTK2_CFLAGS) \
+ 	-I../../libpcsxcore -I../../include
  
 -bindir = @libdir@/games/psemu/
 -libdir = @libdir@/games/psemu/
@@ -15,10 +15,10 @@
  
  lib_LTLIBRARIES = libpeopsxgl.la
  
-@@ -20,5 +20,5 @@
- cfgpeopsxgl_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+@@ -19,5 +19,5 @@
+ cfgpeopsxgl_LDADD = $(GTK2_LIBS)
  
- #glade_DATA = gpucfg-0.1df/peopsxgl.glade2
--#gladedir = $(datadir)/psemu/
-+#gladedir = $(datadir)/pcsxr/
- #EXTRA_DIST = $(glade_DATA)
+ glade_DATA = gpucfg/peopsxgl.ui
+-gladedir = $(datadir)/psemu/
++gladedir = $(datadir)/pcsxr/
+ EXTRA_DIST = $(glade_DATA)
diff --git a/emulators/pcsxr/pkg-plist b/emulators/pcsxr/pkg-plist
index f0a6ba8e7e87..ed1f3d6f3247 100644
--- a/emulators/pcsxr/pkg-plist
+++ b/emulators/pcsxr/pkg-plist
@@ -1,11 +1,21 @@
 bin/pcsx
+%%NLS%%share/locale/fr_FR/LC_MESSAGES/pcsx.mo
+%%NLS%%share/locale/it/LC_MESSAGES/pcsx.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/pcsx.mo
+%%NLS%%share/locale/ru_RU/LC_MESSAGES/pcsx.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pcsx.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pcsx.mo
+%%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ru_RU
+share/pcsxr/dfcdrom.glade2
 share/pcsxr/dfbinimage.glade2
 share/pcsxr/dfsound.glade2
 share/pcsxr/dfxvideo.glade2
-share/pcsxr/dfinput.glade2
+share/pcsxr/gxvideo.glade
+share/pcsxr/sio1.glade2
+share/pcsxr/peopsxgl.ui
+share/pcsxr/dfinput.ui
+share/pcsxr/dfnet.ui
 share/pcsxr/pcsx.glade2
 share/pcsxr/pcsx.jpg
 @dirrm share/pcsxr
@@ -15,7 +25,11 @@ share/applications/pcsx.desktop
 lib/pcsxr/cfgDFXVideo
 lib/pcsxr/cfgpeopsxgl
 lib/pcsxr/cfgDFInput
+lib/pcsxr/cfgDFCdrom
 lib/pcsxr/cfgDFSound
+lib/pcsxr/cfgDFNet
+lib/pcsxr/cfgGXVideo
+lib/pcsxr/cfgBladeSio1
 lib/pcsxr/libDFXVideo.a
 lib/pcsxr/libDFXVideo.la
 lib/pcsxr/libDFXVideo.so
@@ -28,9 +42,21 @@ lib/pcsxr/libDFInput.so
 lib/pcsxr/libDFSound.a
 lib/pcsxr/libDFSound.la
 lib/pcsxr/libDFSound.so
+lib/pcsxr/libDFCdrom.a
+lib/pcsxr/libDFCdrom.la
+lib/pcsxr/libDFCdrom.so
 lib/pcsxr/libDFBinImage2.a
 lib/pcsxr/libDFBinImage2.la
 lib/pcsxr/libDFBinImage2.so
+lib/pcsxr/libDFNet.a
+lib/pcsxr/libDFNet.la
+lib/pcsxr/libDFNet.so
+lib/pcsxr/libGXVideo.a
+lib/pcsxr/libGXVideo.la
+lib/pcsxr/libGXVideo.so
+lib/pcsxr/libBladeSio1.a
+lib/pcsxr/libBladeSio1.la
+lib/pcsxr/libBladeSio1.so
 @dirrm lib/pcsxr
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true