Update to Wine 1.7.41. This includes the following changes:

 - More Known Folders supported in the shell.
 - Some more support for kernel job objects.
 - More MSI patches improvements.
 - Some theming fixes.
 - Various bug fixes.

files/patch-scheduler in emulators/wine-compholio has been obsoleted
by an upstream fix.  Remove it.

Rename the COMPHOLIO option to STAGING in emulators/wine-devel,
emulators/i386-wine-compholio and emulators-compholio (including many
adjustments to pkg-plist).

6 files changed, 38 insertions, 51 deletions

diff --git a/emulators/i386-wine-compholio/Makefile b/emulators/i386-wine-compholio/Makefile
index 5caabadea5ac..5fb3544de0e1 100644
--- a/emulators/i386-wine-compholio/Makefile
+++ b/emulators/i386-wine-compholio/Makefile
@@ -7,7 +7,7 @@ SLAVE_PORT=	i386-wine-devel
 
 CONFLICTS_INSTALL=	i386-wine-[0-9]* wine-[0-9]* wine-compholio-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]*
 
-OPTIONS_SET=	COMPHOLIO LIBXSLT GNUTLS HAL X11
+OPTIONS_SET=	LIBXSLT GNUTLS HAL STAGING X11
 
 SLAVEDIR=	${.CURDIR}/../i386-wine-devel
 PLIST=		${MASTERDIR}/pkg-plist
diff --git a/emulators/wine-compholio/Makefile b/emulators/wine-compholio/Makefile
index 9cc67c15597f..8b3ad3f7e2fa 100644
--- a/emulators/wine-compholio/Makefile
+++ b/emulators/wine-compholio/Makefile
@@ -8,12 +8,11 @@ SLAVE_PORT=	wine-devel
 CONFLICTS_INSTALL=	wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \
 			i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]*
 
-OPTIONS_SET=	COMPHOLIO LIBXSLT MPG123 GNUTLS HAL V4L X11
+OPTIONS_SET=	LIBXSLT MPG123 GNUTLS HAL STAGING V4L X11
 
 MASTERDIR=	${.CURDIR}/../wine-devel
 PLIST=		${MASTERDIR}/pkg-plist
 USE_AUTOTOOLS=	autoconf:env
-EXTRA_PATCHES=	${.CURDIR}/files/patch-scheduler
 
 .include "${MASTERDIR}/Makefile"
 
diff --git a/emulators/wine-compholio/files/patch-scheduler b/emulators/wine-compholio/files/patch-scheduler
deleted file mode 100644
index 0a36c7c79eac..000000000000
--- a/emulators/wine-compholio/files/patch-scheduler
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/scheduler.c.orig	2015-04-07 15:41:01.192653000 +0000
-+++ server/scheduler.c	2015-04-10 08:46:02.407706000 +0000
-@@ -159,4 +159,8 @@
- {
- }
- 
-+void set_scheduler_priority( struct thread *thread )
-+{
-+}
-+
- #endif
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index a6f844cecfb9..8746b45e2f11 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.7.40
-PORTREVISION=	1
+DISTVERSION=	1.7.41
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -53,11 +52,11 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PORTDATA=	l_intl.nls wine.inf
 
-OPTIONS_DEFINE=	COMPHOLIO CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL V4L WINEMAKER X11 GECKO MONO
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
 OPTIONS_DEFAULT=X11
 OPTIONS_SUB=	yes
 
-COMPHOLIO_DESC=	Include the Compholio patchset, needed for Pipelight support
+STAGING_DESC=	Include the Wine Staging patchset
 DOSBOX_DESC=	Use DOSBox to run MS-DOS programs
 LIBXSLT_DESC=	Use libxslt (only used by msxml3.dll)
 WINEMAKER_DESC=	Fully support winemaker (requires Perl)
@@ -136,7 +135,7 @@ post-patch:
 PLIST_SUB+=		WINE32="" WINE64="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MCOMPHOLIO}
