[107042] trunk/dports/x11/wine-devel

ryandesign at macports.org ryandesign at macports.org
Sun Jun 16 02:41:07 PDT 2013


Revision: 107042
          https://trac.macports.org/changeset/107042
Author:   ryandesign at macports.org
Date:     2013-06-16 02:41:07 -0700 (Sun, 16 Jun 2013)
Log Message:
-----------
wine-devel: update to 1.6-rc2

Modified Paths:
--------------
    trunk/dports/x11/wine-devel/Portfile

Removed Paths:
-------------
    trunk/dports/x11/wine-devel/files/clang.patch
    trunk/dports/x11/wine-devel/files/not-clang.patch

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2013-06-16 06:34:03 UTC (rev 107041)
+++ trunk/dports/x11/wine-devel/Portfile	2013-06-16 09:41:07 UTC (rev 107042)
@@ -10,7 +10,7 @@
 name                        wine-devel
 conflicts                   wine wine-crossover
 set my_name                 wine
-version                     1.6-rc1
+version                     1.6-rc2
 
 license                     LGPL-2.1+
 categories                  x11
@@ -37,8 +37,8 @@
                             sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
 
 checksums                   ${wine_distfile} \
-                            rmd160  b1009ad56a30a9a99213b43bc8293622d8cc0f72 \
-                            sha256  7656c3600eaf5bb3eda05750f10f3f57954eaf11f7b8b2cb05507dc9e3ef245f \
+                            rmd160  a8a15d1d184b0b353b841428c188e5b968196112 \
+                            sha256  9d8f82f8a8d6190455b0d1a2b1528ba154ab03d9e65f518aded6046fa611c0ae \
                             ${wine_gecko_distfile} \
                             rmd160  e5aded4dfcde2462d9802478efe5aae1552e842d \
                             sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
@@ -158,15 +158,6 @@
     depends_skip_archcheck-append apple-gcc42
 }
 
-if {[string match "*clang*" ${configure.compiler}]} {
-    patchfiles-append clang.patch
-    post-patch {
-        reinplace "s|@CLANG@|${configure.cc}|g" ${worksrcpath}/tools/winebuild/utils.c
-    }
-} else {
-    patchfiles-append not-clang.patch
-}
-
 platform darwin {
     if {${os.major} <= 9} {
         # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."

Deleted: trunk/dports/x11/wine-devel/files/clang.patch
===================================================================
--- trunk/dports/x11/wine-devel/files/clang.patch	2013-06-16 06:34:03 UTC (rev 107041)
+++ trunk/dports/x11/wine-devel/files/clang.patch	2013-06-16 09:41:07 UTC (rev 107042)
@@ -1,21 +0,0 @@
---- tools/winebuild/utils.c.orig	2013-02-01 02:10:43.000000000 -0600
-+++ tools/winebuild/utils.c	2013-02-04 19:17:05.000000000 -0600
-@@ -354,17 +354,11 @@
- 
-     if (!as_command)
-     {
--        as_command = find_tool( "clang", NULL );
-+        as_command = "@CLANG@";
-         if (as_command) as_is_clang = 1;
-     }
- 
-     if (!as_command)
--    {
--        static const char * const commands[] = { "gas", "as", NULL };
--        as_command = find_tool( "as", commands );
--    }
--
--    if (!as_command)
-         fatal_error( "cannot find suitable assembler\n" );
- 
-     strarray_add_one( args, as_command );

Deleted: trunk/dports/x11/wine-devel/files/not-clang.patch
===================================================================
--- trunk/dports/x11/wine-devel/files/not-clang.patch	2013-06-16 06:34:03 UTC (rev 107041)
+++ trunk/dports/x11/wine-devel/files/not-clang.patch	2013-06-16 09:41:07 UTC (rev 107042)
@@ -1,18 +0,0 @@
---- tools/winebuild/utils.c.orig	2013-02-01 02:10:43.000000000 -0600
-+++ tools/winebuild/utils.c	2013-02-04 19:16:28.000000000 -0600
-@@ -354,14 +354,7 @@
- 
-     if (!as_command)
-     {
--        as_command = find_tool( "clang", NULL );
--        if (as_command) as_is_clang = 1;
--    }
--
--    if (!as_command)
--    {
--        static const char * const commands[] = { "gas", "as", NULL };
--        as_command = find_tool( "as", commands );
-+        as_command = find_tool( "as", NULL );
-     }
- 
-     if (!as_command)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130616/e7cdc9bc/attachment.html>


More information about the macports-changes mailing list