[114861] trunk/dports/aqua/vineserver/Portfile

ryandesign at macports.org ryandesign at macports.org
Tue Dec 17 22:56:01 PST 2013


Revision: 114861
          https://trac.macports.org/changeset/114861
Author:   ryandesign at macports.org
Date:     2013-12-17 22:56:01 -0800 (Tue, 17 Dec 2013)
Log Message:
-----------
vineserver: replaced_by vineserver3 on Leopard and older

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

Modified: trunk/dports/aqua/vineserver/Portfile
===================================================================
--- trunk/dports/aqua/vineserver/Portfile	2013-12-18 05:27:32 UTC (rev 114860)
+++ trunk/dports/aqua/vineserver/Portfile	2013-12-18 06:56:01 UTC (rev 114861)
@@ -46,15 +46,19 @@
 }
 
 if {${name} eq ${subport}} {
-    conflicts           ${name}3
     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"
+    platform darwin {
+        if {${os.major} < 10} {
+            replaced_by ${name}3
+            pre-fetch {
+                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"
+            }
+        } elseif {${os.major} == 10} {
+            conflicts   ${name}3
         }
     }
 
@@ -66,7 +70,6 @@
 }
 
 subport ${name}3 {
-    conflicts           ${name}
     version             3.12
     revision            0
     cvs.date            {"2010-10-23 GMT"}
@@ -75,10 +78,14 @@
     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"
+    platform darwin {
+        if {${os.major} > 10} {
+            pre-fetch {
+                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"
+            }
+        } elseif {${os.major} == 10} {
+            conflicts   ${name}
         }
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131217/7607a7bd/attachment.html>


More information about the macports-changes mailing list