[73321] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Tue Nov 9 21:49:18 PST 2010
Revision: 73321
http://trac.macports.org/changeset/73321
Author: ryandesign at macports.org
Date: 2010-11-09 21:49:15 -0800 (Tue, 09 Nov 2010)
Log Message:
-----------
Drizzle: update to 29
PCLauncher: update to 0.0.2 which requires Drizzle 29
PlasmaClient: fix crash when quitting if prefs directory doesn't exist, and now refer users to PCLauncher's Preferences window to change graphics settings
Modified Paths:
--------------
trunk/dports/devel/Drizzle/Portfile
trunk/dports/games/PCLauncher/Portfile
trunk/dports/games/PlasmaClient/Portfile
trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff
Added Paths:
-----------
trunk/dports/games/PCLauncher/files/patch-LoginWindowController.m.diff
trunk/dports/games/PCLauncher/files/patch-PCLauncher.xcodeproj-project.pbxproj.diff
trunk/dports/games/PlasmaClient/files/patch-create_directories.diff
Removed Paths:
-------------
trunk/dports/games/PCLauncher/files/patch-PCLauncher.applescript.diff
Modified: trunk/dports/devel/Drizzle/Portfile
===================================================================
--- trunk/dports/devel/Drizzle/Portfile 2010-11-10 05:35:28 UTC (rev 73320)
+++ trunk/dports/devel/Drizzle/Portfile 2010-11-10 05:49:15 UTC (rev 73321)
@@ -4,8 +4,7 @@
PortSystem 1.0
name Drizzle
-version 28
-revision 2
+version 29
categories devel
platforms darwin
maintainers ryandesign
@@ -26,8 +25,8 @@
extract.suffix .jar
extract.only
-checksums sha1 336d83a963b9e24dc2b14d40516b23504bf07f06 \
- rmd160 7c9cf0fee7be1252470b23fb93db305d280ba251
+checksums sha1 e7416af2fa987b75323865bf680849fa98913b88 \
+ rmd160 2eca2f13d89daa00b1983e907530bd639835b65d
extract.mkdir yes
Modified: trunk/dports/games/PCLauncher/Portfile
===================================================================
--- trunk/dports/games/PCLauncher/Portfile 2010-11-10 05:35:28 UTC (rev 73320)
+++ trunk/dports/games/PCLauncher/Portfile 2010-11-10 05:49:15 UTC (rev 73321)
@@ -5,7 +5,7 @@
PortGroup xcode 1.0
name PCLauncher
-version 0.0.1-72772
+version 0.0.2-73317
categories games
maintainers ryandesign
homepage http://plasmaclient.servegame.org/
@@ -21,6 +21,8 @@
svn.revision [lindex [split ${version} -] 1]
worksrcdir ${name}
+depends_lib port:libhsplasma
+
depends_run port:PlasmaClient \
port:Drizzle
@@ -32,10 +34,11 @@
}
}
-patchfiles patch-PCLauncher.applescript.diff
+patchfiles patch-LoginWindowController.m.diff \
+ patch-PCLauncher.xcodeproj-project.pbxproj.diff
post-patch {
- reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/PCLauncher.applescript ${worksrcpath}/PCDownloader ${worksrcpath}/PCExtractor
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/LoginWindowController.m ${worksrcpath}/PCLauncher.xcodeproj/project.pbxproj ${worksrcpath}/PCDownloader ${worksrcpath}/PCExtractor
}
post-destroot {
@@ -61,3 +64,10 @@
For more information, please visit the Guild of Writers' IRC channel at irc://irc.guildofwriters.com/#writers
"
+
+platform darwin 8 {
+ depends_run-delete port:Drizzle
+ if {![file isdirectory ${prefix}/share/mystonline/data/python] || ![file isdirectory ${prefix}/share/mystonline/data/SDL]} {
+ notes-append "\n\nOn Mac OS X 10.4 Tiger, ${name} cannot download the secure files for you. Manually copy the python and SDL directories into ${prefix}/share/mystonline/data from another Mac that has PlasmaClient."
+ }
+}
Copied: trunk/dports/games/PCLauncher/files/patch-LoginWindowController.m.diff (from rev 73299, trunk/dports/games/PCLauncher/files/patch-PCLauncher.applescript.diff)
===================================================================
--- trunk/dports/games/PCLauncher/files/patch-LoginWindowController.m.diff (rev 0)
+++ trunk/dports/games/PCLauncher/files/patch-LoginWindowController.m.diff 2010-11-10 05:49:15 UTC (rev 73321)
@@ -0,0 +1,21 @@
+--- LoginWindowController.m.orig 2010-11-06 14:03:25.000000000 -0500
++++ LoginWindowController.m 2010-11-06 14:17:30.000000000 -0500
+@@ -25,13 +25,13 @@
+ - (id)init {
+ self = [super init];
+ if (self) {
+- kPrefix = @"/opt/local";
++ kPrefix = @"@PREFIX@";
+ kDrizzle = [[kPrefix stringByAppendingString:@"/bin/drizzle"] retain];
+- kDrizzleForDownload = [[NSString alloc] initWithString:kDrizzle];
+- kDrizzleForExtract = [[NSString alloc] initWithString:kDrizzle];
++ kDrizzleForDownload = [[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"PCDownloader.app/Contents/MacOS/PCDownloader"] retain];
++ kDrizzleForExtract = [[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"PCExtractor.app/Contents/MacOS/PCExtractor"] retain];
+ kPlasmaClient = [[kPrefix stringByAppendingString:@"/bin/PlasmaClient"] retain];
+- kPlasmaClientForAuth = [[NSString alloc] initWithString:kPlasmaClient];
+- kPlasmaClientForGame = [[NSString alloc] initWithString:kPlasmaClient];
++ kPlasmaClientForAuth = [[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"PCAuthenticator.app/Contents/MacOS/PCAuthenticator"] retain];
++ kPlasmaClientForGame = [[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"PlasmaClient.app/Contents/MacOS/PlasmaClient"] retain];
+
+ kDataDirectory = [[kPrefix stringByAppendingString:@"/share/mystonline/data"] retain];
+ kPythonDirectory = [[kDataDirectory stringByAppendingPathComponent:@"python"] retain];
Deleted: trunk/dports/games/PCLauncher/files/patch-PCLauncher.applescript.diff
===================================================================
--- trunk/dports/games/PCLauncher/files/patch-PCLauncher.applescript.diff 2010-11-10 05:35:28 UTC (rev 73320)
+++ trunk/dports/games/PCLauncher/files/patch-PCLauncher.applescript.diff 2010-11-10 05:49:15 UTC (rev 73321)
@@ -1,22 +0,0 @@
---- PCLauncher.applescript.orig 2010-10-10 07:49:36.000000000 -0500
-+++ PCLauncher.applescript 2010-10-10 07:52:08.000000000 -0500
-@@ -6,7 +6,7 @@
-
-
- -- Paths
--property gPrefix : "/opt/local"
-+property gPrefix : "@PREFIX@"
- property gDrizzle : gPrefix & "/bin/drizzle"
- property gDrizzleForDownload : gDrizzle
- property gDrizzleForExtract : gDrizzle
-@@ -42,6 +42,10 @@
- make new default entry at end of default entries of user defaults with properties {name:"username", contents:""}
- make new default entry at end of default entries of user defaults with properties {name:"password", contents:""}
- set gLogFile to gLogDirectory & "/PlasmaClient." & timeSinceEpoch() & ".log"
-+ set gDrizzleForDownload to (resource path of main bundle) & "/PCDownloader.app/Contents/MacOS/PCDownloader"
-+ set gDrizzleForExtract to (resource path of main bundle) & "/PCExtractor.app/Contents/MacOS/PCExtractor"
-+ set gPlasmaClientForAuth to (resource path of main bundle) & "/PCAuthenticator.app/Contents/MacOS/PCAuthenticator"
-+ set gPlasmaClientForGame to (resource path of main bundle) & "/PlasmaClient.app/Contents/MacOS/PlasmaClient"
- end will finish launching
-
- on should quit after last window closed theObject
Added: trunk/dports/games/PCLauncher/files/patch-PCLauncher.xcodeproj-project.pbxproj.diff
===================================================================
--- trunk/dports/games/PCLauncher/files/patch-PCLauncher.xcodeproj-project.pbxproj.diff (rev 0)
+++ trunk/dports/games/PCLauncher/files/patch-PCLauncher.xcodeproj-project.pbxproj.diff 2010-11-10 05:49:15 UTC (rev 73321)
@@ -0,0 +1,41 @@
+--- PCLauncher.xcodeproj/project.pbxproj.orig 2010-11-06 14:03:25.000000000 -0500
++++ PCLauncher.xcodeproj/project.pbxproj 2010-11-06 15:25:13.000000000 -0500
+@@ -48,7 +48,7 @@
+ 5051863B127B8FD900078EC1 /* CSRegex.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CSRegex.m; sourceTree = "<group>"; };
+ 50C80D5412801809007FCD3A /* Server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Server.h; sourceTree = "<group>"; };
+ 50C80D5512801809007FCD3A /* Server.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Server.mm; sourceTree = "<group>"; };
+- 50C80E3F12816E36007FCD3A /* libHSPlasma.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHSPlasma.dylib; path = /opt/local/lib/libHSPlasma.dylib; sourceTree = "<absolute>"; };
++ 50C80E3F12816E36007FCD3A /* libHSPlasma.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHSPlasma.dylib; path = @PREFIX@/lib/libHSPlasma.dylib; sourceTree = "<absolute>"; };
+ 50C80F3E12827C4C007FCD3A /* PreferencesWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreferencesWindowController.h; sourceTree = "<group>"; };
+ 50C80F3F12827C4C007FCD3A /* PreferencesWindowController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreferencesWindowController.mm; sourceTree = "<group>"; };
+ 8D1107310486CEB800E47090 /* PCLauncher-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "PCLauncher-Info.plist"; sourceTree = "<group>"; };
+@@ -274,12 +274,12 @@
+ GCC_OPTIMIZATION_LEVEL = 0;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = PCLauncher_Prefix.pch;
+- HEADER_SEARCH_PATHS = /opt/local/include/HSPlasma;
++ HEADER_SEARCH_PATHS = @PREFIX@/include/HSPlasma;
+ INFOPLIST_FILE = "PCLauncher-Info.plist";
+ INSTALL_PATH = /Applications;
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+- /opt/local/lib,
++ @PREFIX@/lib,
+ );
+ PRODUCT_NAME = PCLauncher;
+ SDKROOT = "";
+@@ -294,12 +294,12 @@
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = PCLauncher_Prefix.pch;
+- HEADER_SEARCH_PATHS = /opt/local/include/HSPlasma;
++ HEADER_SEARCH_PATHS = @PREFIX@/include/HSPlasma;
+ INFOPLIST_FILE = "PCLauncher-Info.plist";
+ INSTALL_PATH = /Applications;
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+- /opt/local/lib,
++ @PREFIX@/lib,
+ );
+ PRODUCT_NAME = PCLauncher;
+ SDKROOT = "";
Modified: trunk/dports/games/PlasmaClient/Portfile
===================================================================
--- trunk/dports/games/PlasmaClient/Portfile 2010-11-10 05:35:28 UTC (rev 73320)
+++ trunk/dports/games/PlasmaClient/Portfile 2010-11-10 05:49:15 UTC (rev 73321)
@@ -7,6 +7,7 @@
name PlasmaClient
epoch 1
version 0.0.2-347
+revision 1
categories games
platforms darwin
maintainers ryandesign
@@ -54,7 +55,8 @@
reinplace "s|\r||g" ${worksrcpath}/win32dist/readme.rtf
}
-patchfiles patch-win32dist-readme.rtf.diff
+patchfiles patch-win32dist-readme.rtf.diff \
+ patch-create_directories.diff
configure.args -DBULLET_INCLUDE_DIR:PATH=${prefix}/include/bullet \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
Added: trunk/dports/games/PlasmaClient/files/patch-create_directories.diff
===================================================================
--- trunk/dports/games/PlasmaClient/files/patch-create_directories.diff (rev 0)
+++ trunk/dports/games/PlasmaClient/files/patch-create_directories.diff 2010-11-10 05:49:15 UTC (rev 73321)
@@ -0,0 +1,37 @@
+http://plasmaclient.info/mantis/view.php?id=12
+--- singletons/pcClient.cpp.orig 2010-11-06 15:53:27.000000000 -0500
++++ singletons/pcClient.cpp 2010-11-09 13:44:29.000000000 -0600
+@@ -625,6 +625,13 @@
+ }
+ }
+
++plString pcClient::createInitPath()
++{
++ plString initPath = getPath( kUserPath) + "/Init";
++ boost::filesystem::create_directories(initPath.cstr());
++ return(initPath);
++}
++
+ void pcClient::quit() {
+ SDL_Event quit_event;
+ quit_event.type = SDL_QUIT;
+@@ -632,7 +639,8 @@
+ }
+
+ void pcClient::writeAWPC() {
+- plString awpm = getPath(kUserPath) + "/Init/avatar.wpm";
++ plString awpm = createInitPath();
++ awpm = awpm + "/avatar.wpm";
+
+ plEncryptedStream* S = new plEncryptedStream(PlasmaVer::pvMoul);
+ S->open(awpm, fmCreate, plEncryptedStream::kEncXtea);
+--- singletons/pcClient.h.orig 2010-11-06 15:53:27.000000000 -0500
++++ singletons/pcClient.h 2010-11-09 13:18:33.000000000 -0600
+@@ -125,6 +125,7 @@
+ void removeDefaultReceiver(short s, plKey k) { hsTArray<plKey>& a = defaultReceivers[s]; a.remove(a.find(k)); }
+
+ plString getPath(Path p);
++ plString createInitPath();
+
+ const pcViewSettings& getSettings() { return settings; }
+ const pcOptions& getOptions() { return options; }
Modified: trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff
===================================================================
--- trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff 2010-11-10 05:35:28 UTC (rev 73320)
+++ trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff 2010-11-10 05:49:15 UTC (rev 73321)
@@ -22,7 +22,7 @@
\b Graphics Settings\b0\par
\par
-\tab PlasmaClient does not use the Myst Online graphics settings. To change your PlasmaClient settings, use the "Graphics" tab of PCLauncher.exe. This will not affect your Myst Online graphics settings.\par
-+\tab PlasmaClient does not use the Myst Online graphics settings. There is currently no Mac interface to change your PlasmaClient graphics settings.\par
++\tab PlasmaClient does not use the Myst Online graphics settings. To change your PlasmaClient settings, select "Preferences" from the PCLauncher menu. This will not affect your Myst Online graphics settings.\par
\par
\tab To disable the framerate counter, you can use the command "/fps off". To turn it on again, use "/fps on"\par
\par
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101109/11cbaa31/attachment-0001.html>
More information about the macports-changes
mailing list