[71551] trunk/dports/x11/wine-crossover-games

[ryandesign at macports.org]

Revision: 71551
          http://trac.macports.org/changeset/71551
Author:   ryandesign at macports.org
Date:     2010-09-16 11:54:27 -0700 (Thu, 16 Sep 2010)
Log Message:
-----------
wine-crossover-games: update to 9.1.0, based on wine 1.2

Modified Paths:
--------------
    trunk/dports/x11/wine-crossover-games/Portfile
    trunk/dports/x11/wine-crossover-games/files/sl-audio.patch

Removed Paths:
-------------
    trunk/dports/x11/wine-crossover-games/files/openssl-1.patch

Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile	2010-09-16 17:37:10 UTC (rev 71550)
+++ trunk/dports/x11/wine-crossover-games/Portfile	2010-09-16 18:54:27 UTC (rev 71551)
@@ -6,8 +6,7 @@
 
 name                        wine-crossover-games
 conflicts                   wine wine-devel
-version                     9.0.1
-revision                    2
+version                     9.1.0
 categories                  x11
 maintainers                 jeremyhu openmaintainer
 homepage                    http://www.codeweavers.com/
@@ -19,7 +18,7 @@
 
 minimum_xcodeversions       {8 2.5}
 
-description                 Wine Is Not an Emulator (1.1.34 with CodeWeavers modifications)
+description                 Wine Is Not an Emulator (1.2 with CodeWeavers modifications)
 
 long_description            Wine is an implementation of the Windows APIs on top of X11. \
                             This version contains the Codeweavers patches for Crossover Games
@@ -27,9 +26,8 @@
 master_sites                http://media.codeweavers.com/pub/crossover/source/ \
                             http://media.codeweavers.com/pub/crossover/source/archive/${version}/
 
-checksums                   md5     964f204bf47f022ee7790937c3c35984 \
-                            sha1    d45433f5479eefd39df613a6c58f046ccfbcccbe \
-                            rmd160  a8d8a75f638d3bcd7480661cb530d9e051b341d2
+checksums                   sha1    663217c6c0dfa1f0c3140dfff43fab916ab49dfb \
+                            rmd160  8a1f64c8f8b4e2467fb1b2aeb8c08e962a6d7c69
 
 depends_lib                 port:expat \
                             port:fontconfig \
@@ -83,7 +81,7 @@
 # interferes with the wine build (which uses parts of them if present).
 extract.post_args-append    wine
 
-patchfiles                  sl-audio.patch openssl-1.patch
+patchfiles                  sl-audio.patch
 
 configure.ldflags-append    -framework CoreServices \
                             -lz

Deleted: trunk/dports/x11/wine-crossover-games/files/openssl-1.patch
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/openssl-1.patch	2010-09-16 17:37:10 UTC (rev 71550)
+++ trunk/dports/x11/wine-crossover-games/files/openssl-1.patch	2010-09-16 18:54:27 UTC (rev 71551)
@@ -1,47 +0,0 @@
-From eb0fcfd1534b8bd92f8008ae8c9beb5deb5ad353 Mon Sep 17 00:00:00 2001
-From: Juan Lang <juan.lang at gmail.com>
-Date: Fri, 4 Dec 2009 16:41:53 -0800
-Subject: [PATCH] Use sk_ functions rather than accessing an OpenSSL stack type directly
-
----
- dlls/winhttp/net.c |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c
-index 3ed3b1b..4a3cc90 100644
---- dlls/winhttp/net.c
-+++ dlls/winhttp/net.c
-@@ -124,6 +124,8 @@ MAKE_FUNCPTR( CRYPTO_set_locking_callback );
- MAKE_FUNCPTR( ERR_get_error );
- MAKE_FUNCPTR( ERR_error_string );
- MAKE_FUNCPTR( i2d_X509 );
-+MAKE_FUNCPTR( sk_value );
-+MAKE_FUNCPTR( sk_num );
- #undef MAKE_FUNCPTR
- 
- static CRITICAL_SECTION *ssl_locks;
-@@ -339,11 +341,11 @@ static int netconn_secure_verify( int preverify_ok, X509_STORE_CTX *ctx )
-             PCCERT_CONTEXT endCert = NULL;
- 
-             ret = TRUE;
--            for (i = 0; ret && i < ctx->chain->num; i++)
-+            for (i = 0; ret && i < psk_num((struct stack_st *)ctx->chain); i++)
-             {
-                 PCCERT_CONTEXT context;
- 
--                cert = (X509 *)ctx->chain->data[i];
-+                cert = (X509 *)psk_value((struct stack_st *)ctx->chain, i);
-                 if ((context = X509_to_cert_context( cert )))
-                 {
-                     if (i == 0)
-@@ -441,6 +443,8 @@ BOOL netconn_init( netconn_t *conn, BOOL secure )
-     LOAD_FUNCPTR( ERR_get_error );
-     LOAD_FUNCPTR( ERR_error_string );
-     LOAD_FUNCPTR( i2d_X509 );
-+    LOAD_FUNCPTR( sk_value );
-+    LOAD_FUNCPTR( sk_num );
- #undef LOAD_FUNCPTR
- 
-     pSSL_library_init();
--- 
-1.5.2.2

Modified: trunk/dports/x11/wine-crossover-games/files/sl-audio.patch
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/sl-audio.patch	2010-09-16 17:37:10 UTC (rev 71550)
+++ trunk/dports/x11/wine-crossover-games/files/sl-audio.patch	2010-09-16 18:54:27 UTC (rev 71551)
@@ -1,6 +1,6 @@
---- dlls/winecoreaudio.drv/audio.c.orig	2009-12-20 16:38:10.000000000 -0800
-+++ dlls/winecoreaudio.drv/audio.c	2009-12-20 16:39:54.000000000 -0800
-@@ -50,7 +50,6 @@
+--- dlls/winecoreaudio.drv/audio.c.orig	2010-07-27 14:56:49.000000000 -0500
++++ dlls/winecoreaudio.drv/audio.c	2010-09-16 12:33:09.000000000 -0500
+@@ -56,7 +56,6 @@
  #include "wine/unicode.h"
  #include "wine/library.h"
  #include "wine/debug.h"
@@ -8,7 +8,7 @@
  
  WINE_DEFAULT_DEBUG_CHANNEL(wave);
  
-@@ -61,6 +60,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave);
+@@ -64,6 +63,12 @@
  
  WINE_DECLARE_DEBUG_CHANNEL(coreaudio);
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100916/e5250c55/attachment-0001.html>