[72336] trunk/dports/games/PlasmaClient

ryandesign at macports.org ryandesign at macports.org
Sun Oct 10 22:58:06 PDT 2010


Revision: 72336
          http://trac.macports.org/changeset/72336
Author:   ryandesign at macports.org
Date:     2010-10-10 22:58:04 -0700 (Sun, 10 Oct 2010)
Log Message:
-----------
PlasmaClient: update to 275, install global.wpm, rely on PCLauncher

Modified Paths:
--------------
    trunk/dports/games/PlasmaClient/Portfile
    trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff

Removed Paths:
-------------
    trunk/dports/games/PlasmaClient/files/PlasmaClient.in

Modified: trunk/dports/games/PlasmaClient/Portfile
===================================================================
--- trunk/dports/games/PlasmaClient/Portfile	2010-10-11 05:57:00 UTC (rev 72335)
+++ trunk/dports/games/PlasmaClient/Portfile	2010-10-11 05:58:04 UTC (rev 72336)
@@ -6,7 +6,7 @@
 
 name                        PlasmaClient
 epoch                       1
-version                     0.0.1-270
+version                     0.0.1-275
 categories                  games
 platforms                   darwin
 maintainers                 ryandesign
@@ -23,7 +23,7 @@
 
 fetch.type                  hg
 hg.url                      http://uru.zrax.net/hg/plasmaclient
-hg.tag                      1a917fae0724
+hg.tag                      8e9a3e21306d
 
 depends_lib                 port:bullet \
                             port:python26 \
@@ -34,8 +34,6 @@
                             port:libsdl \
                             port:libhsplasma
 
