[47829] trunk/dports/emulators/nonpareil

krischik at macports.org krischik at macports.org
Sat Mar 7 05:25:40 PST 2009


Revision: 47829
          http://trac.macports.org/changeset/47829
Author:   krischik at macports.org
Date:     2009-03-07 05:25:40 -0800 (Sat, 07 Mar 2009)
Log Message:
-----------
Add Voyager variant; Add Debugger variant; Use distfiles for large patches and appbundels.

Modified Paths:
--------------
    trunk/dports/emulators/nonpareil/Portfile

Added Paths:
-----------
    trunk/dports/emulators/nonpareil/files/patch-image-voyager.diff
    trunk/dports/emulators/nonpareil/files/patch-kml-voyager.diff
    trunk/dports/emulators/nonpareil/files/patch-rom-voyager.diff
    trunk/dports/emulators/nonpareil/files/patch-src-voyager.diff

Removed Paths:
-------------
    trunk/dports/emulators/nonpareil/files/HP-21.app/
    trunk/dports/emulators/nonpareil/files/HP-25.app/
    trunk/dports/emulators/nonpareil/files/HP-32E.app/
    trunk/dports/emulators/nonpareil/files/HP-33C.app/
    trunk/dports/emulators/nonpareil/files/HP-34C.app/
    trunk/dports/emulators/nonpareil/files/HP-35.app/
    trunk/dports/emulators/nonpareil/files/HP-37E.app/
    trunk/dports/emulators/nonpareil/files/HP-38C.app/
    trunk/dports/emulators/nonpareil/files/HP-38E.app/
    trunk/dports/emulators/nonpareil/files/HP-41CV.app/
    trunk/dports/emulators/nonpareil/files/HP-41CX.app/
    trunk/dports/emulators/nonpareil/files/HP-45.app/
    trunk/dports/emulators/nonpareil/files/HP-55.app/
    trunk/dports/emulators/nonpareil/files/HP-80.app/

Property Changed:
----------------
    trunk/dports/emulators/nonpareil/


Property changes on: trunk/dports/emulators/nonpareil
___________________________________________________________________
Modified: svn:ignore
   - .backups

   + .backups
work


Modified: trunk/dports/emulators/nonpareil/Portfile
===================================================================
--- trunk/dports/emulators/nonpareil/Portfile	2009-03-07 13:17:38 UTC (rev 47828)
+++ trunk/dports/emulators/nonpareil/Portfile	2009-03-07 13:25:40 UTC (rev 47829)
@@ -2,11 +2,11 @@
 # $Id$
 # vim: set fileencoding=utf-8 tabstop=4 shiftwidth=4 softtabstop=4 noexpandtab filetype=tcl :
 
-PortSystem 1.0
+PortSystem			1.0
 
-name				nonpareil	
+name				nonpareil
 version				0.79
-#revision			4
+revision			1
 platforms			darwin
 categories			emulators
 maintainers			krischik at me.com
@@ -22,25 +22,38 @@
 					algorithms from the calculator.
 
 homepage			http://nonpareil.brouhaha.com/
-master_sites		http://nonpareil.brouhaha.com/download
-
+master_sites		http://nonpareil.brouhaha.com/download:prog \
+					macports:nonpareil:appbundles				\
+					macports:nonpareil:voyager
+				
+set patchversion	47826
 set prog			nonpareil-${version}.tar.gz
+set appbundles		nonpareil-appbundles-r${patchversion}.tar.gz
 
-distfiles			${prog}
+distfiles			${prog}:prog				\
+					${appbundles}:appbundles
 
-checksums			${prog} sha1 83bc2f57e6ece9ce19e3449cce075ef246a9f4c2
+checksums			${prog} \
+					md5		4274dee70d9633304194a904b2573489 \
+					sha1	83bc2f57e6ece9ce19e3449cce075ef246a9f4c2 \
+					rmd160	0bbf88e7c4614ac757bebbc1089804bea088d181 \
+					${appbundles} \
+					md5		b71f77851f4204b984b80e57c4ad7e65 \
+					sha1	4798b1ae8a56275a4c2eb4df54f352c457f1ff0a \
+					rmd160	f0aa0eea748297f652f08c239fe1922b9f61e31d \
 
