[113174] trunk/dports/aqua/vineserver
ryandesign at macports.org
ryandesign at macports.org
Mon Nov 11 02:29:09 PST 2013
Revision: 113174
https://trac.macports.org/changeset/113174
Author: ryandesign at macports.org
Date: 2013-11-11 02:29:09 -0800 (Mon, 11 Nov 2013)
Log Message:
-----------
vineserver: update to 4.01, fixing build failures on Lion and newer (#33383)
vineserver3: new subport, version 3.12, for Snow Leopard and older
Modified Paths:
--------------
trunk/dports/aqua/vineserver/Portfile
Added Paths:
-----------
trunk/dports/aqua/vineserver/files/patch-vineserver-OSXvnc.xcodeproj-project.pbxproj.diff
trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc-server-rfb.h.diff
trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc.xcodeproj-project.pbxproj.diff
Removed Paths:
-------------
trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff
trunk/dports/aqua/vineserver/files/patch-rfb.h.diff
Modified: trunk/dports/aqua/vineserver/Portfile
===================================================================
--- trunk/dports/aqua/vineserver/Portfile 2013-11-11 10:27:05 UTC (rev 113173)
+++ trunk/dports/aqua/vineserver/Portfile 2013-11-11 10:29:09 UTC (rev 113174)
@@ -5,17 +5,13 @@
PortGroup xcode 1.0
name vineserver
-version 3.1
-revision 1
categories aqua vnc
homepage http://www.testplant.com/products/vine_server
maintainers ryandesign
-supported_archs i386 ppc
fetch.type cvs
cvs.root :pserver:anonymous at osxvnc.cvs.sourceforge.net:/cvsroot/osxvnc
cvs.module OSXvnc
-cvs.tag V[strsed ${version} {g/\./_/}]
worksrcdir OSXvnc
description \
@@ -32,32 +28,57 @@
depends_lib \
port:zlib
-patchfiles \
- patch-project.pbxproj.diff \
- patch-rfb.h.diff
-
post-patch {
# Make all strings UTF-16 so CopyStringsFile doesn't fail on Leopard. See #15919.
- set language_encodings {
- English utf-8
- German macroman
- Italian macroman
- Japanese utf-8
+ foreach strings [glob ${worksrcpath}/*.lproj/Localizable.strings] {
+ copy ${strings} ${strings}.orig
+ system "${prefix}/bin/iconv -f utf-8 -t utf-16 ${strings}.orig > ${strings}"
}
- foreach {language encoding} ${language_encodings} {
- system -W ${worksrcpath}/${language}.lproj "cp -p Localizable.strings Localizable.strings.orig && ${prefix}/bin/iconv -f ${encoding} -t utf-16 Localizable.strings.orig > Localizable.strings"
- }
}
post-destroot {
# Fix permissions for users not installing with root
- fs-traverse dir ${workpath} {
+ fs-traverse dir ${destroot} {
if {[file isdirectory ${dir}]} {
file attributes ${dir} -permissions 0755
}
}
}
-livecheck.type regex
-livecheck.url http://www.testplant.com/support/downloads/vine/
-livecheck.regex {>Vine Server ([0-9.]+)<}
+if {${name} eq ${subport}} {
+ version 4.01
+ revision 0
+ cvs.date {"2013-10-02 GMT"}
+
+ pre-fetch {
+ if {${os.platform} eq "darwin" && ${os.major} < 10} {
+ ui_error "${subport} @${version} requires Mac OS X 10.6 or newer. Try the ${name}3 port instead."
+ return -code error "incompatible Mac OS X version"
+ }
+ }
+
+ patchfiles patch-${subport}-OSXvnc.xcodeproj-project.pbxproj.diff
+
+ livecheck.type regex
+ livecheck.url http://osxvnc.cvs.sourceforge.net/viewvc/osxvnc/OSXvnc/Version.txt
+ livecheck.regex {^([0-9.]+)$}
+}
+
+subport ${name}3 {
+ version 3.12
+ revision 0
+ cvs.date {"2010-10-23 GMT"}
+ supported_archs i386 ppc
+
+ patchfiles patch-${subport}-OSXvnc.xcodeproj-project.pbxproj.diff \
+ patch-${subport}-OSXvnc-server-rfb.h.diff
+
+ pre-fetch {
+ if {${os.platform} eq "darwin" && ${os.major} > 10} {
+ ui_error "${subport} @${version} requires Mac OS X 10.6 or older. Try the ${name} port instead."
+ return -code error "incompatible Mac OS X version"
+ }
+ }
+
+ livecheck.type none
+}
Deleted: trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff
===================================================================
--- trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff 2013-11-11 10:27:05 UTC (rev 113173)
+++ trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff 2013-11-11 10:29:09 UTC (rev 113174)
@@ -1,30 +0,0 @@
---- OSXvnc.xcodeproj/project.pbxproj.orig 2009-09-10 10:11:42.000000000 -0500
-+++ OSXvnc.xcodeproj/project.pbxproj 2009-10-21 17:11:45.000000000 -0500
-@@ -1160,7 +1160,7 @@
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
-- shellScript = "# Bump the version for the NEXT release -- This one uses the prior value\n/Developer/Tools/agvtool bump";
-+ shellScript = "# Bump the version for the NEXT release -- This one uses the prior value\nif [ -x /Developer/Tools/agvtool ]; then\n AGVTOOL=/Developer/Tools/agvtool\nelif [ -x /Developer/usr/bin/agvtool ]; then\n AGVTOOL=/Developer/usr/bin/agvtool\nfi\n\nif [ \"$AGVTOOL-no\" != \"-no\" ]; then\n $AGVTOOL bump\nfi\n\n####\n# Please note that the above if block is required because Apple\n# relocated agvtool in Xcode 3.0. That said, this is a really\n# dumb script and could be done away with since we aren't committing\n# anything back to osxvnc CVS.\n####";
- };
- AB139E5C0CEA05C200EE873A /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
-@@ -1195,7 +1195,7 @@
- );
- runOnlyForDeploymentPostprocessing = 1;
- shellPath = /bin/sh;
-- shellScript = "# This removes any re-link reference to the $INSTALL_DIR\nrm -f \"$INSTALL_DIR/$PRODUCT_NAME.app/$PRODUCT_NAME.app\"\n# UDIF\nhdiutil create -ov -format UDZO -imagekey zlib-level=9 -srcfolder \"$INSTALL_DIR\" \"$INSTALL_DIR/../$PRODUCT_NAME.dmg\";\nhdiutil internet-enable \"$INSTALL_DIR/../$PRODUCT_NAME.dmg\"\n";
-+ shellScript = "# This removes any re-link reference to the $INSTALL_DIR\nrm -f \"$INSTALL_DIR/$PRODUCT_NAME.app/$PRODUCT_NAME.app\"\n";
- };
- /* End PBXShellScriptBuildPhase section */
-
-@@ -1685,9 +1685,6 @@
- buildSettings = {
- COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 1053;
-- DEPLOYMENT_LOCATION = YES;
-- DEPLOYMENT_POSTPROCESSING = YES;
-- DSTROOT = /tmp;
- GCC_DYNAMIC_NO_PIC = YES;
- GCC_ENABLE_FIX_AND_CONTINUE = NO;
- GCC_OPTIMIZATION_LEVEL = s;
Deleted: trunk/dports/aqua/vineserver/files/patch-rfb.h.diff
===================================================================
--- trunk/dports/aqua/vineserver/files/patch-rfb.h.diff 2013-11-11 10:27:05 UTC (rev 113173)
+++ trunk/dports/aqua/vineserver/files/patch-rfb.h.diff 2013-11-11 10:29:09 UTC (rev 113174)
@@ -1,20 +0,0 @@
---- OSXvnc-server/rfb.h.orig 2009-09-10 10:13:09.000000000 -0500
-+++ OSXvnc-server/rfb.h 2011-05-17 07:34:28.000000000 -0500
-@@ -30,6 +30,8 @@
- #include "Xmd.h"
- #include "regionstr.h"
-
-+#include <pthread.h>
-+#include <machine/types.h>
- #include <rfbproto.h>
- #include <vncauth.h>
- #include <zlib.h>
-@@ -41,7 +43,7 @@
- //#import <Carbon/Carbon.h>
- //#include <ApplicationServices/ApplicationServices.h>
- //#include "CoreGraphics/CGGeometry.h"
--#ifndef __COREGRAPHICS__
-+#ifndef COREGRAPHICS_H_
- struct CGPoint {
- float x;
- float y;
Copied: trunk/dports/aqua/vineserver/files/patch-vineserver-OSXvnc.xcodeproj-project.pbxproj.diff (from rev 113157, trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff)
===================================================================
--- trunk/dports/aqua/vineserver/files/patch-vineserver-OSXvnc.xcodeproj-project.pbxproj.diff (rev 0)
+++ trunk/dports/aqua/vineserver/files/patch-vineserver-OSXvnc.xcodeproj-project.pbxproj.diff 2013-11-11 10:29:09 UTC (rev 113174)
@@ -0,0 +1,36 @@
+--- OSXvnc.xcodeproj/project.pbxproj.orig 2012-07-26 11:56:12.000000000 -0500
++++ OSXvnc.xcodeproj/project.pbxproj 2013-11-11 04:00:57.000000000 -0600
+@@ -11,7 +11,6 @@
+ isa = PBXAggregateTarget;
+ buildConfigurationList = ABA30D4215BEE7670001BAE5 /* Build configuration list for PBXAggregateTarget "Vine Server Package" */;
+ buildPhases = (
+- ABA30D3C15BEE7310001BAE5 /* Build DMG */,
+ );
+ dependencies = (
+ ABA30D4115BEE7490001BAE5 /* PBXTargetDependency */,
+@@ -1296,7 +1295,6 @@
+ ABA30D3F15BEE7310001BAE5 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- CODE_SIGN_IDENTITY = "Developer ID Application: TestPlant Inc.";
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = "Vine Server Package";
+@@ -1401,9 +1399,6 @@
+ ABECD3EC08E46414009C84A0 /* Deployment */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+- DEPLOYMENT_LOCATION = YES;
+- DEPLOYMENT_POSTPROCESSING = YES;
+- DSTROOT = /tmp;
+ INFOPLIST_FILE = "VineServer-Info.plist";
+ INSTALL_PATH = "/Vine Server/";
+ PRODUCT_NAME = "Vine Server";
+@@ -1425,7 +1420,6 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+- CODE_SIGN_IDENTITY = "Developer ID Application: TestPlant Inc.";
+ DEPLOYMENT_POSTPROCESSING = YES;
+ INSTALL_PATH = /tmp;
+ MACOSX_DEPLOYMENT_TARGET = 10.6;
Copied: trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc-server-rfb.h.diff (from rev 113157, trunk/dports/aqua/vineserver/files/patch-rfb.h.diff)
===================================================================
--- trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc-server-rfb.h.diff (rev 0)
+++ trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc-server-rfb.h.diff 2013-11-11 10:29:09 UTC (rev 113174)
@@ -0,0 +1,11 @@
+--- OSXvnc-server/rfb.h.orig 2010-10-22 18:31:28.000000000 -0500
++++ OSXvnc-server/rfb.h 2013-11-10 00:39:00.000000000 -0600
+@@ -30,6 +30,8 @@
+ #include "Xmd.h"
+ #include "regionstr.h"
+
++#include <pthread.h>
++#include <machine/types.h>
+ #include <rfbproto.h>
+ #include <vncauth.h>
+ #include <zlib.h>
Copied: trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc.xcodeproj-project.pbxproj.diff (from rev 113157, trunk/dports/aqua/vineserver/files/patch-project.pbxproj.diff)
===================================================================
--- trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc.xcodeproj-project.pbxproj.diff (rev 0)
+++ trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc.xcodeproj-project.pbxproj.diff 2013-11-11 10:29:09 UTC (rev 113174)
@@ -0,0 +1,21 @@
+--- OSXvnc.xcodeproj/project.pbxproj.orig 2010-10-22 18:35:18.000000000 -0500
++++ OSXvnc.xcodeproj/project.pbxproj 2013-11-10 00:37:16.000000000 -0600
+@@ -1221,7 +1221,7 @@
+ );
+ runOnlyForDeploymentPostprocessing = 1;
+ shellPath = /bin/sh;
+- shellScript = "# This removes any re-link reference to the $INSTALL_DIR\nrm -f \"$INSTALL_DIR/$PRODUCT_NAME.app/$PRODUCT_NAME.app\"\n# UDIF\nhdiutil create -ov -format UDZO -imagekey zlib-level=9 -srcfolder \"$INSTALL_DIR\" \"$INSTALL_DIR/../$PRODUCT_NAME.dmg\";\nhdiutil internet-enable \"$INSTALL_DIR/../$PRODUCT_NAME.dmg\"\n";
++ shellScript = "# This removes any re-link reference to the $INSTALL_DIR\nrm -f \"$INSTALL_DIR/$PRODUCT_NAME.app/$PRODUCT_NAME.app\"\n";
+ };
+ /* End PBXShellScriptBuildPhase section */
+
+@@ -1705,9 +1705,6 @@
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+- DEPLOYMENT_LOCATION = YES;
+- DEPLOYMENT_POSTPROCESSING = YES;
+- DSTROOT = /tmp;
+ GCC_DYNAMIC_NO_PIC = YES;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_OPTIMIZATION_LEVEL = s;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131111/a6f0265f/attachment.html>
More information about the macports-changes
mailing list