Sat Sep 27 09:54:07 2014 UTC ()
Use tr to handle differences between unzip implementations.


(jperkin)
diff -r1.25 -r1.26 pkgsrc/emulators/nestopia/Makefile
diff -r1.4 -r1.5 pkgsrc/emulators/nestopia/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/nestopia/patches/patch-source_core_NstMemory.hpp
cvs diff -r1.25 -r1.26 pkgsrc/emulators/nestopia/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/nestopia/Makefile 2014/05/05 00:47:50 1.25
+++ pkgsrc/emulators/nestopia/Makefile 2014/09/27 09:54:06 1.26
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.25 2014/05/05 00:47:50 ryoon Exp $ 1# $NetBSD: Makefile,v 1.26 2014/09/27 09:54:06 jperkin Exp $
2# 2#
3 3
4DISTNAME= Nestopia140src 4DISTNAME= Nestopia140src
5PKGNAME= nestopia-1.40h 5PKGNAME= nestopia-1.40h
6PKGREVISION= 20 6PKGREVISION= 20
7CATEGORIES= emulators 7CATEGORIES= emulators
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nestopia/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nestopia/}
9EXTRACT_SUFX= .zip 9EXTRACT_SUFX= .zip
10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} nst140_lnx_release_h.zip 10DISTFILES= ${DISTNAME}${EXTRACT_SUFX} nst140_lnx_release_h.zip
11 11
12SITES.nst140_lnx_release_h.zip= http://rbelmont.mameworld.info/ 12SITES.nst140_lnx_release_h.zip= http://rbelmont.mameworld.info/
13 13
14MAINTAINER= pkgsrc-users@NetBSD.org 14MAINTAINER= pkgsrc-users@NetBSD.org
@@ -17,26 +17,32 @@ COMMENT= Portable, very accurate NES emu @@ -17,26 +17,32 @@ COMMENT= Portable, very accurate NES emu
17 17
18WRKSRC= ${WRKDIR} 18WRKSRC= ${WRKDIR}
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_TOOLS= gmake pkg-config 20USE_TOOLS= gmake pkg-config
21 21
22SUBST_CLASSES+= oss 22SUBST_CLASSES+= oss
23SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO}," 23SUBST_SED.oss= -e "s,/dev/dsp,${DEVOSSAUDIO},"
24SUBST_FILES.oss= source/linux/oss.cpp 24SUBST_FILES.oss= source/linux/oss.cpp
25SUBST_MESSAGE.oss= Fixing path to OSS device. 25SUBST_MESSAGE.oss= Fixing path to OSS device.
26SUBST_STAGE.oss= pre-build 26SUBST_STAGE.oss= pre-build
27 27
28INSTALLATION_DIRS= bin share/doc/nestopia share/examples/nestopia 28INSTALLATION_DIRS= bin share/doc/nestopia share/examples/nestopia
29 29
 30pre-patch:
 31 for f in ${WRKSRC}/source/core/NstMemory.hpp; do \
 32 ${TR} -d '\r' < $${f} > $${f}.new; \
 33 ${MV} $${f}.new $${f}; \
 34 done
 35
