From 0cf03e530140d70a094256093baf14de572657bc Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sun, 5 Apr 2015 20:21:38 +0000
Subject: Update to Wine 1.7.40.  This includes the following changes:  -
 Support for kernel job objects.  - Various fixes to the ListView control.  -
 Better support for OOB data in Windows Sockets.  - Support for DIB images in
 the OLE data cache.  - Improved support for MSI patches.  - Some fixes for
 ACL file permissions.  - Various bug fixes.

files/patch-configure has been accepted upstrea; remove it.

Fix whitespace in one case.
---
 emulators/wine-devel/Makefile              |  4 +-
 emulators/wine-devel/distinfo              |  8 ++--
 emulators/wine-devel/files/patch-configure | 70 ------------------------------
 emulators/wine-devel/pkg-plist             |  2 +
 4 files changed, 8 insertions(+), 76 deletions(-)
 delete mode 100644 emulators/wine-devel/files/patch-configure

(limited to 'emulators/wine-devel')

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index ef5b733c016a..40b6dc58c008 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.7.39
+DISTVERSION=	1.7.40
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -131,7 +131,7 @@ CPPFLAGS+=		-D__builtin_ms_va_list=__builtin_va_list \
 post-patch:
 	${REINPLACE_CMD} 's|/wine|/wine64|g' ${WRKSRC}/tools/wineapploader.in
 
-.else 
+.else
 PLIST_SUB+=		WINE32="" WINE64="@comment "
 .endif
 
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 3d6cb0c8e3e1..592a9eab75f6 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,4 +1,4 @@
-SHA256 (wine-1.7.39.tar.bz2) = 6affb007fe772eb5588c584e3bdb62db96d8291c7fc8e75a5fd0bb098391335c
-SIZE (wine-1.7.39.tar.bz2) = 22122289
-SHA256 (v1.7.39.tar.gz) = b7b3ba39e2a8829a6fd6aef4b3701dd0009eebc85539ac946e31de6d7fe36649
-SIZE (v1.7.39.tar.gz) = 9096658
+SHA256 (wine-1.7.40.tar.bz2) = 0d82e639a553765437f9a3f864f383e8e4e1eb0f1dd815263f9fda1c78d5cab6
+SIZE (wine-1.7.40.tar.bz2) = 22183479
+SHA256 (v1.7.40.tar.gz) = d2cafa5e847e1aecb82bb1dd42ea7729f749176c3ddc549c6b422c8ba74b89d5
+SIZE (v1.7.40.tar.gz) = 9129843
diff --git a/emulators/wine-devel/files/patch-configure b/emulators/wine-devel/files/patch-configure
deleted file mode 100644
index d77d1b1f88f8..000000000000
--- a/emulators/wine-devel/files/patch-configure
+++ /dev/null
@@ -1,70 +0,0 @@
-commit 1625bb8e07d1dee8f0b6c98466e0185c7c7431be
-Author: David Naylor <naylor.b.david@gmail.com>
-Date:   Tue Jan 20 21:55:03 2015 +0200
-
-    configure: explicitly set host_cpu for 'amd64'.
-    
-    In the case of host starting with 'amd64', the host_cpu variable will not be
-    set to the correct CPU value of 'x86_64'.  Set it explicitly to the correct
-    value.
-
-diff --git a/configure b/configure
-index bc2f434..62b2ca3 100755
---- configure
-+++ configure
-@@ -4912,6 +4912,7 @@ $as_echo "no" >&6; }
- fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       fi
-+      host_cpu="x86_64"
-       TARGETFLAGS="-m64"
- 
-     fi
-diff --git a/configure.ac b/configure.ac
-index db26333..9579245 100644
---- configure.ac
-+++ configure.ac
-@@ -165,6 +165,7 @@ case $host in
-                           [AC_MSG_RESULT([no])
-                            AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])])
-       fi
-+      host_cpu="x86_64"
-       AC_SUBST(TARGETFLAGS,"-m64")
-     fi
-     ;;
-
-commit 0d268d62ad93ca1d1cf1c2fead43e2143b5529b3
-Author: David Naylor <naylor.b.david@gmail.com>
-Date:   Tue Jan 20 17:54:38 2015 +0200
-
-    configure: recognise host starting in 'amd64'.
-    
-    FreeBSD uses amd64 to identify a CPU architecture based on AMD's 64-bit
-    instruction set.
-
-diff --git a/configure b/configure
-index 0431209..bc2f434 100755
---- configure
-+++ configure
-@@ -4852,7 +4852,7 @@ case $host in
-     fi
-     with_fontconfig=${with_fontconfig:-no}
-     ;;
--  x86_64*)
-+  x86_64*|amd64*)
-     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
-     then
-       CC="$CC -m32"
-diff --git a/configure.ac b/configure.ac
-index a931730..db26333 100644
---- configure.ac
-+++ configure.ac
-@@ -143,7 +143,7 @@ case $host in
-     fi
-     with_fontconfig=${with_fontconfig:-no}
-     ;;
--  x86_64*)
-+  x86_64*|amd64*)
-     if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes"
-     then
-       CC="$CC -m32"
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index fdbbb81574d6..97bf9036a487 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -420,6 +420,7 @@ include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
 include/wine/windows/metahost.h
 include/wine/windows/metahost.idl
+include/wine/windows/mfapi.h
 include/wine/windows/mferror.h
 include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
@@ -1815,6 +1816,7 @@ lib/wine/libmsdmo.def
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
+lib/wine/libmspatcha.def
 lib/wine/libmsvcr100.def
 lib/wine/libmsvcr110.def
 lib/wine/libmsvcr120.def
-- 
cgit v1.2.3