From b9b0e0b58c9ca629d15fbf89eeb0d872ef675008 Mon Sep 17 00:00:00 2001 From: Ganael LAPLANCHE Date: Thu, 3 Nov 2011 13:32:58 +0000 Subject: [PATCH] - Fix dfbinimage2 CD handling (program identification) - Swap LICENSE and *DEPENDS to make portlint happy --- emulators/pcsxr/Makefile | 6 +++--- .../files/patch-plugins-dfbinimage2-CDInterface.hpp | 12 ++++++++++++ .../pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp | 11 +++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp create mode 100644 emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp diff --git a/emulators/pcsxr/Makefile b/emulators/pcsxr/Makefile index 75aa67f0b238..af104fd8ae2f 100644 --- a/emulators/pcsxr/Makefile +++ b/emulators/pcsxr/Makefile @@ -7,7 +7,7 @@ PORTNAME= pcsxr PORTVERSION= 1.9.92.r68256 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \ LOCAL/martymac @@ -18,12 +18,12 @@ EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= martymac@FreeBSD.org COMMENT= Playstation (PSX) emulator +LICENSE= GPLv2 + BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ cdio.12:${PORTSDIR}/sysutils/libcdio -LICENSE= GPLv2 - ONLY_FOR_ARCHS= i386 amd64 USE_BZIP2= yes diff --git a/emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp new file mode 100644 index 000000000000..0e663bcf6535 --- /dev/null +++ b/emulators/pcsxr/files/patch-plugins-dfbinimage2-CDInterface.hpp @@ -0,0 +1,12 @@ +--- 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-Utils.cpp b/emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp new file mode 100644 index 000000000000..b01304bb386b --- /dev/null +++ b/emulators/pcsxr/files/patch-plugins-dfbinimage2-Utils.cpp @@ -0,0 +1,11 @@ +--- 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;