30do-install: 36do-install:
31 ${INSTALL_PROGRAM} ${WRKSRC}/nst ${DESTDIR}${PREFIX}/bin 37 ${INSTALL_PROGRAM} ${WRKSRC}/nst ${DESTDIR}${PREFIX}/bin
32 ${INSTALL_DATA} ${WRKSRC}/README.Linux \ 38 ${INSTALL_DATA} ${WRKSRC}/README.Linux \
33 ${DESTDIR}${PREFIX}/share/doc/nestopia 39 ${DESTDIR}${PREFIX}/share/doc/nestopia
34 ${INSTALL_DATA} ${WRKSRC}/readme.html \ 40 ${INSTALL_DATA} ${WRKSRC}/readme.html \
35 ${DESTDIR}${PREFIX}/share/doc/nestopia 41 ${DESTDIR}${PREFIX}/share/doc/nestopia
36 ${INSTALL_DATA} ${WRKSRC}/NstDatabase.xml \ 42 ${INSTALL_DATA} ${WRKSRC}/NstDatabase.xml \
37 ${DESTDIR}${PREFIX}/share/examples/nestopia 43 ${DESTDIR}${PREFIX}/share/examples/nestopia
38 ${INSTALL_DATA} ${WRKSRC}/nstcontrols \ 44 ${INSTALL_DATA} ${WRKSRC}/nstcontrols \
39 ${DESTDIR}${PREFIX}/share/examples/nestopia 45 ${DESTDIR}${PREFIX}/share/examples/nestopia
40 46
41.include "../../audio/alsa-lib/buildlink3.mk" 47.include "../../audio/alsa-lib/buildlink3.mk"
42.include "../../devel/SDL/buildlink3.mk" 48.include "../../devel/SDL/buildlink3.mk"
cvs diff -r1.4 -r1.5 pkgsrc/emulators/nestopia/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/nestopia/distinfo 2014/09/24 12:32:26 1.4
+++ pkgsrc/emulators/nestopia/distinfo 2014/09/27 09:54:06 1.5
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.4 2014/09/24 12:32:26 jperkin Exp $ 1$NetBSD: distinfo,v 1.5 2014/09/27 09:54:06 jperkin Exp $
2 2
3SHA1 (Nestopia140src.zip) = ef85771132cc8652456727278df36f7068d238e0 3SHA1 (Nestopia140src.zip) = ef85771132cc8652456727278df36f7068d238e0
4RMD160 (Nestopia140src.zip) = caecb991dfd459093b88b2abb84ac9bbd95ced63 4RMD160 (Nestopia140src.zip) = caecb991dfd459093b88b2abb84ac9bbd95ced63
5Size (Nestopia140src.zip) = 2346187 bytes 5Size (Nestopia140src.zip) = 2346187 bytes
6SHA1 (nst140_lnx_release_h.zip) = 94a2a911f306514ed725cff68ddbc47bd33b9f99 6SHA1 (nst140_lnx_release_h.zip) = 94a2a911f306514ed725cff68ddbc47bd33b9f99
7RMD160 (nst140_lnx_release_h.zip) = f187b2ff44d8a57432cd7b73679a61142b9ff877 7RMD160 (nst140_lnx_release_h.zip) = f187b2ff44d8a57432cd7b73679a61142b9ff877
8Size (nst140_lnx_release_h.zip) = 250216 bytes 8Size (nst140_lnx_release_h.zip) = 250216 bytes
9SHA1 (patch-Makefile) = d3abca01943618fe58d12fac3db2ef2762404aef 9SHA1 (patch-Makefile) = d3abca01943618fe58d12fac3db2ef2762404aef
10SHA1 (patch-aa) = f598f572056344660c72212900b6b8997d996655 10SHA1 (patch-aa) = f598f572056344660c72212900b6b8997d996655
11SHA1 (patch-source_core_NstMemory.hpp) = f8e8f0adc3cf0c4ac0bd8847efc118d1001b1c8d 11SHA1 (patch-source_core_NstMemory.hpp) = 82584af16889d2fd7c00ae601a0364cd0d909f6d
cvs diff -r1.2 -r1.3 pkgsrc/emulators/nestopia/patches/Attic/patch-source_core_NstMemory.hpp (expand / switch to unified diff)

--- pkgsrc/emulators/nestopia/patches/Attic/patch-source_core_NstMemory.hpp 2014/09/24 12:32:26 1.2
+++ pkgsrc/emulators/nestopia/patches/Attic/patch-source_core_NstMemory.hpp 2014/09/27 09:54:06 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-source_core_NstMemory.hpp,v 1.2 2014/09/24 12:32:26 jperkin Exp $ 1$NetBSD: patch-source_core_NstMemory.hpp,v 1.3 2014/09/27 09:54:06 jperkin Exp $
2 2
3--- source/core/NstMemory.hpp.orig 2008-03-26 23:31:44.000000000 +0000 3--- source/core/NstMemory.hpp.orig 2012-12-25 16:47:49.000000000 +0000
4+++ source/core/NstMemory.hpp 4+++ source/core/NstMemory.hpp
5@@ -763,7 +763,7 @@ namespace Nes 5@@ -763,7 +763,7 @@ namespace Nes
6 for (uint i=0; i < MEM_NUM_PAGES; ++i)  6 for (uint i=0; i < MEM_NUM_PAGES; ++i)
7 {  7 {
8 if (pageData[i*3+0] < NUM_SOURCES)  8 if (pageData[i*3+0] < NUM_SOURCES)
9- Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );  9- Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
10+ SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );  10+ SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
11 else  11 else
12 throw RESULT_ERR_CORRUPT_FILE;  12 throw RESULT_ERR_CORRUPT_FILE;
13 }  13 }