Update to Wine 1.1.32. Among others, this includes the following changes:

 - Many crypto fixes (particularly on 64-bit).
 - Several common controls improvements.
 - Various HTML support improvements.
 - More DIB optimizations.
 - Various bug fixes.

An updated patch of mine to address PR 137999 is now included upstream.

8 files changed, 16 insertions, 72 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 25857c06ca06..e9c7b28c557e 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.1.31
+DISTVERSION=	1.1.32
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index d63166362566..5abd218a15b7 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-1.1.31.tar.bz2) = 87fb94c218e52dd67c75b4ae5ef50c0e
-SHA256 (wine-1.1.31.tar.bz2) = 42c9ab673a26dba2331867427e2fdd4c977e4452c4227714b6ebfae6fc7f9e30
-SIZE (wine-1.1.31.tar.bz2) = 15797069
+MD5 (wine-1.1.32.tar.bz2) = 4a3fe87363b75cdca55ed9187fcf5f08
+SHA256 (wine-1.1.32.tar.bz2) = 05c08dbfe87a3cc4feef950cb7c7830fe467723171170726b005b3b14f6ef03b
+SIZE (wine-1.1.32.tar.bz2) = 15871530
diff --git a/emulators/wine-devel/files/patch-tools-winebuild b/emulators/wine-devel/files/patch-tools-winebuild
deleted file mode 100644
index 2c988a437568..000000000000
--- a/emulators/wine-devel/files/patch-tools-winebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
-index e0cd8bc..6008ef4 100644
---- tools/winebuild/utils.c
-+++ tools/winebuild/utils.c
-@@ -297,9 +297,23 @@ const char *get_ld_command(void)
- 
-         if (force_pointer_size)
-         {
--            const char *args = (target_platform == PLATFORM_APPLE) ?
--                ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") :
--                ((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386");
-+            const char *args;
-+
-+            switch (target_platform)
-+            {
-+                case PLATFORM_APPLE:
-+                    args = (force_pointer_size == 8) ? " -arch x86_64"
-+                                                     : " -arch i386";
-+                    break;
-+                case PLATFORM_FREEBSD:
-+                    args = (force_pointer_size == 8) ? " -m elf_x86_64"
-+                                                     : " -m elf_i386_fbsd";
-+                    break;
-+                default:
-+                    args = (force_pointer_size == 8) ? " -m elf_x86_64"
-+                                                     : " -m elf_i386";
-+            }
-+
-             ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 );
-             strcat( ld_command, args );
-         }
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 495352f6ed59..4a9dd32a4347 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -698,6 +698,7 @@ lib/wine/dxgi.dll.so
 lib/wine/eject.exe.so
 lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
+lib/wine/extrac32.exe.so
 lib/wine/fakedlls/acledit.dll
 lib/wine/fakedlls/aclui.dll
 lib/wine/fakedlls/activeds.dll
@@ -803,6 +804,7 @@ lib/wine/fakedlls/dxgi.dll
 lib/wine/fakedlls/eject.exe
 lib/wine/fakedlls/expand.exe
 lib/wine/fakedlls/explorer.exe
+lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
 lib/wine/fakedlls/fltlib.dll
 lib/wine/fakedlls/fusion.dll
@@ -854,6 +856,7 @@ lib/wine/fakedlls/mciwave.dll
 lib/wine/fakedlls/midimap.dll
 lib/wine/fakedlls/mlang.dll
 lib/wine/fakedlls/mmdevldr.vxd
+lib/wine/fakedlls/mmsystem.dll16
 lib/wine/fakedlls/monodebg.vxd
 lib/wine/fakedlls/mountmgr.sys
 lib/wine/fakedlls/mouse.drv16
@@ -1287,7 +1290,7 @@ lib/wine/mciwave.dll.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
-lib/wine/mmsystem.dll16
+lib/wine/mmsystem.dll16.so
 lib/wine/monodebg.vxd.so
 lib/wine/mountmgr.sys.so
 lib/wine/mouse.drv16.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 25857c06ca06..e9c7b28c557e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.1.31
+DISTVERSION=	1.1.32
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index d63166362566..5abd218a15b7 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-1.1.31.tar.bz2) = 87fb94c218e52dd67c75b4ae5ef50c0e
-SHA256 (wine-1.1.31.tar.bz2) = 42c9ab673a26dba2331867427e2fdd4c977e4452c4227714b6ebfae6fc7f9e30
-SIZE (wine-1.1.31.tar.bz2) = 15797069
+MD5 (wine-1.1.32.tar.bz2) = 4a3fe87363b75cdca55ed9187fcf5f08
+SHA256 (wine-1.1.32.tar.bz2) = 05c08dbfe87a3cc4feef950cb7c7830fe467723171170726b005b3b14f6ef03b
+SIZE (wine-1.1.32.tar.bz2) = 15871530
diff --git a/emulators/wine/files/patch-tools-winebuild b/emulators/wine/files/patch-tools-winebuild
deleted file mode 100644
index 2c988a437568..000000000000
--- a/emulators/wine/files/patch-tools-winebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c
-index e0cd8bc..6008ef4 100644
---- tools/winebuild/utils.c
-+++ tools/winebuild/utils.c
-@@ -297,9 +297,23 @@ const char *get_ld_command(void)
- 
-         if (force_pointer_size)
-         {
--            const char *args = (target_platform == PLATFORM_APPLE) ?
--                ((force_pointer_size == 8) ? " -arch x86_64" : " -arch i386") :
--                ((force_pointer_size == 8) ? " -m elf_x86_64" : " -m elf_i386");
-+            const char *args;
-+
-+            switch (target_platform)
-+            {
-+                case PLATFORM_APPLE:
-+                    args = (force_pointer_size == 8) ? " -arch x86_64"
-+                                                     : " -arch i386";
-+                    break;
-+                case PLATFORM_FREEBSD:
-+                    args = (force_pointer_size == 8) ? " -m elf_x86_64"
-+                                                     : " -m elf_i386_fbsd";
-+                    break;
-+                default:
-+                    args = (force_pointer_size == 8) ? " -m elf_x86_64"
-+                                                     : " -m elf_i386";
-+            }
-+
-             ld_command = xrealloc( ld_command, strlen(ld_command) + strlen(args) + 1 );
-             strcat( ld_command, args );
-         }
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 495352f6ed59..4a9dd32a4347 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -698,6 +698,7 @@ lib/wine/dxgi.dll.so
 lib/wine/eject.exe.so
 lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