-depends_lib			port:bison								\
-					port:flex								\
-					port:glib2								\
+depends_lib			port:glib2								\
 					port:gtk2								\
 					port:libxml2							\
-					port:netpbm								\
+					port:netpbm
+
+depends_build		port:bison								\
+					port:flex								\
 					port:pkgconfig							\
 					port:python23							\
-					port:scons								
+					port:scons
 
-patchfiles          patch-src-util.diff
+patchfiles			patch-src-util.diff
 
 worksrcdir			${name}-${version}
 use_parallel_build	yes
@@ -50,7 +63,7 @@
 build.target
 
 destroot.cmd		"scons-local/scons.py"
-build.args			prefix=${prefix} destdir=${destroot}
+destroot.args		prefix=${prefix} destdir=${destroot}
 
 post-extract {
 	system "cd ${workpath}/${name}-${version}/scons-local; tar -xzf scons-local-0.96.90.tar.gz"
@@ -58,285 +71,57 @@
 
 platform macosx {
 	post-destroot {
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-21.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/Resources
+		xinstall -d ${destroot}${applications_dir}/Nonpareil
+		foreach calc {HP-21 HP-25 HP-32E HP-33C HP-34C HP-37E HP-38C HP-38E HP-41CV HP-41CX HP-45 HP-55 HP-80} {
+			copy														\
+				${workpath}/appbundles-r${patchversion}/${calc}.app	\
+				${destroot}${applications_dir}/Nonpareil
+			reinplace s|@PREFIX@|${prefix}|g \
+				${destroot}${applications_dir}/Nonpareil/${calc}.app/Contents/MacOS/${calc}.command
+		}
+	}
+}
 
-	xinstall -m 644 -W ${filespath}																\
-		HP-21.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-21.app/Contents/Resources/HP-21.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/Resources/HP-21.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-21.app/Contents/MacOS/HP-21.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/MacOS/HP-21.command
+variant voyager														\
+	description "Include Voyager Models (Not GPL licenced)!"		{
 
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-21.app/Contents/MacOS/HP-21.command
+	set voyager				nonpareil-voyager-r${patchversion}.tar.gz
 
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-25.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/Resources
+	distfiles-append		${voyager}:voyager
 
-	xinstall -m 644 -W ${filespath}																\
-		HP-25.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-25.app/Contents/Resources/HP-25.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/Resources/HP-25.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-25.app/Contents/MacOS/HP-25.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/MacOS/HP-25.command
+	checksums-append		${voyager} \
+							md5		fbb227a28045c0bf8165bba86f199ec9 \
+							sha1	8a51f656a523c5739d82a35ad933f8c448be58e6 \
+							rmd160	4f7fec5af3b387fd6a7df44ce0a7b019eeb4a253
 
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-25.app/Contents/MacOS/HP-25.command
+	depends_build-append	port:p7zip	\
+							port:netpbm
 
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-32E.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/Resources
+	patchfiles-append		patch-image-voyager.diff	\
+							patch-kml-voyager.diff		\
+							patch-rom-voyager.diff		\
+							patch-src-voyager.diff
 
-	xinstall -m 644 -W ${filespath}																\
-		HP-32E.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-32E.app/Contents/Resources/HP-32E.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/Resources/HP-32E.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-32E.app/Contents/MacOS/HP-32E.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/MacOS/HP-32E.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-32E.app/Contents/MacOS/HP-32E.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-33C.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-33C.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-33C.app/Contents/Resources/HP-33C.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/Resources/HP-33C.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-33C.app/Contents/MacOS/HP-33C.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/MacOS/HP-33C.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-33C.app/Contents/MacOS/HP-33C.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-34C.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-34C.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-34C.app/Contents/Resources/HP-34C.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/Resources/HP-34C.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-34C.app/Contents/MacOS/HP-34C.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/MacOS/HP-34C.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-34C.app/Contents/MacOS/HP-34C.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-35.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-35.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-35.app/Contents/Resources/HP-35.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/Resources/HP-35.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-35.app/Contents/MacOS/HP-35.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/MacOS/HP-35.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-35.app/Contents/MacOS/HP-35.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-37E.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-37E.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-37E.app/Contents/Resources/HP-37E.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/Resources/HP-37E.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-37E.app/Contents/MacOS/HP-37E.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/MacOS/HP-37E.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-37E.app/Contents/MacOS/HP-37E.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38C.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-38C.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-38C.app/Contents/Resources/HP-38C.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/Resources/HP-38C.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-38C.app/Contents/MacOS/HP-38C.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/MacOS/HP-38C.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-38C.app/Contents/MacOS/HP-38C.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38E.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-38E.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-38E.app/Contents/Resources/HP-38E.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/Resources/HP-38E.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-38E.app/Contents/MacOS/HP-38E.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/MacOS/HP-38E.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-38E.app/Contents/MacOS/HP-38E.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CV.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-41CV.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-41CV.app/Contents/Resources/HP-41CV.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/Resources/HP-41CV.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-41CV.app/Contents/MacOS/HP-41CV.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/MacOS/HP-41CV.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-41CV.app/Contents/MacOS/HP-41CV.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CX.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-41CX.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-41CX.app/Contents/Resources/HP-41CX.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/Resources/HP-41CX.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-41CX.app/Contents/MacOS/HP-41CX.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/MacOS/HP-41CX.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-41CX.app/Contents/MacOS/HP-41CX.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-45.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-45.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-45.app/Contents/Resources/HP-45.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/Resources/HP-45.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-45.app/Contents/MacOS/HP-45.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/MacOS/HP-45.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-45.app/Contents/MacOS/HP-45.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-55.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-55.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-55.app/Contents/Resources/HP-55.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/Resources/HP-55.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-55.app/Contents/MacOS/HP-55.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/MacOS/HP-55.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-55.app/Contents/MacOS/HP-55.command
-
-	xinstall -m 775 -d ${destroot}${applications_dir}
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-80.app
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/MacOS
-	xinstall -m 755 -d ${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/Resources
-
-	xinstall -m 644 -W ${filespath}																\
-		HP-80.app/Contents/Info.plist													\
-		${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/Info.plist
-	xinstall -m 644 -W ${filespath}																\
-		HP-80.app/Contents/Resources/HP-80.icns									\
-		${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/Resources/HP-80.icns
-	xinstall -m 755 -W ${filespath}																\
-		HP-80.app/Contents/MacOS/HP-80.command									\
-		${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/MacOS/HP-80.command
-
-	reinplace																					\
-		s|@PREFIX@|${prefix}|g																	\
-		${destroot}${applications_dir}/Nonpareil/HP-80.app/Contents/MacOS/HP-80.command
+	post-patch {
+		system "
+			pushd ${workpath}/${name}-${version};
+				cp -r -v ../voyager-r${patchversion}/* .
+			popd;
+		"
 	}
+	post-destroot {
+		foreach calc {HP-11C HP-12C HP-15C HP-16C} {
+			copy													\
+				${workpath}/appbundles-r${patchversion}/${calc}.app	\
+				${destroot}${applications_dir}/Nonpareil
+			reinplace s|@PREFIX@|${prefix}|g \
+				${destroot}${applications_dir}/Nonpareil/${calc}.app/Contents/MacOS/${calc}.command
+		}
+	}
 }
 
+variant debugger						\
+	description "Include Debugger!"		{
+	build.args-append			debug=yes has_debugger_gui=yes
+	destroot.args-append 		debug=yes has_debugger_gui=yes
+}

Added: trunk/dports/emulators/nonpareil/files/patch-image-voyager.diff
===================================================================
--- trunk/dports/emulators/nonpareil/files/patch-image-voyager.diff	                        (rev 0)
+++ trunk/dports/emulators/nonpareil/files/patch-image-voyager.diff	2009-03-07 13:25:40 UTC (rev 47829)
@@ -0,0 +1,86 @@
+diff -u -r image.orig/SConscript image/SConscript
+--- image.orig/SConscript	2008-08-24 02:37:18.000000000 +0200
++++ image/SConscript	2009-03-06 21:12:25.000000000 +0100
+@@ -29,6 +29,48 @@
+                          32e.png 33c.png 34c.png 37e.png 38c.png
+                          41cv.png""")
+ 
++voyager_base_images = Split ("""11c_base.png 12c_base.png 15c_base.png 16c_base.png""")
++
++voyager_segment_image = Split ("""voyager_segments.png""")
++
++base_images = voyager_base_images       # some day there may be others
++
++segment_images = voyager_segment_image  # some day there may be others
++
++#-----------------------------------------------------------------------------
++# convert PNG files to PNM for manipulation
++#-----------------------------------------------------------------------------
++
++PNG2PNM = Builder (action = "/opt/local/bin/pngtopnm $SOURCE >$TARGET",
++                   suffix = ".pnm",
++                   src_suffix = ".png")
++
++env.Append (BUILDERS = { 'PNG2PNM' : PNG2PNM })
++
++voyager_pnm_images = [env.PNG2PNM(src) for src in voyager_base_images]
++
++voyager_segment_pnm = env.PNG2PNM (voyager_segment_image)
++
++#-----------------------------------------------------------------------------
++# build Voyager PNG images from the PNM pieces (base image + segment image)
++#-----------------------------------------------------------------------------
++
++vimg_env = env.Copy ()
++
++def VPNM2PNG_Emitter (target, source, env):
++    source.append (voyager_segment_pnm)
++    return (target, source)
++
++VPNM2PNG = Builder (action = "/opt/local/bin/pnmcat -lr $SOURCES | /opt/local/bin/pnmtopng -compression 9 >$TARGET",
++                   suffix = ".png",
++                   src_suffix = "_base.pnm",
++                   emitter = VPNM2PNG_Emitter)
++
++vimg_env.Append (BUILDERS = { 'VPNM2PNG' : VPNM2PNG })
++
++
++derived_images = [vimg_env.VPNM2PNG(src) for src in voyager_pnm_images]
++
+ #-----------------------------------------------------------------------------
+ # Export 41CV image for use in building Nonpareil executable
+ #-----------------------------------------------------------------------------
+@@ -36,18 +78,24 @@
+ env.Append (IMAGE_41CV = File ('41cv.png'))
+ 
+ #-----------------------------------------------------------------------------
++# Default targets
++#-----------------------------------------------------------------------------
++
++Default (derived_images)
++
++#-----------------------------------------------------------------------------
+ # Install image files
+ #-----------------------------------------------------------------------------
+ 
+ env.Alias (target = 'install',
+            source = env.Install (dir = env ['destdir'] + env ['libdir'],
+-                                 source = unmod_images))
++                                 source = unmod_images + derived_images))
+ 
+ #-----------------------------------------------------------------------------
+ # source tarball
+ #-----------------------------------------------------------------------------
+ 
+-dist_files = ['SConscript'] + unmod_images
++dist_files = ['SConscript'] + unmod_images + base_images + segment_images
+ 
+ env.Distribute (source_release_dir, dist_files)
+ 
+@@ -59,4 +107,4 @@
+ 
+ if env ['target'] == 'win32':
+     Import ('win32_bin_dist_dir')
+-    Install (win32_bin_dist_dir, unmod_images)
++    Install (win32_bin_dist_dir, unmod_images + derived_images)
+Only in image: voyager_segments.png

Added: trunk/dports/emulators/nonpareil/files/patch-kml-voyager.diff
===================================================================
--- trunk/dports/emulators/nonpareil/files/patch-kml-voyager.diff	                        (rev 0)
+++ trunk/dports/emulators/nonpareil/files/patch-kml-voyager.diff	2009-03-07 13:25:40 UTC (rev 47829)
@@ -0,0 +1,13 @@
+diff -u -r kml.orig/SConscript kml/SConscript
+--- kml.orig/SConscript	2008-08-24 02:37:18.000000000 +0200
++++ kml/SConscript	2009-03-06 17:59:41.000000000 +0100
+@@ -23,7 +23,8 @@
+ kmls = Split ("""35.kml 45.kml 55.kml 80.kml
+                  21.kml 25.kml
+                  32e.kml 33c.kml 34c.kml 37e.kml 38c.kml 38e.kml
+-                 41cv.kml 41cx.kml""")
++                 41cv.kml 41cx.kml
++                 11c.kml 12c.kml 15c.kml 16c.kml""")
+ 
+ env.Append (KML_41CV = File ('41cv.kml'))
+ 

Added: trunk/dports/emulators/nonpareil/files/patch-rom-voyager.diff
===================================================================
--- trunk/dports/emulators/nonpareil/files/patch-rom-voyager.diff	                        (rev 0)
+++ trunk/dports/emulators/nonpareil/files/patch-rom-voyager.diff	2009-03-07 13:25:40 UTC (rev 47829)
@@ -0,0 +1,13 @@
+diff -u -r rom.orig/SConscript rom/SConscript
+--- rom.orig/SConscript	2008-08-24 02:37:19.000000000 +0200
++++ rom/SConscript	2009-03-06 18:18:50.000000000 +0100
+@@ -26,7 +26,8 @@
+ 
+ roms = Split ("""21.obj 25.obj
+                  32e.obj 33c.obj 34c.obj 37e.obj 38c.obj 38e.obj
+-                 41cv.mod 41cx.mod 82143a.mod 82182a.mod""")
++                 41cv.mod 41cx.mod 82143a.mod 82182a.mod
++                 11c.obj 12c.obj 15c.obj 16c.obj""")
+ 
+ env.Alias (target = 'install',
+            source = env.Install (dir = env ['destdir'] + env ['libdir'],

Added: trunk/dports/emulators/nonpareil/files/patch-src-voyager.diff
===================================================================
--- trunk/dports/emulators/nonpareil/files/patch-src-voyager.diff	                        (rev 0)
+++ trunk/dports/emulators/nonpareil/files/patch-src-voyager.diff	2009-03-07 13:25:40 UTC (rev 47829)
@@ -0,0 +1,60 @@
+diff -u -r src.orig/SConscript src/SConscript
+--- src.orig/SConscript	2008-08-24 02:37:18.000000000 +0200
++++ src/SConscript	2009-03-06 21:45:04.000000000 +0100
+@@ -248,6 +248,7 @@
+                            proc_woodstock.c
+                            proc_nut.c
+                            coconut_lcd.c phineas.c helios.c helios_chargen.c
++                           voyager_lcd.c
+                            mod1_file.c""")
+ 
+ nonpareil_csim_srcs = Split ("""csim.c""")
+@@ -402,6 +403,7 @@
+                         debugger_gui.h debugger_cli.h
+                         dis_woodstock.h dis_nut.h
+                         display.h printer.h
++                        voyager_lcd.h
+                         coconut_lcd.h helios.h phineas.h
+                         csim.h about.h goose.h pixbuf_util.h sound.h
+                         asm.h symtab.h
+diff -u -r src.orig/proc_nut.c src/proc_nut.c
+--- src.orig/proc_nut.c	2008-08-24 02:37:18.000000000 +0200
++++ src/proc_nut.c	2009-03-06 21:46:32.000000000 +0100
+@@ -34,6 +34,7 @@
+ #include "proc_int.h"
+ #include "digit_ops.h"
+ #include "coconut_lcd.h"
++#include "voyager_lcd.h"
+ #include "proc_nut.h"
+ #include "dis_nut.h"
+ 
+@@ -1893,6 +1894,29 @@
+       coconut_display_init (sim);
+ 
+       break;
++
++    case PLATFORM_VOYAGER:
++      nut_new_ram (sim, 0x000, 8);
++      ram_size -= 8;
++
++      nut_new_ram (sim, 0x008, 3);  // I/O registers
++      nut_reg->ram_read_fn  [0x08] = nut_ram_read_zero;
++      nut_reg->ram_write_fn [0x08] = nut_ram_write_ignore;
++
++      if (ram_size > 40)
++	{
++	  nut_new_ram (sim, 0x010, 8);
++	  ram_size -= 8;
++
++	  nut_new_ram (sim, 0x018, 3);  // I/O registers
++	  nut_reg->ram_read_fn  [0x18] = nut_ram_read_zero;
++	  nut_reg->ram_write_fn [0x18] = nut_ram_write_ignore;
++	}
++
++      nut_new_ram (sim, 0x100 - ram_size, ram_size);
++
++      voyager_display_init (sim);
++      break;
+     }
+ 
+   chip_event (sim, event_reset, NULL, 0, NULL);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090307/4f0693bc/attachment-0001.html>


More information about the macports-changes mailing list