Use tr to handle differences between unzip implementations.

10 files changed, 94 insertions, 78 deletions

diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index c1b9646588c..c4b864a1893 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2014/09/24 12:49:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.37 2014/09/27 09:46:24 jperkin Exp $
 
 DISTNAME=	luma-3.0.7
 CATEGORIES=	databases
@@ -21,6 +21,12 @@ SUBST_FILES.luma=	luma/luma.py
 SUBST_SED.luma=		-e "s|@PATH@|${PREFIX}/${PYSITELIB}/luma|"
 SUBST_MESSAGE.luma=	Adding library path to luma.
 
+post-extract:
+	for f in ${WRKSRC}/luma/luma.py ${WRKSRC}/setup.py; do	\
+		${TR} -d '\r' < $${f} > $${f}.new;		\
+		${MV} $${f}.new $${f};				\
+	done
+
 # world-writeable files
 pre-build:
 	${CHMOD} 0644 ${WRKSRC}/data/icons/*/*.{png,svg}
diff --git a/databases/luma/distinfo b/databases/luma/distinfo
index 66ac355d43f..71e2ad79f92 100644
--- a/databases/luma/distinfo
+++ b/databases/luma/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: distinfo,v 1.9 2014/09/27 09:46:24 jperkin Exp $
 
 SHA1 (luma-3.0.7.zip) = 6b82ddc1ac5948b02a2843c3a4dd76cf6c797494
 RMD160 (luma-3.0.7.zip) = 30577b1afae57734c4e1b7fdff0dfc4fd7543001
 Size (luma-3.0.7.zip) = 815984 bytes
-SHA1 (patch-luma_luma.py) = fc0639d17d1b6fcdd97f1c8193b363ee748a6672
-SHA1 (patch-setup.py) = 55809b4ccc654d6a8c75cc3c12f490718caf265f
+SHA1 (patch-luma_luma.py) = fc8e0a171303cc85a5ef7c51d802480ffac8ee6e
+SHA1 (patch-setup.py) = 3e6864a9f1d4a9a88ed47b431717ed37093b9024
diff --git a/databases/luma/patches/patch-luma_luma.py b/databases/luma/patches/patch-luma_luma.py
index 721c4e9e644..57d650871a1 100644
--- a/databases/luma/patches/patch-luma_luma.py
+++ b/databases/luma/patches/patch-luma_luma.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-luma_luma.py,v 1.2 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: patch-luma_luma.py,v 1.3 2014/09/27 09:46:24 jperkin Exp $
 
 Adding luma library path to search path.
 Remove some variables that should be set by __init__.py, but aren't;
@@ -7,24 +7,24 @@ don't know why.
 --- luma/luma.py.orig	2011-05-24 23:09:06.000000000 +0000
 +++ luma/luma.py
 @@ -30,6 +30,8 @@ import StringIO
- import sys

- import traceback

- 

-+sys.path.append("@PATH@")

-+

- failed = 0

- 

- if sys.version_info < (2,6):

+ import sys
+ import traceback
+ 
++sys.path.append("@PATH@")
++
+ failed = 0
+ 
+ if sys.version_info < (2,6):
 @@ -161,9 +163,9 @@ def startApplication(argv, verbose=False
-         #QApplication.setStyle(QStyleFactory.create("plastique"))

-         #QApplication.setPalette(QApplication.style().standardPalette())

- 

--    app.setOrganizationName(appinfo.ORGNAME)

--    app.setApplicationName(appinfo.APPNAME)

--    app.setApplicationVersion(appinfo.VERSION)

-+    #app.setOrganizationName(appinfo.ORGNAME)

-+    #app.setApplicationName(appinfo.APPNAME)

-+    #app.setApplicationVersion(appinfo.VERSION)

-     app.setWindowIcon(QIcon(':/icons/128/luma'))

- 

-     # Setup the logging mechanism

+         #QApplication.setStyle(QStyleFactory.create("plastique"))
+         #QApplication.setPalette(QApplication.style().standardPalette())
+ 
+-    app.setOrganizationName(appinfo.ORGNAME)
+-    app.setApplicationName(appinfo.APPNAME)
+-    app.setApplicationVersion(appinfo.VERSION)
++    #app.setOrganizationName(appinfo.ORGNAME)
++    #app.setApplicationName(appinfo.APPNAME)
++    #app.setApplicationVersion(appinfo.VERSION)
+     app.setWindowIcon(QIcon(':/icons/128/luma'))
+ 
+     # Setup the logging mechanism
diff --git a/databases/luma/patches/patch-setup.py b/databases/luma/patches/patch-setup.py
index 36e1a414174..851a7d18071 100644
--- a/databases/luma/patches/patch-setup.py
+++ b/databases/luma/patches/patch-setup.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.3 2014/09/24 12:49:38 jperkin Exp $
+$NetBSD: patch-setup.py,v 1.4 2014/09/27 09:46:24 jperkin Exp $
 
 Handle all non-Windows the same for pkgsrc,
 in particular do not handle OS X differently.
@@ -9,29 +9,29 @@ https://sourceforge.net/p/luma/bugs/47/
 --- setup.py.orig	2011-05-25 12:32:02.000000000 +0000
 +++ setup.py
 @@ -146,7 +146,7 @@ if sys.platform.lower().startswith('win'
-     )

- 

- # Mac OS X

--elif sys.platform.lower().startswith('darwin'):

-+elif sys.platform.lower().startswith('darwin_not_in_pkgsrc'):

-     # TODO: add Mac OS X spesifics. (py2app?)

- 

-     # Create the Nroff man page for mac.

+     )
+ 
+ # Mac OS X
+-elif sys.platform.lower().startswith('darwin'):
++elif sys.platform.lower().startswith('darwin_not_in_pkgsrc'):
+     # TODO: add Mac OS X spesifics. (py2app?)
+ 
+     # Create the Nroff man page for mac.
 @@ -159,7 +159,7 @@ elif sys.platform.lower().startswith('da
-     )

- 

- # Linux

--elif sys.platform.lower().startswith('linux'):

-+else:

-     # Include the application icon in various sizes, so that icon themers

-     # can change this as per the iconthemeing standards defined by

-     # freedesktop.org

+     )
+ 
+ # Linux
+-elif sys.platform.lower().startswith('linux'):
++else:
+     # Include the application icon in various sizes, so that icon themers
+     # can change this as per the iconthemeing standards defined by
+     # freedesktop.org
 @@ -183,7 +183,7 @@ elif sys.platform.lower().startswith('li
- 

-     _extras = dict(

-         data_files=_data_files,

--        scripts=['bin/luma']

-+        scripts=['luma/luma.py']

-     )

- 

- if __name__ == '__main__':

+ 
+     _extras = dict(
+         data_files=_data_files,
+-        scripts=['bin/luma']
++        scripts=['luma/luma.py']
+     )
+ 
+ if __name__ == '__main__':
diff --git a/editors/OmegaT/Makefile b/editors/OmegaT/Makefile
index c8afd25c692..b460d0c8b6b 100644
--- a/editors/OmegaT/Makefile
+++ b/editors/OmegaT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/01/01 12:40:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2014/09/27 09:50:17 jperkin Exp $
 #
 
 DISTNAME=	OmegaT_3.0.8_01_Beta_Source
@@ -42,6 +42,10 @@ INSTALLATION_DIRS=	bin \
 
 pre-patch:
 	${INSTALL_DATA} ${FILESDIR}/OmegaT.in ${WRKSRC}/OmegaT
+	for f in ${WRKSRC}/build.xml; do		\
+		${TR} -d '\r' < $${f} > $${f}.new;	\
+		${MV} $${f}.new $${f};			\
+	done
 
 do-build:
 	cd ${WRKSRC} \
diff --git a/editors/OmegaT/distinfo b/editors/OmegaT/distinfo
index b36b3cc36b6..8e55ede7feb 100644
--- a/editors/OmegaT/distinfo
+++ b/editors/OmegaT/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2014/09/24 12:51:06 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2014/09/27 09:50:17 jperkin Exp $
 
 SHA1 (OmegaT_3.0.8_01_Beta_Source.zip) = 75c268711f9e435d93b8e7707b19efc15f3a628e
 RMD160 (OmegaT_3.0.8_01_Beta_Source.zip) = b85cd9d0ca9b952b0de8afa15625ba727b50a474
 Size (OmegaT_3.0.8_01_Beta_Source.zip) = 107647322 bytes
-SHA1 (patch-build.xml) = 4d29dd11fa91d4955b99bd54d622745f92ba57bb
+SHA1 (patch-build.xml) = 0ec9108c02217b541885fbb2a50df87870d9b76b
diff --git a/editors/OmegaT/patches/patch-build.xml b/editors/OmegaT/patches/patch-build.xml
index d59c5073abd..ce6afe067b9 100644
--- a/editors/OmegaT/patches/patch-build.xml
+++ b/editors/OmegaT/patches/patch-build.xml
@@ -1,15 +1,15 @@
-$NetBSD: patch-build.xml,v 1.2 2014/09/24 12:51:06 jperkin Exp $
+$NetBSD: patch-build.xml,v 1.3 2014/09/27 09:50:17 jperkin Exp $
 
---- build.xml.orig	2013-05-28 09:07:44.000000000 +0000
+--- build.xml.orig	2013-05-28 00:07:44.000000000 +0000
 +++ build.xml
 @@ -82,10 +82,6 @@
-         <copy todir="dist/native">

-             <fileset dir="native"/>

-         </copy>

--        <!-- copy scripts to the distribution directory -->

--        <copy todir="dist/scripts">

--            <fileset dir="scripts"/>

--        </copy>

-     </target>

-     

-     <!-- Creates a zip with two localization packs -->

+         <copy todir="dist/native">
+             <fileset dir="native"/>
+         </copy>
+-        <!-- copy scripts to the distribution directory -->
+-        <copy todir="dist/scripts">
+-            <fileset dir="scripts"/>
+-        </copy>
+     </target>
+     
+     <!-- Creates a zip with two localization packs -->
diff --git a/emulators/nestopia/Makefile b/emulators/nestopia/Makefile
index 2ac74a84d77..04cd08012f8 100644
--- a/emulators/nestopia/Makefile
+++ b/emulators/nestopia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2014/05/05 00:47:50 ryoon Exp $
+# $NetBSD: Makefile,v 1.26 2014/09/27 09:54:06 jperkin Exp $
 #
 
 DISTNAME=	Nestopia140src
@@ -27,6 +27,12 @@ SUBST_STAGE.oss=	pre-build
 
 INSTALLATION_DIRS=	bin share/doc/nestopia share/examples/nestopia
 
+pre-patch:
+	for f in ${WRKSRC}/source/core/NstMemory.hpp; do	\
+		${TR} -d '\r' < $${f} > $${f}.new;		\
+		${MV} $${f}.new $${f};				\
+	done
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nst ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README.Linux \
diff --git a/emulators/nestopia/distinfo b/emulators/nestopia/distinfo
index 5025bd40423..d2df952fafe 100644
--- a/emulators/nestopia/distinfo
+++ b/emulators/nestopia/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2014/09/24 12:32:26 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2014/09/27 09:54:06 jperkin Exp $
 
 SHA1 (Nestopia140src.zip) = ef85771132cc8652456727278df36f7068d238e0
 RMD160 (Nestopia140src.zip) = caecb991dfd459093b88b2abb84ac9bbd95ced63
@@ -8,4 +8,4 @@ RMD160 (nst140_lnx_release_h.zip) = f187b2ff44d8a57432cd7b73679a61142b9ff877
 Size (nst140_lnx_release_h.zip) = 250216 bytes
 SHA1 (patch-Makefile) = d3abca01943618fe58d12fac3db2ef2762404aef
 SHA1 (patch-aa) = f598f572056344660c72212900b6b8997d996655
-SHA1 (patch-source_core_NstMemory.hpp) = f8e8f0adc3cf0c4ac0bd8847efc118d1001b1c8d
+SHA1 (patch-source_core_NstMemory.hpp) = 82584af16889d2fd7c00ae601a0364cd0d909f6d
diff --git a/emulators/nestopia/patches/patch-source_core_NstMemory.hpp b/emulators/nestopia/patches/patch-source_core_NstMemory.hpp
index d095dafc1f3..09d653f78a7 100644
--- a/emulators/nestopia/patches/patch-source_core_NstMemory.hpp
+++ b/emulators/nestopia/patches/patch-source_core_NstMemory.hpp
@@ -1,13 +1,13 @@
-$NetBSD: patch-source_core_NstMemory.hpp,v 1.2 2014/09/24 12:32:26 jperkin Exp $
+$NetBSD: patch-source_core_NstMemory.hpp,v 1.3 2014/09/27 09:54:06 jperkin Exp $
 
---- source/core/NstMemory.hpp.orig	2008-03-26 23:31:44.000000000 +0000
+--- source/core/NstMemory.hpp.orig	2012-12-25 16:47:49.000000000 +0000
 +++ source/core/NstMemory.hpp
 @@ -763,7 +763,7 @@ namespace Nes
- 				for (uint i=0; i < MEM_NUM_PAGES; ++i)

- 				{

- 					if (pageData[i*3+0] < NUM_SOURCES)

--						Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );

-+						SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );

- 					else

- 						throw RESULT_ERR_CORRUPT_FILE;

- 				}

+ 				for (uint i=0; i < MEM_NUM_PAGES; ++i)
+ 				{
+ 					if (pageData[i*3+0] < NUM_SOURCES)
+-						Source( pageData[i*3+0] ).SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
++						SwapBank<MEM_PAGE_SIZE>( i * MEM_PAGE_SIZE, pageData[i*3+1] | uint(pageData[i*3+2]) << 8 );
+ 					else
+ 						throw RESULT_ERR_CORRUPT_FILE;
+ 				}