<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[128964] trunk/dports/x11</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/128964">128964</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-11-30 21:58:41 -0800 (Sun, 30 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wine, wine-crossover, wine-devel: install wine mono installer (#44740); revert the portion of <a href="https://trac.macports.org/changeset/91722">r91722</a> that disabled win16 support on Tiger because the Xcode bug that makes win16 support fail only affects the versions of Xcode available on Leopard</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsx11winePortfile">trunk/dports/x11/wine/Portfile</a></li>
<li><a href="#trunkdportsx11winecrossoverPortfile">trunk/dports/x11/wine-crossover/Portfile</a></li>
<li><a href="#trunkdportsx11winedevelPortfile">trunk/dports/x11/wine-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsx11winePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/wine/Portfile (128963 => 128964)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,13 +8,14 @@
</span><span class="cx"> # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
</span><span class="cx">
</span><span class="cx"> # When updating the version of wine, update wine_gecko to a compatible version
</span><del>-# per the table at http://wiki.winehq.org/Gecko
</del><ins>+# 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/
</ins><span class="cx">
</span><span class="cx"> name wine
</span><span class="cx"> conflicts wine-devel wine-crossover
</span><span class="cx"> set my_name wine
</span><span class="cx"> version 1.6.2
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign jwa openmaintainer
</span><span class="lines">@@ -26,8 +27,8 @@
</span><span class="cx"> set wine_distfile ${distname}${extract.suffix}
</span><span class="cx"> set wine_gecko_version 2.21
</span><span class="cx"> set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
</span><del>-distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only ${wine_distfile}
</del><ins>+set wine_mono_version 4.5.4
+set wine_mono_distfile wine-mono-${wine_mono_version}.msi
</ins><span class="cx"> build.target depend all
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="lines">@@ -36,15 +37,25 @@
</span><span class="cx"> long_description Wine is an implementation of the Windows APIs on top of X11.
</span><span class="cx">
</span><span class="cx"> master_sites http://www.ibiblio.org/pub/linux/system/emulators/wine/:winesource \
</span><del>- sourceforge:project/wine/Source:winesource \
- sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
</del><ins>+ sourceforge:project/wine/Source/:winesource \
+ sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+ sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
</ins><span class="cx">
</span><ins>+extract.only ${wine_distfile}
+
+distfiles ${wine_distfile}:winesource \
+ ${wine_gecko_distfile}:winegecko \
+ ${wine_mono_distfile}:winemono
+
</ins><span class="cx"> checksums ${wine_distfile} \
</span><span class="cx"> rmd160 7252851af5e9f748750685900c918e4fcb31c1f6 \
</span><span class="cx"> sha256 f0ab9eede5a0ccacbf6e50682649f9377b9199e49cf55641f1787cf72405acbe \
</span><span class="cx"> ${wine_gecko_distfile} \
</span><span class="cx"> rmd160 e5aded4dfcde2462d9802478efe5aae1552e842d \
</span><del>- sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8
</del><ins>+ sha256 f01fafa6d7aab995c38add77315c4cbc2f32f52d5d6a9350056f42b62d631fd8 \
+ ${wine_mono_distfile} \
+ rmd160 f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+ sha256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
</ins><span class="cx">
</span><span class="cx"> # Note: Most of the X11 libs are dlopen()'d
</span><span class="cx"> depends_lib port:expat \
</span><span class="lines">@@ -162,7 +173,7 @@
</span><span class="cx"> compiler.blacklist-append macports-gcc-*
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${os.major} <= 9} {
</del><ins>+ if {${os.major} == 9} {
</ins><span class="cx"> # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
</span><span class="cx"> # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
</span><span class="cx"> # See http://bugs.winehq.org/show_bug.cgi?id=14920
</span><span class="lines">@@ -197,6 +208,9 @@
</span><span class="cx"> xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span class="cx"> xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span class="cx">
</span><ins>+ xinstall -d ${destroot}${prefix}/share/wine/mono
+ xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
</ins><span class="cx"> xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><span class="cx"> ANNOUNCE \
</span></span></pre></div>
<a id="trunkdportsx11winecrossoverPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/wine-crossover/Portfile (128963 => 128964)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -7,14 +7,15 @@
</span><span class="cx"> # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
</span><span class="cx">
</span><span class="cx"> # When updating the version of wine, update wine_gecko to a compatible version
</span><del>-# per the table at http://wiki.winehq.org/Gecko
</del><ins>+# 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/
</ins><span class="cx">
</span><span class="cx"> # Crossover-specific bug reports are accepted at info@codeweavers.com
</span><span class="cx">
</span><span class="cx"> name wine-crossover
</span><span class="cx"> conflicts wine wine-devel
</span><span class="cx"> version 13.1.2
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers jeremyhu openmaintainer
</span><span class="lines">@@ -25,8 +26,8 @@
</span><span class="cx"> set wine_distfile ${distname}${extract.suffix}
</span><span class="cx"> set wine_gecko_version 2.24
</span><span class="cx"> set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
</span><del>-distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only ${wine_distfile}
</del><ins>+set wine_mono_version 4.5.4
+set wine_mono_distfile wine-mono-${wine_mono_version}.msi
</ins><span class="cx"> worksrcdir sources/wine
</span><span class="cx"> build.target depend all
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -38,14 +39,24 @@
</span><span class="cx">
</span><span class="cx"> master_sites http://ftp.codeweavers.com/pub/crossover/source/:winesource \
</span><span class="cx"> http://ftp.codeweavers.com/pub/crossover/source/archive/${version}/:winesource \
</span><del>- sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
</del><ins>+ sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+ sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
</ins><span class="cx">
</span><ins>+extract.only ${wine_distfile}
+
+distfiles ${wine_distfile}:winesource \
+ ${wine_gecko_distfile}:winegecko \
+ ${wine_mono_distfile}:winemono
+
</ins><span class="cx"> checksums ${wine_distfile} \
</span><span class="cx"> rmd160 d4f83fd5f593fec251a6441ad6aab043d81d6a30 \
</span><span class="cx"> sha256 e3a1877cfa5582c4a61f0e8c6823a0d8313d144f80e151df0b5e2edb2d3e37c7 \
</span><span class="cx"> ${wine_gecko_distfile} \
</span><span class="cx"> rmd160 109014e52d056962350681fd9d8178969cff939d \
</span><del>- sha256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c
</del><ins>+ sha256 6e38acae87ea66e2c1e8f2f0afe88f89eed3e6e0b431cd3da38dea814b71202c \
+ ${wine_mono_distfile} \
+ rmd160 f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+ sha256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
</ins><span class="cx">
</span><span class="cx"> # Note: Most of the X11 libs are dlopen()'d
</span><span class="cx"> depends_lib port:expat \
</span><span class="lines">@@ -148,7 +159,7 @@
</span><span class="cx"> compiler.blacklist-append macports-gcc-*
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${os.major} <= 9} {
</del><ins>+ if {${os.major} == 9} {
</ins><span class="cx"> # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
</span><span class="cx"> # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
</span><span class="cx"> # See http://bugs.winehq.org/show_bug.cgi?id=14920
</span><span class="lines">@@ -183,6 +194,9 @@
</span><span class="cx"> xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span class="cx"> xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span class="cx">
</span><ins>+ xinstall -d ${destroot}${prefix}/share/wine/mono
+ xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
</ins><span class="cx"> xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><span class="cx"> ANNOUNCE \
</span></span></pre></div>
<a id="trunkdportsx11winedevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/x11/wine-devel/Portfile (128963 => 128964)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,12 +8,14 @@
</span><span class="cx"> # Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
</span><span class="cx">
</span><span class="cx"> # When updating the version of wine, update wine_gecko to a compatible version
</span><del>-# per the table at http://wiki.winehq.org/Gecko
</del><ins>+# 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/
</ins><span class="cx">
</span><span class="cx"> name wine-devel
</span><span class="cx"> conflicts wine wine-crossover
</span><span class="cx"> set my_name wine
</span><span class="cx"> version 1.7.32
</span><ins>+revision 1
</ins><span class="cx"> license LGPL-2.1+
</span><span class="cx"> categories x11
</span><span class="cx"> maintainers ryandesign jwa openmaintainer
</span><span class="lines">@@ -25,8 +27,8 @@
</span><span class="cx"> set wine_distfile ${distname}${extract.suffix}
</span><span class="cx"> set wine_gecko_version 2.34
</span><span class="cx"> set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
</span><del>-distfiles ${wine_distfile}:winesource ${wine_gecko_distfile}:winegecko
-extract.only ${wine_distfile}
</del><ins>+set wine_mono_version 4.5.4
+set wine_mono_distfile wine-mono-${wine_mono_version}.msi
</ins><span class="cx"> build.target depend all
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="lines">@@ -35,15 +37,25 @@
</span><span class="cx"> long_description Wine is an implementation of the Windows APIs on top of X11.
</span><span class="cx">
</span><span class="cx"> master_sites http://www.ibiblio.org/pub/linux/system/emulators/wine/:winesource \
</span><del>- sourceforge:project/wine/Source:winesource \
- sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}:winegecko
</del><ins>+ sourceforge:project/wine/Source/:winesource \
+ sourceforge:project/wine/Wine%20Gecko/${wine_gecko_version}/:winegecko \
+ sourceforge:project/wine/Wine%20Mono/${wine_mono_version}/:winemono
</ins><span class="cx">
</span><ins>+extract.only ${wine_distfile}
+
+distfiles ${wine_distfile}:winesource \
+ ${wine_gecko_distfile}:winegecko \
+ ${wine_mono_distfile}:winemono
+
</ins><span class="cx"> checksums ${wine_distfile} \
</span><span class="cx"> rmd160 bf99a60afd65bd3dcb3542a4960af7f1c22a7a6a \
</span><span class="cx"> sha256 66a9c26089ad3b300aac1ac52e9515c69a7e6f26aff3250a7f1401e3f14de4db \
</span><span class="cx"> ${wine_gecko_distfile} \
</span><span class="cx"> rmd160 dccf963cc5a56d22492a7c197da7b58af241b708 \
</span><del>- sha256 956c26bf302b1864f4d7cb6caee4fc83d4c1281157731761af6395b876e29ca7
</del><ins>+ sha256 956c26bf302b1864f4d7cb6caee4fc83d4c1281157731761af6395b876e29ca7 \
+ ${wine_mono_distfile} \
+ rmd160 f4d7b2036a0ba87285df7fef10d4a0a495a32e17 \
+ sha256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2
</ins><span class="cx">
</span><span class="cx"> # Note: Most of the X11 libs are dlopen()'d
</span><span class="cx"> depends_lib port:expat \
</span><span class="lines">@@ -166,7 +178,7 @@
</span><span class="cx"> compiler.blacklist-append macports-gcc-*
</span><span class="cx">
</span><span class="cx"> platform darwin {
</span><del>- if {${os.major} <= 9} {
</del><ins>+ if {${os.major} == 9} {
</ins><span class="cx"> # Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
</span><span class="cx"> # Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
</span><span class="cx"> # See http://bugs.winehq.org/show_bug.cgi?id=14920
</span><span class="lines">@@ -201,6 +213,9 @@
</span><span class="cx"> xinstall -d ${destroot}${prefix}/share/wine/gecko
</span><span class="cx"> xinstall -m 644 ${distpath}/${wine_gecko_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span class="cx">
</span><ins>+ xinstall -d ${destroot}${prefix}/share/wine/mono
+ xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
+
</ins><span class="cx"> xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} \
</span><span class="cx"> ANNOUNCE \
</span></span></pre>
</div>
</div>
</body>
</html>