[85084] trunk/dports/x11

[ryandesign at macports.org]

Revision: 85084
          http://trac.macports.org/changeset/85084
Author:   ryandesign at macports.org
Date:     2011-10-09 06:08:28 -0700 (Sun, 09 Oct 2011)
Log Message:
-----------
wine-crossover, wine-crossover-games: merge r84933 from wine-devel: remove gnutls dependency except on Darwin 8; see #29909

Revision Links:
--------------
    http://trac.macports.org/changeset/84933

Modified Paths:
--------------
    trunk/dports/x11/wine-crossover/Portfile
    trunk/dports/x11/wine-crossover-games/Portfile

Property Changed:
----------------
    trunk/dports/x11/wine-crossover/
    trunk/dports/x11/wine-crossover-games/


Property changes on: trunk/dports/x11/wine-crossover
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/x11/wine-devel:58381,60835
   + /trunk/dports/x11/wine-devel:58381,60835,84933

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2011-10-09 13:07:19 UTC (rev 85083)
+++ trunk/dports/x11/wine-crossover/Portfile	2011-10-09 13:08:28 UTC (rev 85084)
@@ -43,7 +43,6 @@
 depends_lib                 port:expat \
                             port:fontconfig \
                             port:freetype \
-                            port:gnutls \
                             port:jpeg \
                             port:lcms \
                             port:libiconv \
@@ -67,7 +66,6 @@
 archcheck.files             lib/libexpat.dylib \
                             lib/libfontconfig.dylib \
                             lib/libfreetype.dylib \
-                            lib/libgnutls.dylib \
                             lib/libjpeg.dylib \
                             lib/liblcms.dylib \
                             lib/libiconv.dylib \
@@ -112,7 +110,7 @@
                             --with-freetype \
                             --without-gphoto \
                             --with-glu \
-                            --with-gnutls \
+                            --without-gnutls \
                             --without-gsm \
                             --without-hal \
                             --without-jack \
@@ -159,6 +157,15 @@
     }
 }
 
+platform darwin 8 {
+    # Wine uses the Security framework on Leopard and up.
+    # See http://bugs.winehq.org/show_bug.cgi?id=26643
+    depends_lib-append port:gnutls
+    archcheck.files-append lib/libgnutls.dylib
+    configure.args-delete --without-gnutls
+    configure.args-append --with-gnutls
+}
+
 platform darwin 9 {
     # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
     # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.


Property changes on: trunk/dports/x11/wine-crossover-games
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/x11/wine-devel:58381,60835
   + /trunk/dports/x11/wine-devel:58381,60835,84933

Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile	2011-10-09 13:07:19 UTC (rev 85083)
+++ trunk/dports/x11/wine-crossover-games/Portfile	2011-10-09 13:08:28 UTC (rev 85084)
@@ -46,7 +46,6 @@
 depends_lib                 port:expat \
                             port:fontconfig \
                             port:freetype \
-                            port:gnutls \
                             port:jpeg \
                             port:lcms \
                             port:libiconv \
@@ -70,7 +69,6 @@
 archcheck.files             lib/libexpat.dylib \
                             lib/libfontconfig.dylib \
                             lib/libfreetype.dylib \
-                            lib/libgnutls.dylib \
                             lib/libjpeg.dylib \
                             lib/liblcms.dylib \
                             lib/libiconv.dylib \
@@ -115,7 +113,7 @@
                             --with-freetype \
                             --without-gphoto \
                             --with-glu \
-                            --with-gnutls \
+                            --without-gnutls \
                             --without-gsm \
                             --without-hal \
                             --without-jack \
@@ -162,6 +160,15 @@
     }
 }
 
+platform darwin 8 {
+    # Wine uses the Security framework on Leopard and up.
+    # See http://bugs.winehq.org/show_bug.cgi?id=26643
+    depends_lib-append port:gnutls
+    archcheck.files-append lib/libgnutls.dylib
+    configure.args-delete --without-gnutls
+    configure.args-append --with-gnutls
+}
+
 platform darwin 9 {
     # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
     # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111009/974be689/attachment.html>