13 files changed, 4 insertions, 226 deletions

diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile
index 5752d3d225b4..576e7df2cffc 100644
--- a/emulators/pcsxr/Makefile
+++ b/emulators/pcsxr/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	pcsxr
-PORTVERSION=	1.9.92.r68256
-PORTREVISION=	4
+PORTVERSION=	1.9.92.r76026
 CATEGORIES=	emulators
 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}
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Playstation (PSX) emulator
@@ -67,11 +64,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-# Extract dfbinimage2 plugin
-post-extract:
-	@(cd ${WRKSRC} && \
-		${TAR} -xjf ${DISTDIR}/pcsx-df-1.10-plugin-dfbinimage2${EXTRACT_SUFX})
-
 # Add ${PREFIX} to plugins' lookup directories and set default CDROM device
 post-patch:
 	@${REINPLACE_CMD} "s|%%PREFIX%%|${PREFIX}|" \
diff --git a/emulators/pcsxr/distinfo b/emulators/pcsxr/distinfo
index d1b5be77042f..a69ab0cc05cf 100644
--- a/emulators/pcsxr/distinfo
+++ b/emulators/pcsxr/distinfo
@@ -1,4 +1,2 @@
-SHA256 (pcsxr-1.9.92.r68256.tar.bz2) = 235ef8e4d3612253f0f24cf3046408a502a71d5b4df8d68c04e66830c9830e0b
-SIZE (pcsxr-1.9.92.r68256.tar.bz2) = 1482379
-SHA256 (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 175b71a0a6aff1defdf4d8f9246fcc259fb72876c7ba0bcf607b1e1228fa5a9f
-SIZE (pcsx-df-1.10-plugin-dfbinimage2.tar.bz2) = 40654
+SHA256 (pcsxr-1.9.92.r76026.tar.bz2) = ba9685bedf0e2be82687a20d56231c61693c2434ac63b33fe60bbc50b98d8577
+SIZE (pcsxr-1.9.92.r76026.tar.bz2) = 1468744
diff --git a/emulators/pcsxr/files/patch-Makefile.am b/emulators/pcsxr/files/patch-Makefile.am
deleted file mode 100644
index 753861a616eb..000000000000
--- a/emulators/pcsxr/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
- 
diff --git a/emulators/pcsxr/files/patch-configure.ac b/emulators/pcsxr/files/patch-configure.ac
index 84b3f6a243a4..d626a7ee3e8b 100644
--- a/emulators/pcsxr/files/patch-configure.ac
+++ b/emulators/pcsxr/files/patch-configure.ac
@@ -8,11 +8,3 @@
  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-plugins-dfbinimage2-CDInterface.hpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp
deleted file mode 100644
index 0e663bcf6535..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- plugins/dfbinimage2/CDInterface.hpp.orig	2011-07-20 07:24:23.758738346 +0200
-+++ plugins/dfbinimage2/CDInterface.hpp	2011-07-20 07:26:37.053050612 +0200
-@@ -46,7 +46,8 @@
-             // track info.  fyi, tester is my testing/development program.
-             std::string programName = getProgramName();
-             if ( programName == "epsxe" || programName == "pcsx"  ||
--                 programName == "pcsx2" || programName == "tester" )
-+                 programName == "pcsx2" || programName == "tester"||
-+                 programName == "pcsxr" )
-                 tdtnformat = fsmint;
-             else
-                 tdtnformat = msfbcd;
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp
deleted file mode 100644
index edfe4aa32adb..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-FileInterface.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- plugins/dfbinimage2/FileInterface.cpp.orig	2011-07-01 06:50:32.771525631 +0200
-+++ plugins/dfbinimage2/FileInterface.cpp	2011-07-01 08:34:37.050364589 +0200
-@@ -35,7 +35,9 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
--#include <linux/cdrom.h>
-+#include <sys/cdio.h>
-+
-+#define CDROM_LEADOUT  0xAA
- 
- extern Preferences prefs;
- 
-@@ -462,15 +464,15 @@
-         THROW(e);
-     }
-     fileName = str;
--    struct cdrom_tocentry tocEntry;
-+    struct ioc_read_toc_single_entry tocEntry;
-     memset(&tocEntry, 0, sizeof(tocEntry));
--    tocEntry.cdte_track = CDROM_LEADOUT;
--    tocEntry.cdte_format = CDROM_LBA;
--    if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
-+    tocEntry.track = CDROM_LEADOUT;
-+    tocEntry.address_format = CD_LBA_FORMAT;
-+    if(ioctl(theFd, CDIOREADTOCENTRY, &tocEntry) < 0) {
-         Exception e(std::string("Cannot read TOC: ") + str);
-         THROW(e);
-     }
--    CDLength = CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame) + CDTime(0,2,0);
-+    CDLength = CDTime(tocEntry.entry.addr.lba, CDTime::abFrame) + CDTime(0,2,0);
-     bufferPos.setMSF(MSFTime(255,255,255));
- }
- 
-@@ -482,9 +484,9 @@
-     char *buf = (char*)fileBuffer;
-     int cnt;
-     for(cnt = 0; cnt < bufferFrames; cnt++) {
--        memcpy(buf, seekTime.getMSFbuf(), 3);
--        if(ioctl(theFd, CDROMREADRAW, buf)<0)
--            break;
-+        if (pread(theFd, buf, bytesPerFrame, seekTime.getAbsoluteFrame() * bytesPerFrame) != bytesPerFrame) {
-+            break;
-+        }
-         buf += bytesPerFrame;
-         seekTime += CDTime(0,0,1);
-     }
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am b/emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am
deleted file mode 100644
index c0c9ac06608c..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
---- plugins/dfbinimage2/Makefile.am.orig	2009-03-29 02:25:30.000000000 +0000
-+++ plugins/dfbinimage2/Makefile.am	2010-05-21 17:20:40.227057628 +0000
-@@ -1,17 +1,18 @@
--INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsx/\" \
-+INCLUDES = -DPACKAGE_DATA_DIR=\"${datadir}/pcsxr/\" \
- 	-DPIXMAPDIR=\"${datadir}/pixmaps/\" \
- 	-DLOCALE_DIR=\"${datadir}/locale/\" \
- 	-D__LINUX__ \
- 	-DREVISION=3 \
- 	-DBUILD=0 \
--	-DDATADIR=\"${datadir}/psemu/\" \
-+	-DDATADIR=\"${datadir}/pcsxr/\" \
- 	`pkg-config --cflags sdl vorbisfile libglade-2.0 gtk+-2.0`
- 
--libdir = $(prefix)/lib/games/psemu/
-+libdir = @libdir@/pcsxr/
- lib_LTLIBRARIES = libDFBinImage2.la
--libDFBinImage2_la_LIBADD  = -lstdc++ -lz -lbz2 -lpthread -lvorbis
-+libDFBinImage2_la_LIBADD  = -lstdc++ -lz -lbz2 -lvorbis
- libDFBinImage2_la_LDFLAGS = -module -avoid-version \
--	`pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0`
-+	`pkg-config --libs sdl vorbisfile libglade-2.0 gtk+-2.0` \
-+	-pthread
- libDFBinImage2_la_SOURCES = About.cpp PlayCDDAData.cpp \
- 	CDDAData.hpp ConfigCallbacks.cpp ConfigCallbacks.hpp \
- 	ConfigFunctions.cpp TrackParser.cpp TrackParser.hpp \
-@@ -23,7 +24,7 @@
- 	defines.h externs.h
- 
- glade_DATA = dfbinimage.glade2
--gladedir = $(datadir)/psemu/
-+gladedir = $(datadir)/pcsxr/
- EXTRA_DIST = $(glade_DATA) CDInterface.hpp CDTime.hpp Exception.hpp \
- 	Frame.hpp TimeCache.hpp TrackInfo.hpp \
- 	OGG_README.txt notes.txt
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp
deleted file mode 100644
index 817accb7f34d..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Open.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/dfbinimage2/Open.cpp.orig	2010-04-20 06:08:48.510837620 +0000
-+++ plugins/dfbinimage2/Open.cpp	2010-04-20 06:09:12.454669867 +0000
-@@ -150,7 +150,7 @@
-    return theCD->stopTrack();
- }
- 
--#if defined _WINDOWS || defined __CYGWIN32__
-+#if defined _WINDOWS || defined __CYGWIN32__ || defined __FreeBSD__
- 
- long CALLBACK CDRgetStatus(struct CdrStat *stat) 
- {
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp
deleted file mode 100644
index 231afb67b2bd..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-TrackParser.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
---- plugins/dfbinimage2/TrackParser.cpp.orig	2010-04-15 06:30:33.334174874 +0000
-+++ plugins/dfbinimage2/TrackParser.cpp	2010-04-15 18:38:51.436143280 +0000
-@@ -30,7 +30,7 @@
- #include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/ioctl.h>
--#include <linux/cdrom.h>
-+#include <sys/cdio.h>
- 
- using namespace std;
- 
-@@ -282,25 +282,25 @@
-         Exception e(std::string("Cannot open device: ") + cuename);
-         THROW(e);
-     }
--    struct cdrom_tochdr tocHdr;
--    if(ioctl(theFd, CDROMREADTOCHDR, &tocHdr) < 0) {
-+    struct ioc_toc_header tocHdr;
-+    if(ioctl(theFd, CDIOREADTOCHEADER, &tocHdr) < 0) {
-         close(theFd);
-         Exception e(std::string("Cannot read TOC: ") + cuename);
-         THROW(e);
-     }
--    struct cdrom_tocentry tocEntry;
--    for(int i = tocHdr.cdth_trk0; i <= tocHdr.cdth_trk1; i++) {
-+    struct ioc_read_toc_single_entry tocEntry;
-+    for(int i = tocHdr.starting_track; i <= tocHdr.ending_track; i++) {
-         memset(&tocEntry, 0, sizeof(tocEntry));
--        tocEntry.cdte_track = i;
--        tocEntry.cdte_format = CDROM_LBA;
--        if(ioctl(theFd, CDROMREADTOCENTRY, &tocEntry) < 0) {
-+        tocEntry.track = i;
-+        tocEntry.address_format = CD_LBA_FORMAT;
-+        if(ioctl(theFd, CDIOREADTOCENTRY, &tocEntry) < 0) {
-             close(theFd);
-             Exception e(std::string("Cannot read TOC: ") + cuename);
-             THROW(e);
-         }
-         TrackInfo thisTrack;
-         thisTrack.trackNumber = i;
--        thisTrack.trackStart = CDTime(tocEntry.cdte_addr.lba, CDTime::abFrame);
-+        thisTrack.trackStart = CDTime(tocEntry.entry.addr.lba, CDTime::abFrame);
-         tiv.push_back(thisTrack);
-     }
-     close(theFd);
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp
deleted file mode 100644
index b01304bb386b..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/dfbinimage2/Utils.cpp.orig	2011-07-20 07:24:34.070495566 +0200
-+++ plugins/dfbinimage2/Utils.cpp	2011-07-20 07:24:48.493222477 +0200
-@@ -124,7 +124,7 @@
- #else
-    char* buf = getenv("_");
-    if (buf == NULL)
--      return "pcsx";
-+      return "pcsxr";
- #endif
-    else
-       toReturn = buf;
diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h b/emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h
deleted file mode 100644
index 65d175fed2f1..000000000000
--- a/emulators/pcsxr/files/patch-plugins-dfbinimage2-defines.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- plugins/dfbinimage2/defines.h.orig	2010-04-20 06:30:12.862325658 +0000
-+++ plugins/dfbinimage2/defines.h	2010-04-20 06:30:50.977164904 +0000
-@@ -126,7 +126,9 @@
-     HWND          HWnd;        // Window handle
-     HINSTANCE     HInstance;
- } FPSEWin32;
-+#endif
- 
-+#if defined _WINDOWS || defined __CYGWIN32__ || defined __FreeBSD__
- // cdr stat struct
- struct CdrStat
- {
-@@ -134,7 +136,6 @@
-  unsigned long Status;
-  unsigned char Time[3]; // current playing time
- };
--
- #endif
- 
- // Main Struct for initialization
diff --git a/emulators/pcsxr/pkg-descr b/emulators/pcsxr/pkg-descr
index 93ff373b9d56..98b4b1916faa 100644
--- a/emulators/pcsxr/pkg-descr
+++ b/emulators/pcsxr/pkg-descr
@@ -3,8 +3,4 @@ Pcsx-reloaded is a Playstation (PSX) emulator.
 It is an improved version of pcsx-df, which is
 itself of fork of pcsx.
 
-The FreeBSD port includes the dfbinimage2 plugin,
-allowing the use of your favorite backups as .bin
-image files.
-
 WWW: http://pcsxr.codeplex.com
diff --git a/emulators/pcsxr/pkg-plist b/emulators/pcsxr/pkg-plist
index 547608a2c1db..a2c44cd8fb61 100644
--- a/emulators/pcsxr/pkg-plist
+++ b/emulators/pcsxr/pkg-plist
@@ -10,8 +10,6 @@ bin/pcsxr
 %%NLS%%@dirrmtry share/locale/hu_HU
 %%NLS%%@dirrmtry share/locale/ru_RU/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/ru_RU
-share/pcsxr/dfbinimage.glade2
-share/pcsxr/gxvideo.glade
 share/pcsxr/peopsxgl.ui
 share/pcsxr/dfinput.ui
 share/pcsxr/dfnet.ui
@@ -40,7 +38,6 @@ 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
@@ -57,15 +54,9 @@ 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