[36513] trunk/dports/x11/winetricks

[ryandesign at macports.org]

Revision: 36513
          http://trac.macosforge.org/projects/macports/changeset/36513
Author:   ryandesign at macports.org
Date:     2008-05-04 20:44:56 -0700 (Sun, 04 May 2008)

Log Message:
-----------
winetricks:

 * update to 20080502
 * change dependencies on wget and coreutils to curl and openssl; I think MacPorts users are more likely to already have the latter rather than the former

Changes between 20080328 and 20080418:

 * rename windows version options
 * add options to set windows version to windows 2000 or vista
 * use curl if available instead of wget
 * use openssl if available instead of sha1sum
 * include more core fonts
 * only show eula once for fonts
 * update flash version
 * update liberation fonts version
 * update mono12 version to 1.9
 * add dotnet20, wmp9 and wmp10 options

Changes between 20080418 and 20080423:

 * remove mono11
 * rename mono12 to mono19 and update to version 1.9.1
 * update xvid to 1.1.3-12042008

Changes between 20080423 and 20080502:

 * support spaces in cache directory name
 * rework curl support

Modified Paths:
--------------
    trunk/dports/x11/winetricks/Portfile
    trunk/dports/x11/winetricks/files/patch-x11prefix.diff

Added Paths:
-----------
    trunk/dports/x11/winetricks/files/patch-curl-openssl.diff

Removed Paths:
-------------
    trunk/dports/x11/winetricks/files/patch-gsha1sum.diff

Modified: trunk/dports/x11/winetricks/Portfile
===================================================================
--- trunk/dports/x11/winetricks/Portfile	2008-05-05 00:23:04 UTC (rev 36512)
+++ trunk/dports/x11/winetricks/Portfile	2008-05-05 03:44:56 UTC (rev 36513)
@@ -3,7 +3,7 @@
 PortSystem              1.0
 
 name                    winetricks
-version                 20080406
+version                 20080502
 categories              x11
 maintainers             ryandesign
 homepage                http://www.kegel.com/wine/
@@ -25,27 +25,20 @@
     redistributable runtime libraries or fonts.
 
 checksums \
-    md5 d3767cca42d3a6f41b5c94d708826c70 \
-    sha1 d1a0b09b1ec67022ff98a11778d1771de33b5a36 \
-    rmd160 61631001cf8e0e5a696da2e026e48d5fce7edd08
+    md5 0d0880139a8e1fbe6191c8c82ad16597 \
+    sha1 950cf457afdcbd291da53ba6421e5e25b208f19b \
+    rmd160 8afaba7e306ab3bfd1bf4c5d86d6706581b3ee0b
 
 patchfiles \
+    patch-curl-openssl.diff \
     patch-x11prefix.diff
 
-# wget is required until we write and submit upstream a patch to allow it to use curl instead of wget
 depends_run \
     port:wine \
     port:cabextract \
-    port:wget
+    port:openssl \
+    bin:curl:curl
 
-# coreutils is required until we write and submit upstream a patch to let it use openssl dgst -sha1 instead of sha1sum
-platform darwin {
-    depends_run-append \
-        port:coreutils
-    patchfiles-append \
-        patch-gsha1sum.diff
-}
-
 extract {
     copy ${distpath}/${name} ${worksrcpath}
 }

Added: trunk/dports/x11/winetricks/files/patch-curl-openssl.diff
===================================================================
--- trunk/dports/x11/winetricks/files/patch-curl-openssl.diff	                        (rev 0)
+++ trunk/dports/x11/winetricks/files/patch-curl-openssl.diff	2008-05-05 03:44:56 UTC (rev 36513)
@@ -0,0 +1,20 @@
+--- winetricks	2008-05-04 22:24:03.000000000 -0500
++++ winetricks	2008-05-04 22:25:57.000000000 -0500
+@@ -239,7 +239,7 @@
+ programfilesdir_unix=`$WINE winepath -u "$programfilesdir_win"`
+ 
+ # Mac folks tend to not have sha1sum, but we can make do with openssl
+-if which sha1sum > /dev/null
++if [ -x "`which sha1sum`" ]
+ then
+    SHA1SUM="sha1sum"
+ else
+@@ -297,7 +297,7 @@
+     then
+         cd "$cache"
+         # Mac folks tend to have curl rather than wget
+-        if which wget > /dev/null
++        if [ -x "`which wget`" ]
+         then
+            # Use -nd to insulate ourselves from people who set -x in WGETRC
+            # [*] --retry-connrefused works around the broken sf.net mirroring

Deleted: trunk/dports/x11/winetricks/files/patch-gsha1sum.diff
===================================================================
--- trunk/dports/x11/winetricks/files/patch-gsha1sum.diff	2008-05-05 00:23:04 UTC (rev 36512)
+++ trunk/dports/x11/winetricks/files/patch-gsha1sum.diff	2008-05-05 03:44:56 UTC (rev 36513)
@@ -1,11 +0,0 @@
---- winetricks	2008-02-26 15:55:39.000000000 -0600
-+++ winetricks	2008-02-26 15:56:18.000000000 -0600
-@@ -251,7 +251,7 @@
-     if [ "$3"x != ""x ]
-     then
- 	echo "$3  $cache/$file" > $cache/$file.sha1sum
--	try sha1sum --status -c $cache/$file.sha1sum
-+	try gsha1sum --status -c $cache/$file.sha1sum
-     fi
- }
- 

Modified: trunk/dports/x11/winetricks/files/patch-x11prefix.diff
===================================================================
--- trunk/dports/x11/winetricks/files/patch-x11prefix.diff	2008-05-05 00:23:04 UTC (rev 36512)
+++ trunk/dports/x11/winetricks/files/patch-x11prefix.diff	2008-05-05 03:44:56 UTC (rev 36513)
@@ -1,6 +1,15 @@
---- winetricks	2008-02-26 16:08:33.000000000 -0600
-+++ winetricks	2008-02-26 16:08:52.000000000 -0600
-@@ -176,7 +176,7 @@
+--- winetricks	2008-05-04 19:51:33.000000000 -0500
++++ winetricks	2008-05-04 19:56:27.000000000 -0500
+@@ -29,7 +29,7 @@
+   echo "$@"
+ 
+   case x"$GUI" in
+-  x1) xmessage -center "               Winetricks error: $@                 " ;;
++  x1) @X11PREFIX@/bin/xmessage -center "               Winetricks error: $@                 " ;;
+   *) ;;
+   esac
+ 
+@@ -196,7 +196,7 @@
          shift
      done
      (echo "$title"; echo ""; echo "$text") > /tmp/x_showmenu.txt 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080504/aba7799e/attachment-0001.html