[128964] trunk/dports/x11

ryandesign at macports.org ryandesign at macports.org
Sun Nov 30 21:58:41 PST 2014


Revision: 128964
          https://trac.macports.org/changeset/128964
Author:   ryandesign at macports.org
Date:     2014-11-30 21:58:41 -0800 (Sun, 30 Nov 2014)
Log Message:
-----------
wine, wine-crossover, wine-devel: install wine mono installer (#44740); revert the portion of r91722 that disabled win16 support on Tiger because the Xcode bug that makes win16 support fail only affects the versions of Xcode available on Leopard

Revision Links:
--------------
    https://trac.macports.org/changeset/91722

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

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2014-12-01 05:09:06 UTC (rev 128963)
+++ trunk/dports/x11/wine/Portfile	2014-12-01 05:58:41 UTC (rev 128964)
@@ -8,13 +8,14 @@
 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
 
 # When updating the version of wine, update wine_gecko to a compatible version
-# per the table at http://wiki.winehq.org/Gecko
+# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
+# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
 
 name                        wine
 conflicts                   wine-devel wine-crossover
 set my_name                 wine
 version                     1.6.2
-revision                    2
+revision                    3
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -26,8 +27,8 @@
 set wine_distfile           ${distname}${extract.suffix}
 set wine_gecko_version      2.21
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
-distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only                ${wine_distfile}
+set wine_mono_version       4.5.4
+set wine_mono_distfile      wine-mono-${wine_mono_version}.msi
 build.target                depend all
 use_parallel_build          yes
 
@@ -36,15 +37,25 @@
 long_description            Wine is an implementation of the Windows APIs on top of X11.
 
 master_sites                http://www.ibiblio.org/pub/linux/system/emulators/wine/:winesource \
-                            sourceforge:project/wine/Source:winesource \
-                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
+                            sourceforge:project/wine/Source/:winesource \
+                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+                            sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
 
+extract.only                ${wine_distfile}
+
+distfiles                   ${wine_distfile}:winesource \
+                            ${wine_gecko_distfile}:winegecko \
+                            ${wine_mono_distfile}:winemono
+
 checksums                   ${wine_distfile} \
                             rmd160  7252851af5e9f748750685900c918e4fcb31c1f6 \
                             sha256  f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe \
                             ${wine_gecko_distfile} \
                             rmd160  e5aded4dfcde2462d9802478efe5aae1552e842d \
-                            sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
+                            sha256  f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 \
+                            ${wine_mono_distfile} \
+                            rmd160  f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+                            sha256  20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
 
 # Note: Most of the X11 libs are dlopen()'d
 depends_lib                 port:expat \
@@ -162,7 +173,7 @@
 compiler.blacklist-append   macports-gcc-*
 
 platform darwin {
-    if {${os.major} <= 9} {
+    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."
         # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
         # See http://bugs.winehq.org/show_bug.cgi?id=14920
@@ -197,6 +208,9 @@
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
 
+    xinstall -d ${destroot}${prefix}/share/wine/mono
+    xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \

Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile	2014-12-01 05:09:06 UTC (rev 128963)
+++ trunk/dports/x11/wine-crossover/Portfile	2014-12-01 05:58:41 UTC (rev 128964)
@@ -7,14 +7,15 @@
 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
 
 # When updating the version of wine, update wine_gecko to a compatible version
-# per the table at http://wiki.winehq.org/Gecko
+# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
+# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
 
 # Crossover-specific bug reports are accepted at info at codeweavers.com
 
 name                        wine-crossover
 conflicts                   wine wine-devel
 version                     13.1.2
-revision                    2
+revision                    3
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 jeremyhu openmaintainer
@@ -25,8 +26,8 @@
 set wine_distfile           ${distname}${extract.suffix}
 set wine_gecko_version      2.24
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
-distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only                ${wine_distfile}
+set wine_mono_version       4.5.4
+set wine_mono_distfile      wine-mono-${wine_mono_version}.msi
 worksrcdir                  sources/wine
 build.target                depend all
 use_parallel_build          yes
@@ -38,14 +39,24 @@
 
 master_sites                http://ftp.codeweavers.com/pub/crossover/source/:winesource \
                             http://ftp.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
-                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
+                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+                            sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
 
+extract.only                ${wine_distfile}
+
+distfiles                   ${wine_distfile}:winesource \
+                            ${wine_gecko_distfile}:winegecko \
+                            ${wine_mono_distfile}:winemono
+
 checksums                   ${wine_distfile} \
                             rmd160  d4f83fd5f593fec251a6441ad6aab043d81d6a30 \
                             sha256  e3a1877cfa5582c4a61f0e8c6823a0d8313d144f80e151df0b5e2edb2d3e37c7 \
                             ${wine_gecko_distfile} \
                             rmd160  109014e52d056962350681fd9d8178969cff939d \
-                            sha256  6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c
+                            sha256  6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c \
+                            ${wine_mono_distfile} \
+                            rmd160  f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+                            sha256  20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
 
 # Note: Most of the X11 libs are dlopen()'d
 depends_lib                 port:expat \
@@ -148,7 +159,7 @@
 compiler.blacklist-append   macports-gcc-*
 
 platform darwin {
-    if {${os.major} <= 9} {
+    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."
         # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
         # See http://bugs.winehq.org/show_bug.cgi?id=14920
@@ -183,6 +194,9 @@
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
 
+    xinstall -d ${destroot}${prefix}/share/wine/mono
+    xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2014-12-01 05:09:06 UTC (rev 128963)
+++ trunk/dports/x11/wine-devel/Portfile	2014-12-01 05:58:41 UTC (rev 128964)
@@ -8,12 +8,14 @@
 # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
 
 # When updating the version of wine, update wine_gecko to a compatible version
-# per the table at http://wiki.winehq.org/Gecko
+# per the table at http://wiki.winehq.org/Gecko and update wine-mono as well;
+# see http://wiki.winehq.org/Mono and http://sourceforge.net/projects/wine/files/Wine%20Mono/
 
 name                        wine-devel
 conflicts                   wine wine-crossover
 set my_name                 wine
 version                     1.7.32
+revision                    1
 license                     LGPL-2.1+
 categories                  x11
 maintainers                 ryandesign jwa openmaintainer
@@ -25,8 +27,8 @@
 set wine_distfile           ${distname}${extract.suffix}
 set wine_gecko_version      2.34
 set wine_gecko_distfile     wine_gecko-${wine_gecko_version}-x86.msi
-distfiles                   ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only                ${wine_distfile}
+set wine_mono_version       4.5.4
+set wine_mono_distfile      wine-mono-${wine_mono_version}.msi
 build.target                depend all
 use_parallel_build          yes
 
@@ -35,15 +37,25 @@
 long_description            Wine is an implementation of the Windows APIs on top of X11.
 
 master_sites                http://www.ibiblio.org/pub/linux/system/emulators/wine/:winesource \
-                            sourceforge:project/wine/Source:winesource \
-                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
+                            sourceforge:project/wine/Source/:winesource \
+                            sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+                            sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
 
+extract.only                ${wine_distfile}
+
+distfiles                   ${wine_distfile}:winesource \
+                            ${wine_gecko_distfile}:winegecko \
+                            ${wine_mono_distfile}:winemono
+
 checksums                   ${wine_distfile} \
                             rmd160  bf99a60afd65bd3dcb3542a4960af7f1c22a7a6a \
                             sha256  66a9c26089ad3b300aac1ac52e9515c69a7e6f26aff3250a7f1401e3f14de4db \
                             ${wine_gecko_distfile} \
                             rmd160  dccf963cc5a56d22492a7c197da7b58af241b708 \
-                            sha256  956c26bf302b1864f4d7cb6caee4fc83d4c1281157731761af6395b876e29ca7
+                            sha256  956c26bf302b1864f4d7cb6caee4fc83d4c1281157731761af6395b876e29ca7 \
+                            ${wine_mono_distfile} \
+                            rmd160  f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+                            sha256  20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
 
 # Note: Most of the X11 libs are dlopen()'d
 depends_lib                 port:expat \
@@ -166,7 +178,7 @@
 compiler.blacklist-append   macports-gcc-*
 
 platform darwin {
-    if {${os.major} <= 9} {
+    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."
         # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
         # See http://bugs.winehq.org/show_bug.cgi?id=14920
@@ -201,6 +213,9 @@
     xinstall -d ${destroot}${prefix}/share/wine/gecko
     xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
 
+    xinstall -d ${destroot}${prefix}/share/wine/mono
+    xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
     xinstall -d ${destroot}${prefix}/share/doc/${name}
     xinstall -m 644 -W ${worksrcpath} \
         ANNOUNCE \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141130/04315f38/attachment-0001.html>


More information about the macports-changes mailing list