[103778] trunk/dports/aqua/cotvnc

[ryandesign at macports.org]

Revision: 103778
          https://trac.macports.org/changeset/103778
Author:   ryandesign at macports.org
Date:     2013-03-06 21:13:30 -0800 (Wed, 06 Mar 2013)
Log Message:
-----------
cotvnc: fix version in Finder Get Info window on Snow Leopard and Lion and fix build failure on Mountain Lion (#38312)

Modified Paths:
--------------
    trunk/dports/aqua/cotvnc/Portfile

Added Paths:
-----------
    trunk/dports/aqua/cotvnc/files/
    trunk/dports/aqua/cotvnc/files/patch-project.pbxproj.diff

Modified: trunk/dports/aqua/cotvnc/Portfile
===================================================================
--- trunk/dports/aqua/cotvnc/Portfile	2013-03-07 04:37:14 UTC (rev 103777)
+++ trunk/dports/aqua/cotvnc/Portfile	2013-03-07 05:13:30 UTC (rev 103778)
@@ -6,6 +6,7 @@
 
 name            cotvnc
 version         2.0b4
+revision        1
 categories-append vnc
 maintainers     nomaintainer
 license         GPL-2
@@ -24,9 +25,27 @@
 checksums       md5 9383068b0a381857551404c86bd05dc1 \
                 sha1 1a749854f314d62d1e54b9ae1ce5ac13bb20f1e8 \
                 rmd160 dce9aafff048545e2612c6795c0ee118f3bc0da8
+
+depends_build   bin:iconv:libiconv
+
 depends_lib     lib:libz.1:zlib
 
+patchfiles      patch-project.pbxproj.diff
+
 worksrcdir      ${name}
+
+post-patch {
+    reinplace "s|@PREFIX@|${prefix}|g" "${worksrcpath}/Chicken of the VNC.xcodeproj/project.pbxproj"
+    
+    # .strings files should be UTF-16 but this project's are UTF-8.
+    # New Xcode versions convert them for us but we need a predictable
+    # encoding for the sed script that the Xcode project runs.
+    foreach f [glob ${worksrcpath}/Resources/*.lproj/InfoPlist.strings] {
+        move ${f} ${f}.tmp
+        system "iconv -f UTF-8 -t UTF-16 ${f}.tmp > ${f}"
+    }
+}
+
 xcode.destroot.settings SKIP_INSTALL=NO
 
 # Fix non-root destroot.

Added: trunk/dports/aqua/cotvnc/files/patch-project.pbxproj.diff
===================================================================
--- trunk/dports/aqua/cotvnc/files/patch-project.pbxproj.diff	                        (rev 0)
+++ trunk/dports/aqua/cotvnc/files/patch-project.pbxproj.diff	2013-03-07 05:13:30 UTC (rev 103778)
@@ -0,0 +1,11 @@
+--- Chicken of the VNC.xcodeproj/project.pbxproj.orig	2006-01-18 13:34:38.000000000 -0600
++++ Chicken of the VNC.xcodeproj/project.pbxproj	2013-03-06 18:20:57.000000000 -0600
+@@ -887,7 +887,7 @@
+ 			);
+ 			runOnlyForDeploymentPostprocessing = 0;
+ 			shellPath = /bin/sh;
+-			shellScript = "cd \"$TARGET_BUILD_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents\"\n\ncat ./Info.plist \\\n| sed s/__VERSION__/$_CHICKEN_VERSION_/ \\\n> ./Info.plist.tmp \\\n&& mv -f ./Info.plist.tmp ./Info.plist\n\nTESTPATH=./Resources/*.lproj/InfoPlist.strings\nfor path in $TESTPATH ; do\n\tif [ $path != \"$TESTPATH\" ]; then\n\t\tcat \"$path\" \\\n\t\t| sed s/__VERSION__/$_CHICKEN_VERSION_/ \\\n\t\t> \"$path.tmp\" \\\n\t\t&& mv -f \"$path.tmp\" \"$path\"\n\tfi\ndone";
++			shellScript = "cd \"$TARGET_BUILD_DIR/$PRODUCT_NAME.$WRAPPER_EXTENSION/Contents\"\n\ncat ./Info.plist \\\n| sed s/__VERSION__/$_CHICKEN_VERSION_/ \\\n> ./Info.plist.tmp \\\n&& mv -f ./Info.plist.tmp ./Info.plist\n\nTESTPATH=./Resources/*.lproj/InfoPlist.strings\nfor path in $TESTPATH ; do\n\tif [ $path != \"$TESTPATH\" ]; then\n\t\ticonv -f UTF-16 -t UTF-8 \"$path\" \\\n\t\t| sed s/__VERSION__/$_CHICKEN_VERSION_/ \\\n\t\t| iconv -f UTF-8 -t UTF-16 \\\n\t\t> \"$path.tmp\" \\\n\t\t&& mv -f \"$path.tmp\" \"$path\"\n\tfi\ndone";
+ 		};
+ 		E23631DC0646E907000D00B6 /* ShellScript */ = {
+ 			isa = PBXShellScriptBuildPhase;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130306/46c6d7b7/attachment.html>