Changeset 113174 for trunk/dports/aqua


Ignore:
Timestamp:
Nov 11, 2013, 10:29:09 AM (6 years ago)
Author:
ryandesign@…
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

Location:
trunk/dports/aqua/vineserver
Files:
1 edited
1 copied
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/vineserver/Portfile

    r96065 r113174  
    66
    77name                    vineserver
    8 version                 3.1
    9 revision                1
    108categories              aqua vnc
    119homepage                http://www.testplant.com/products/vine_server
    1210maintainers             ryandesign
    13 supported_archs         i386 ppc
    1411
    1512fetch.type              cvs
    1613cvs.root                :pserver:anonymous@osxvnc.cvs.sourceforge.net:/cvsroot/osxvnc
    1714cvs.module              OSXvnc
    18 cvs.tag                 V[strsed ${version} {g/\./_/}]
    1915worksrcdir              OSXvnc
    2016
     
    3329    port:zlib
    3430
    35 patchfiles \
    36     patch-project.pbxproj.diff \
    37     patch-rfb.h.diff
    38 
    3931post-patch {
    4032    # Make all strings UTF-16 so CopyStringsFile doesn't fail on Leopard. See #15919.
    41     set language_encodings {
    42         English utf-8
    43         German macroman
    44         Italian macroman
    45         Japanese utf-8
    46     }
    47     foreach {language encoding} ${language_encodings} {
    48         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"
     33    foreach strings [glob ${worksrcpath}/*.lproj/Localizable.strings] {
     34        copy ${strings} ${strings}.orig
     35        system "${prefix}/bin/iconv -f utf-8 -t utf-16 ${strings}.orig > ${strings}"
    4936    }
    5037}
     
    5239post-destroot {
    5340    # Fix permissions for users not installing with root
    54     fs-traverse dir ${workpath} {
     41    fs-traverse dir ${destroot} {
    5542        if {[file isdirectory ${dir}]} {
    5643            file attributes ${dir} -permissions 0755
     
    5946}
    6047
    61 livecheck.type          regex
    62 livecheck.url           http://www.testplant.com/support/downloads/vine/
    63 livecheck.regex         {>Vine Server ([0-9.]+)<}
     48if {${name} eq ${subport}} {
     49    version             4.01
     50    revision            0
     51    cvs.date            {"2013-10-02 GMT"}
     52
     53    pre-fetch {
     54        if {${os.platform} eq "darwin" && ${os.major} < 10} {
     55            ui_error "${subport} @${version} requires Mac OS X 10.6 or newer. Try the ${name}3 port instead."
     56            return -code error "incompatible Mac OS X version"
     57        }
     58    }
     59
     60    patchfiles          patch-${subport}-OSXvnc.xcodeproj-project.pbxproj.diff
     61
     62    livecheck.type      regex
     63    livecheck.url       http://osxvnc.cvs.sourceforge.net/viewvc/osxvnc/OSXvnc/Version.txt
     64    livecheck.regex     {^([0-9.]+)$}
     65}
     66
     67subport ${name}3 {
     68    version             3.12
     69    revision            0
     70    cvs.date            {"2010-10-23 GMT"}
     71    supported_archs     i386 ppc
     72
     73    patchfiles          patch-${subport}-OSXvnc.xcodeproj-project.pbxproj.diff \
     74                        patch-${subport}-OSXvnc-server-rfb.h.diff
     75
     76    pre-fetch {
     77        if {${os.platform} eq "darwin" && ${os.major} > 10} {
     78            ui_error "${subport} @${version} requires Mac OS X 10.6 or older. Try the ${name} port instead."
     79            return -code error "incompatible Mac OS X version"
     80        }
     81    }
     82
     83    livecheck.type      none
     84}
  • trunk/dports/aqua/vineserver/files/patch-vineserver-OSXvnc.xcodeproj-project.pbxproj.diff

    r113157 r113174  
    1 --- OSXvnc.xcodeproj/project.pbxproj.orig       2009-09-10 10:11:42.000000000 -0500
    2 +++ OSXvnc.xcodeproj/project.pbxproj    2009-10-21 17:11:45.000000000 -0500
    3 @@ -1160,7 +1160,7 @@
     1--- OSXvnc.xcodeproj/project.pbxproj.orig       2012-07-26 11:56:12.000000000 -0500
     2+++ OSXvnc.xcodeproj/project.pbxproj    2013-11-11 04:00:57.000000000 -0600
     3@@ -11,7 +11,6 @@
     4                        isa = PBXAggregateTarget;
     5                        buildConfigurationList = ABA30D4215BEE7670001BAE5 /* Build configuration list for PBXAggregateTarget "Vine Server Package" */;
     6                        buildPhases = (
     7-                               ABA30D3C15BEE7310001BAE5 /* Build DMG */,
    48                        );
    5                         runOnlyForDeploymentPostprocessing = 1;
    6                         shellPath = /bin/sh;
    7 -                       shellScript = "# Bump the version for the NEXT release -- This one uses the prior value\n/Developer/Tools/agvtool bump";
    8 +                       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####";
    9                 };
    10                 AB139E5C0CEA05C200EE873A /* ShellScript */ = {
    11                         isa = PBXShellScriptBuildPhase;
    12 @@ -1195,7 +1195,7 @@
    13                         );
    14                         runOnlyForDeploymentPostprocessing = 1;
    15                         shellPath = /bin/sh;
    16 -                       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";
    17 +                       shellScript = "# This removes any re-link reference to the $INSTALL_DIR\nrm -f \"$INSTALL_DIR/$PRODUCT_NAME.app/$PRODUCT_NAME.app\"\n";
    18                 };
    19  /* End PBXShellScriptBuildPhase section */
    20  
    21 @@ -1685,9 +1685,6 @@
     9                        dependencies = (
     10                                ABA30D4115BEE7490001BAE5 /* PBXTargetDependency */,
     11@@ -1296,7 +1295,6 @@
     12                ABA30D3F15BEE7310001BAE5 /* Deployment */ = {
     13                        isa = XCBuildConfiguration;
    2214                        buildSettings = {
    23                                 COPY_PHASE_STRIP = YES;
    24                                 CURRENT_PROJECT_VERSION = 1053;
     15-                               CODE_SIGN_IDENTITY = "Developer ID Application: TestPlant Inc.";
     16                                DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
     17                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
     18                                PRODUCT_NAME = "Vine Server Package";
     19@@ -1401,9 +1399,6 @@
     20                ABECD3EC08E46414009C84A0 /* Deployment */ = {
     21                        isa = XCBuildConfiguration;
     22                        buildSettings = {
    2523-                               DEPLOYMENT_LOCATION = YES;
    2624-                               DEPLOYMENT_POSTPROCESSING = YES;
    2725-                               DSTROOT = /tmp;
    28                                 GCC_DYNAMIC_NO_PIC = YES;
    29                                 GCC_ENABLE_FIX_AND_CONTINUE = NO;
    30                                 GCC_OPTIMIZATION_LEVEL = s;
     26                                INFOPLIST_FILE = "VineServer-Info.plist";
     27                                INSTALL_PATH = "/Vine Server/";
     28                                PRODUCT_NAME = "Vine Server";
     29@@ -1425,7 +1420,6 @@
     30                        isa = XCBuildConfiguration;
     31                        buildSettings = {
     32                                ARCHS = "$(ARCHS_STANDARD_32_BIT)";
     33-                               CODE_SIGN_IDENTITY = "Developer ID Application: TestPlant Inc.";
     34                                DEPLOYMENT_POSTPROCESSING = YES;
     35                                INSTALL_PATH = /tmp;
     36                                MACOSX_DEPLOYMENT_TARGET = 10.6;
  • trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc-server-rfb.h.diff

    r113157 r113174  
    1 --- OSXvnc-server/rfb.h.orig    2009-09-10 10:13:09.000000000 -0500
    2 +++ OSXvnc-server/rfb.h 2011-05-17 07:34:28.000000000 -0500
     1--- OSXvnc-server/rfb.h.orig    2010-10-22 18:31:28.000000000 -0500
     2+++ OSXvnc-server/rfb.h 2013-11-10 00:39:00.000000000 -0600
    33@@ -30,6 +30,8 @@
    44 #include "Xmd.h"
     
    1010 #include <vncauth.h>
    1111 #include <zlib.h>
    12 @@ -41,7 +43,7 @@
    13  //#import <Carbon/Carbon.h>
    14  //#include <ApplicationServices/ApplicationServices.h>
    15  //#include "CoreGraphics/CGGeometry.h"
    16 -#ifndef __COREGRAPHICS__
    17 +#ifndef COREGRAPHICS_H_
    18  struct CGPoint {
    19      float x;
    20      float y;
  • trunk/dports/aqua/vineserver/files/patch-vineserver3-OSXvnc.xcodeproj-project.pbxproj.diff

    r113157 r113174  
    1 --- OSXvnc.xcodeproj/project.pbxproj.orig       2009-09-10 10:11:42.000000000 -0500
    2 +++ OSXvnc.xcodeproj/project.pbxproj    2009-10-21 17:11:45.000000000 -0500
    3 @@ -1160,7 +1160,7 @@
    4                         );
    5                         runOnlyForDeploymentPostprocessing = 1;
    6                         shellPath = /bin/sh;
    7 -                       shellScript = "# Bump the version for the NEXT release -- This one uses the prior value\n/Developer/Tools/agvtool bump";
    8 +                       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####";
    9                 };
    10                 AB139E5C0CEA05C200EE873A /* ShellScript */ = {
    11                         isa = PBXShellScriptBuildPhase;
    12 @@ -1195,7 +1195,7 @@
     1--- OSXvnc.xcodeproj/project.pbxproj.orig       2010-10-22 18:35:18.000000000 -0500
     2+++ OSXvnc.xcodeproj/project.pbxproj    2013-11-10 00:37:16.000000000 -0600
     3@@ -1221,7 +1221,7 @@
    134                        );
    145                        runOnlyForDeploymentPostprocessing = 1;
     
    1910 /* End PBXShellScriptBuildPhase section */
    2011 
    21 @@ -1685,9 +1685,6 @@
     12@@ -1705,9 +1705,6 @@
     13                        isa = XCBuildConfiguration;
    2214                        buildSettings = {
    2315                                COPY_PHASE_STRIP = YES;
    24                                 CURRENT_PROJECT_VERSION = 1053;
    2516-                               DEPLOYMENT_LOCATION = YES;
    2617-                               DEPLOYMENT_POSTPROCESSING = YES;
Note: See TracChangeset for help on using the changeset viewer.