+.if ${PORT_OPTIONS:MSTAGING}
 MASTER_SITES+=	https://github.com/compholio/wine-compholio-daily/archive/:cho
 COMP_DIST=	v${DISTVERSION}.tar.gz
 DISTFILES+=	${COMP_DIST}:cho
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 592a9eab75f6..6cd55066ebe5 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,4 +1,4 @@
-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
+SHA256 (wine-1.7.41.tar.bz2) = 6fa622b1dacb257fab671ddd689439daf6bb1cfb9e632c324db16a5db6372f97
+SIZE (wine-1.7.41.tar.bz2) = 22237972
+SHA256 (v1.7.41.tar.gz) = c34f773003e25195fd761bbaff517f31deaebb8d46fc94de14b9581728138174
+SIZE (v1.7.41.tar.gz) = 9136024
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index b656a195ffa7..4791462e5088 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -157,9 +157,9 @@ include/wine/windows/ctfutb.h
 include/wine/windows/ctfutb.idl
 include/wine/windows/ctxtcall.h
 include/wine/windows/ctxtcall.idl
-%%COMPHOLIO%%include/wine/windows/cuda.h
+%%STAGING%%include/wine/windows/cuda.h
 include/wine/windows/custcntl.h
-%%COMPHOLIO%%include/wine/windows/cuviddec.h
+%%STAGING%%include/wine/windows/cuviddec.h
 include/wine/windows/cvconst.h
 include/wine/windows/d2d1.h
 include/wine/windows/d2d1.idl
@@ -295,7 +295,7 @@ include/wine/windows/dxgi1_2.h
 include/wine/windows/dxgi1_2.idl
 include/wine/windows/dxgiformat.h
 include/wine/windows/dxgitype.h
-%%COMPHOLIO%%include/wine/windows/dxva.h
+%%STAGING%%include/wine/windows/dxva.h
 include/wine/windows/dxva2api.h
 include/wine/windows/dxva2api.idl
 include/wine/windows/dyngraph.idl
@@ -501,14 +501,14 @@ include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
-%%COMPHOLIO%%include/wine/windows/ntifs.h
+%%STAGING%%include/wine/windows/ntifs.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntsecpkg.h
 include/wine/windows/ntstatus.h
-%%COMPHOLIO%%include/wine/windows/nvapi.h
-%%COMPHOLIO%%include/wine/windows/nvcuvid.h
-%%COMPHOLIO%%include/wine/windows/nvencodeapi.h
+%%STAGING%%include/wine/windows/nvapi.h
+%%STAGING%%include/wine/windows/nvcuvid.h
+%%STAGING%%include/wine/windows/nvencodeapi.h
 include/wine/windows/oaidl.h
 include/wine/windows/oaidl.idl
 include/wine/windows/objbase.h
@@ -1269,7 +1269,7 @@ lib/wine/fakedlls/extrac32.exe
 lib/wine/fakedlls/faultrep.dll
 lib/wine/fakedlls/findstr.exe
 lib/wine/fakedlls/fltlib.dll
-%%COMPHOLIO%%lib/wine/fakedlls/fltmgr.sys
+%%STAGING%%lib/wine/fakedlls/fltmgr.sys
 lib/wine/fakedlls/fntcache.dll
 lib/wine/fakedlls/fontsub.dll
 lib/wine/fakedlls/fusion.dll
@@ -1430,12 +1430,12 @@ lib/wine/fakedlls/ntdll.dll
 lib/wine/fakedlls/ntdsapi.dll
 lib/wine/fakedlls/ntoskrnl.exe
 lib/wine/fakedlls/ntprint.dll
-%%WINE32%%%%COMPHOLIO%%lib/wine/fakedlls/nvapi.dll
-%%WINE64%%%%COMPHOLIO%%lib/wine/fakedlls/nvapi64.dll
-%%COMPHOLIO%%lib/wine/fakedlls/nvcuda.dll
-%%COMPHOLIO%%lib/wine/fakedlls/nvcuvid.dll
-%%WINE32%%%%COMPHOLIO%%lib/wine/fakedlls/nvencodeapi.dll
-%%WINE64%%%%COMPHOLIO%%lib/wine/fakedlls/nvencodeapi64.dll
+%%WINE32%%%%STAGING%%lib/wine/fakedlls/nvapi.dll
+%%WINE64%%%%STAGING%%lib/wine/fakedlls/nvapi64.dll
+%%STAGING%%lib/wine/fakedlls/nvcuda.dll
+%%STAGING%%lib/wine/fakedlls/nvcuvid.dll
+%%WINE32%%%%STAGING%%lib/wine/fakedlls/nvencodeapi.dll
+%%WINE64%%%%STAGING%%lib/wine/fakedlls/nvencodeapi64.dll
 lib/wine/fakedlls/objsel.dll
 lib/wine/fakedlls/odbc32.dll
 lib/wine/fakedlls/odbccp32.dll