-depends_run                 port:Drizzle
-
 if {![file exists ${prefix}/lib/libboost_python-mt.dylib]} {
     depends_lib-delete port:boost
     pre-configure {
@@ -54,7 +52,6 @@
 
 post-extract {
     reinplace "s|\r||g" ${worksrcpath}/win32dist/readme.rtf
-    copy ${filespath}/PlasmaClient.in ${workpath}/PlasmaClient
 }
 
 patchfiles                  patch-win32dist-readme.rtf.diff
@@ -66,17 +63,12 @@
                             -DSDL_INCLUDE_DIR=${prefix}/include/SDL \
                             -DSDL_LIBRARY="${prefix}/lib/libSDLmain.a\;${prefix}/lib/libSDL.dylib\;-framework Cocoa"
 
-post-build {
-    reinplace "s|@PREFIX@|${prefix}|g" ${workpath}/PlasmaClient
-    reinplace "s|@APPLICATIONS_DIR@|${applications_dir}|g" ${workpath}/PlasmaClient
-}
-
 destroot.keepdirs           ${destroot}${prefix}/var/log/${name}
 
 set docdir ${prefix}/share/doc/${name}
 post-destroot {
-    xinstall -d ${destroot}${applications_dir}/PlasmaClient.app/Contents/MacOS
-    xinstall ${workpath}/PlasmaClient ${destroot}${applications_dir}/PlasmaClient.app/Contents/MacOS
+    xinstall -d ${destroot}${prefix}/share/mystonline/data
+    xinstall -W ${worksrcpath}/win32dist global.wpm ${destroot}${prefix}/share/mystonline/data
     
     xinstall -d ${destroot}${docdir}
     xinstall -W ${worksrcpath}/win32dist readme.rtf gpl.txt ${destroot}${docdir}
@@ -85,8 +77,10 @@
 }
 
 notes "
-Instructions for using ${name} are in the file ${docdir}/readme.rtf.
+To start ${name}, install the PCLauncher port and run PCLauncher in ${applications_dir}
 
+Instructions for using ${name} are in the file ${docdir}/readme.rtf
+
 For more information, please visit the Guild of Writers' IRC channel at irc://irc.guildofwriters.com/#writers
 "
 

Deleted: trunk/dports/games/PlasmaClient/files/PlasmaClient.in
===================================================================
--- trunk/dports/games/PlasmaClient/files/PlasmaClient.in	2010-10-11 05:57:00 UTC (rev 72335)
+++ trunk/dports/games/PlasmaClient/files/PlasmaClient.in	2010-10-11 05:58:04 UTC (rev 72336)
@@ -1,105 +0,0 @@
-#!/bin/sh
-# $Id$
-
-[ -n "${PREFIX}" ] || PREFIX="@PREFIX@"
-[ -n "${APPLICATIONS_DIR}" ] || APPLICATIONS_DIR="@APPLICATIONS_DIR@"
-
-NEED_RELAUNCH=0
-MOULDATADIR="${PREFIX}/share/mystonline/data"
-LOGDIR="${PREFIX}/var/log/PlasmaClient"
-LOGFILE="PlasmaClient.$(date '+%s').log"
-LOGLINK="PlasmaClient.log"
-PLIST="org.macports.PlasmaClient"
-
-if [ ! -d "${MOULDATADIR}/dat" ]; then
-    osascript \
-        -e 'tell app "Finder"' \
-        -e 'activate' \
-        -e "display dialog \"PlasmaClient needs the Myst Online: URU Live again game data files. Install the “mystonline-cider” port and run the application to let it download all the game data. Then come back to PlasmaClient.\" buttons {\"OK\"} default button \"OK\" with title \"PlasmaClient\" with icon note" \
-        -e 'return' \
-        -e 'end'
-    exit
-fi
-
-USERNAME="$(defaults read $PLIST username)"
-PASSWORD="$(defaults read $PLIST password)"
-LASTLOGINFAILED=0
-if [ -r "${LOGDIR}/${LOGLINK}" ]; then
-    if [ -n "$(grep '^Login failed:' ${LOGDIR}/${LOGLINK})" ]; then
-        LASTLOGINFAILED=1
-    fi
-fi
-
-
-if [ -z "${USERNAME}" -o -z "${PASSWORD}" -o ${LASTLOGINFAILED} -eq 1 ]; then
-    NEED_RELAUNCH=1
-    
-    USERNAME="$(osascript \
-        -e 'tell app "Finder"' \
-        -e 'activate' \
-        -e "display dialog \"PlasmaClient needs to know your Myst Online: URU Live again account name (email address). (If you enter this incorrectly, PlasmaClient will hang during startup.)\" default answer \"${USERNAME}\" buttons {\"Cancel\", \"OK\"} default button \"OK\" with title \"PlasmaClient\" with icon note" \
-        -e 'return text returned of the result' \
-        -e 'end')" || exit
-    [ -n "${USERNAME}" ] || exit
-    
-    PASSWORD="$(osascript \
-        -e 'tell app "Finder"' \
-        -e 'activate' \
-        -e "display dialog \"PlasmaClient needs to know your Myst Online: URU Live again password. (If you enter this incorrectly, PlasmaClient will hang during startup.)\" default answer \"${PASSWORD}\" with hidden answer buttons {\"Cancel\", \"OK\"} default button \"OK\" with title \"PlasmaClient\" with icon note" \
-        -e 'return text returned of the result' \
-        -e 'end')" || exit
-    [ -n "${PASSWORD}" ] || exit
-    
-    defaults write $PLIST username "$USERNAME"
-    defaults write $PLIST password "$PASSWORD"
-fi
-
-KEEPLOGS=10
-cd "${LOGDIR}"
-ls PlasmaClient.*.log 2>/dev/null | sort -n -r | sed "1,$((${KEEPLOGS} - 1))d" | xargs rm -f
-
-rm -f "${LOGDIR}/${LOGLINK}"
-ln -s "${LOGFILE}" "${LOGDIR}/${LOGLINK}"
-echo "Logging to ${LOGDIR}/${LOGFILE}"
-exec > "${LOGDIR}/${LOGFILE}" 2>&1
-
-if [ ! -d "${MOULDATADIR}/SDL" -o ! -d "${MOULDATADIR}/python" ]; then
-    NEED_RELAUNCH=1
-    
-    osascript \
-        -e 'tell app "Finder"' \
-        -e 'activate' \
-        -e "display dialog \"PlasmaClient needs to download the Myst Online: URU Live again Python and SDL data files. This may take a few minutes but only needs to be done once.\" buttons {\"Cancel\", \"OK\"} default button \"OK\" with title \"PlasmaClient\" with icon note" \
-        -e 'return' \
-        -e 'end' || exit
-    TMPDIR="$(mktemp -d /tmp/PlasmaClientXXXXXXXX)"
-    
-    echo "Downloading secure MOULa files"
-    # Drizzle doesn't quit when it's done downloading the files so we have to kill it.
-    ${PREFIX}/bin/drizzle -downloadsecuremoulagainfiles "${USERNAME}" "${PASSWORD}" "${TMPDIR}" &
-    PID=$!
-    sleep 5
-    while [ -z "$(tail -n 10 "${LOGDIR}/${LOGFILE}" | grep '^All done!$')" ]; do
-        sleep 1
-    done
-    kill $PID
-    wait $PID
-    mv "${TMPDIR}/Python/python.pak" "${TMPDIR}"
-    rmdir "${TMPDIR}/Python"
-    
-    echo "Decompiling secure MOULa Python files"
-    ${PREFIX}/bin/drizzle -decompilepak "${TMPDIR}/python.pak" "${TMPDIR}/python" moul || exit
-    rm "${TMPDIR}/python.pak"
-    rm -rf "${MOULDATADIR}/SDL" "${MOULDATADIR}/python"
-    mv "${TMPDIR}/python" "${TMPDIR}/SDL" "${MOULDATADIR}"
-    rmdir "$TMPDIR"
-fi
-
-if [ ${NEED_RELAUNCH} -eq 1 ]; then
-    # Relaunch to fix the Dock icon.
-    open -a "${APPLICATIONS_DIR}/PlasmaClient.app"
-    exit
-fi
-
-cd "${MOULDATADIR}"
-exec "${PREFIX}/bin/PlasmaClient" "${USERNAME}" "${PASSWORD}"

Modified: trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff
===================================================================
--- trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff	2010-10-11 05:57:00 UTC (rev 72335)
+++ trunk/dports/games/PlasmaClient/files/patch-win32dist-readme.rtf.diff	2010-10-11 05:58:04 UTC (rev 72336)
@@ -5,7 +5,7 @@
  {\*\generator Msftedit 5.41.15.1515;}\viewkind4\uc1\pard\lang1033\b\f0\fs24 Important Information\b0\par
  \par
 -\tab To start PlasmaClient, run PCLauncher.exe. This accepts your regular Myst Online username and password.\par
-+\tab To start PlasmaClient, double-click the PlasmaClient application. This accepts your regular Myst Online username and password.\par
++\tab To start PlasmaClient, run PCLauncher. This accepts your regular Myst Online username and password.\par
  \par
 -\tab There have been some reports that when PlasmaClient is loading, you should not click on another window or use alt-tab because it can freeze. For some people this works fine \endash  if you experience loading issues, try keeping PlasmaClient focused during the entire loading process.\par
 +\tab There have been some reports that when PlasmaClient is loading, you should not click on another window or use Command-Tab because it can freeze. For some people this works fine \endash  if you experience loading issues, try keeping PlasmaClient focused during the entire loading process.\par
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101010/1416166c/attachment.html>


More information about the macports-changes mailing list