+lib/wine/extrac32.exe.so
 lib/wine/fakedlls/acledit.dll
 lib/wine/fakedlls/aclui.dll
 lib/wine/fakedlls/activeds.dll
@@ -803,6 +804,7 @@ lib/wine/fakedlls/dxgi.dll
 lib/wine/fakedlls/eject.exe
 lib/wine/fakedlls/expand.exe
 lib/wine/fakedlls/explorer.exe
+lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
 lib/wine/fakedlls/fltlib.dll
 lib/wine/fakedlls/fusion.dll
@@ -854,6 +856,7 @@ lib/wine/fakedlls/mciwave.dll
 lib/wine/fakedlls/midimap.dll
 lib/wine/fakedlls/mlang.dll
 lib/wine/fakedlls/mmdevldr.vxd
+lib/wine/fakedlls/mmsystem.dll16
 lib/wine/fakedlls/monodebg.vxd
 lib/wine/fakedlls/mountmgr.sys
 lib/wine/fakedlls/mouse.drv16
@@ -1287,7 +1290,7 @@ lib/wine/mciwave.dll.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
-lib/wine/mmsystem.dll16
+lib/wine/mmsystem.dll16.so
 lib/wine/monodebg.vxd.so
 lib/wine/mountmgr.sys.so
 lib/wine/mouse.drv16.so