@@ -1605,7 +1605,7 @@ lib/wine/fakedlls/winebrowser.exe
 lib/wine/fakedlls/winecfg.exe
 lib/wine/fakedlls/wineconsole.exe
 lib/wine/fakedlls/wined3d.dll
-%%COMPHOLIO%%lib/wine/fakedlls/wined3d-csmt.dll
+%%STAGING%%lib/wine/fakedlls/wined3d-csmt.dll
 lib/wine/fakedlls/winedbg.exe
 lib/wine/fakedlls/winedevice.exe
 lib/wine/fakedlls/winefile.exe
@@ -1684,7 +1684,7 @@ lib/wine/fakedlls/xpssvcs.dll
 lib/wine/faultrep.dll.so
 lib/wine/findstr.exe.so
 lib/wine/fltlib.dll.so
-%%COMPHOLIO%%lib/wine/fltmgr.sys.so
+%%STAGING%%lib/wine/fltmgr.sys.so
 lib/wine/fntcache.dll.so
 lib/wine/fontsub.dll.so
 lib/wine/fusion.dll.so
@@ -1888,12 +1888,12 @@ lib/wine/libuserenv.def
 lib/wine/libusp10.def
 lib/wine/libuuid.a
 lib/wine/libuxtheme.def
-%%COMPHOLIO%%lib/wine/libvcomp.def
+%%STAGING%%lib/wine/libvcomp.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libwebservices.def
 lib/wine/libwer.def
-%%COMPHOLIO%%lib/wine/libwinealsa.drv.def
+%%STAGING%%lib/wine/libwinealsa.drv.def
 lib/wine/libwindowscodecs.def
 lib/wine/libwindowscodecsext.def
 lib/wine/libwinecrt0.a
@@ -2027,12 +2027,12 @@ lib/wine/ntdll.dll.so
 lib/wine/ntdsapi.dll.so
 lib/wine/ntoskrnl.exe.so
 lib/wine/ntprint.dll.so
-%%WINE32%%%%COMPHOLIO%%lib/wine/nvapi.dll.so
-%%WINE64%%%%COMPHOLIO%%lib/wine/nvapi64.dll.so
-%%COMPHOLIO%%lib/wine/nvcuda.dll.so
-%%COMPHOLIO%%lib/wine/nvcuvid.dll.so
-%%WINE32%%%%COMPHOLIO%%lib/wine/nvencodeapi.dll.so
-%%WINE64%%%%COMPHOLIO%%lib/wine/nvencodeapi64.dll.so
+%%WINE32%%%%STAGING%%lib/wine/nvapi.dll.so
+%%WINE64%%%%STAGING%%lib/wine/nvapi64.dll.so
+%%STAGING%%lib/wine/nvcuda.dll.so
+%%STAGING%%lib/wine/nvcuvid.dll.so
+%%WINE32%%%%STAGING%%lib/wine/nvencodeapi.dll.so
+%%WINE64%%%%STAGING%%lib/wine/nvencodeapi64.dll.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
@@ -2202,7 +2202,7 @@ lib/wine/winebrowser.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/wined3d.dll.so
-%%COMPHOLIO%%lib/wine/wined3d-csmt.dll.so
+%%STAGING%%lib/wine/wined3d-csmt.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winefile.exe.so
@@ -2313,9 +2313,9 @@ share/applications/wine.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
-%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/arial.ttf
-%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/cour.ttf
-%%COMPHOLIO%%%%X11%%%%DATADIR%%/fonts/msyh.ttf
+%%STAGING%%%%X11%%%%DATADIR%%/fonts/arial.ttf
+%%STAGING%%%%X11%%%%DATADIR%%/fonts/cour.ttf
+%%STAGING%%%%X11%%%%DATADIR%%/fonts/msyh.ttf
 %%X11%%%%DATADIR%%/fonts/coue1255.fon
 %%X11%%%%DATADIR%%/fonts/coue1256.fon
 %%X11%%%%DATADIR%%/fonts/coue1257.fon