Update to Wine 1.3.21. This includes the following changes:

 - Support for installation rollbacks in MSI.
 - 8- and 16-bit bitmap formats in the DIB engine.
 - Fixes in the XInput2 mouse support.
 - Better support for text shaping in Uniscribe.
 - Improvements to the Item common dialog.
 - More MSVC runtime functions.
 - Various bug fixes.

Also force building with OSS support and, look Ma!, no more extra
patches for that.

8 files changed, 22 insertions, 44 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index a77c97cef603..5dfe298642f5 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.3.20
+DISTVERSION=	1.3.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -33,7 +33,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--datadir=${DATADIR} --verbose --disable-tests \
 		--with-glu --with-opengl --with-xrandr \
 		--without-capi --without-gphoto --without-gsm \
-		--without-mpg123 --without-sane \
+		--without-mpg123 --with-oss --without-sane \
 		--without-v4l --without-xcomposite --without-xinerama
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		FLEX="${LOCALBASE}/bin/flex"
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index d1bd70a35e8d..c76068125406 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.20.tar.bz2) = 39f55232973536158d4545c7f389648d64d34bc4be2b640086fdf3e6507db71e
-SIZE (wine-1.3.20.tar.bz2) = 19251527
+SHA256 (wine-1.3.21.tar.bz2) = 6c089df0d164c442a5620f7b5eee48ab21fd746a75793731cc3a028b20df57a0
+SIZE (wine-1.3.21.tar.bz2) = 19371426
diff --git a/emulators/wine-devel/files/patch-dlls-wineoss.drv b/emulators/wine-devel/files/patch-dlls-wineoss.drv
deleted file mode 100644
index 5f7f9d142837..000000000000
--- a/emulators/wine-devel/files/patch-dlls-wineoss.drv
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
-index 7dec1e0..0edcb25 100644
---- dlls/wineoss.drv/mmdevdrv.c
-+++ dlls/wineoss.drv/mmdevdrv.c
-@@ -53,6 +53,13 @@
- #include "audiopolicy.h"
- #include "audioclient.h"
- 
-+
-+/* Some implementations of OSS, such as FreeBSD older than 9.0, lack
-+   SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */
-+#ifndef SNDCTL_DSP_HALT
-+#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET
-+#endif
-+
- WINE_DEFAULT_DEBUG_CHANNEL(oss);
- 
- #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 7856a12ce545..0d2fc8251701 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -502,6 +502,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/rpcsal.h
 include/wine/windows/rstbas.idl
 include/wine/windows/rstinf.idl
 include/wine/windows/rstloc.idl
@@ -964,6 +965,7 @@ lib/wine/fakedlls/hhctrl.ocx
 lib/wine/fakedlls/hid.dll
 lib/wine/fakedlls/hlink.dll
 lib/wine/fakedlls/hnetcfg.dll
+lib/wine/fakedlls/hostname.exe
 lib/wine/fakedlls/httpapi.dll
 lib/wine/fakedlls/iccvid.dll
 lib/wine/fakedlls/icinfo.exe
@@ -1123,6 +1125,7 @@ lib/wine/fakedlls/rasapi16.dll16
 lib/wine/fakedlls/rasapi32.dll
 lib/wine/fakedlls/rasdlg.dll
 lib/wine/fakedlls/reg.exe
+lib/wine/fakedlls/regapi.dll
 lib/wine/fakedlls/regedit.exe
 lib/wine/fakedlls/regsvcs.exe
 lib/wine/fakedlls/regsvr32.exe
@@ -1250,6 +1253,7 @@ lib/wine/fakedlls/winoldap.mod16
 lib/wine/fakedlls/winscard.dll
 lib/wine/fakedlls/winsock.dll16
 lib/wine/fakedlls/winspool.drv
+lib/wine/fakedlls/winsta.dll
 lib/wine/fakedlls/wintab.dll16
 lib/wine/fakedlls/wintab32.dll
 lib/wine/fakedlls/wintrust.dll
@@ -1293,6 +1297,7 @@ lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
 lib/wine/hlink.dll.so
 lib/wine/hnetcfg.dll.so
+lib/wine/hostname.exe.so
 lib/wine/httpapi.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
@@ -1611,6 +1616,7 @@ lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
+lib/wine/regapi.dll.so
 lib/wine/regedit.exe.so
 lib/wine/regsvcs.exe.so
 lib/wine/regsvr32.exe.so
@@ -1738,6 +1744,7 @@ lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16.so
 lib/wine/winspool.drv.so
+lib/wine/winsta.dll.so
 lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index a77c97cef603..5dfe298642f5 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.3.20
+DISTVERSION=	1.3.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -33,7 +33,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--datadir=${DATADIR} --verbose --disable-tests \
 		--with-glu --with-opengl --with-xrandr \
 		--without-capi --without-gphoto --without-gsm \
-		--without-mpg123 --without-sane \
+		--without-mpg123 --with-oss --without-sane \
 		--without-v4l --without-xcomposite --without-xinerama
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		FLEX="${LOCALBASE}/bin/flex"
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index d1bd70a35e8d..c76068125406 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.20.tar.bz2) = 39f55232973536158d4545c7f389648d64d34bc4be2b640086fdf3e6507db71e
-SIZE (wine-1.3.20.tar.bz2) = 19251527
+SHA256 (wine-1.3.21.tar.bz2) = 6c089df0d164c442a5620f7b5eee48ab21fd746a75793731cc3a028b20df57a0
+SIZE (wine-1.3.21.tar.bz2) = 19371426
diff --git a/emulators/wine/files/patch-dlls-wineoss.drv b/emulators/wine/files/patch-dlls-wineoss.drv
deleted file mode 100644
index 5f7f9d142837..000000000000
--- a/emulators/wine/files/patch-dlls-wineoss.drv
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c
-index 7dec1e0..0edcb25 100644
---- dlls/wineoss.drv/mmdevdrv.c
-+++ dlls/wineoss.drv/mmdevdrv.c
-@@ -53,6 +53,13 @@
- #include "audiopolicy.h"
- #include "audioclient.h"
- 
-+
-+/* Some implementations of OSS, such as FreeBSD older than 9.0, lack
-+   SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */
-+#ifndef SNDCTL_DSP_HALT
-+#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET
-+#endif
-+
- WINE_DEFAULT_DEBUG_CHANNEL(oss);
- 
- #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 7856a12ce545..0d2fc8251701 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -502,6 +502,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/rpcsal.h
 include/wine/windows/rstbas.idl
 include/wine/windows/rstinf.idl
 include/wine/windows/rstloc.idl
@@ -964,6 +965,7 @@ lib/wine/fakedlls/hhctrl.ocx
 lib/wine/fakedlls/hid.dll
 lib/wine/fakedlls/hlink.dll
 lib/wine/fakedlls/hnetcfg.dll
+lib/wine/fakedlls/hostname.exe
 lib/wine/fakedlls/httpapi.dll
 lib/wine/fakedlls/iccvid.dll
 lib/wine/fakedlls/icinfo.exe
@@ -1123,6 +1125,7 @@ lib/wine/fakedlls/rasapi16.dll16
 lib/wine/fakedlls/rasapi32.dll
 lib/wine/fakedlls/rasdlg.dll
 lib/wine/fakedlls/reg.exe
+lib/wine/fakedlls/regapi.dll
 lib/wine/fakedlls/regedit.exe
 lib/wine/fakedlls/regsvcs.exe
 lib/wine/fakedlls/regsvr32.exe
@@ -1250,6 +1253,7 @@ lib/wine/fakedlls/winoldap.mod16
 lib/wine/fakedlls/winscard.dll
 lib/wine/fakedlls/winsock.dll16
 lib/wine/fakedlls/winspool.drv
+lib/wine/fakedlls/winsta.dll
 lib/wine/fakedlls/wintab.dll16
 lib/wine/fakedlls/wintab32.dll
 lib/wine/fakedlls/wintrust.dll
@@ -1293,6 +1297,7 @@ lib/wine/hhctrl.ocx.so
 lib/wine/hid.dll.so
 lib/wine/hlink.dll.so
 lib/wine/hnetcfg.dll.so
+lib/wine/hostname.exe.so
 lib/wine/httpapi.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
@@ -1611,6 +1616,7 @@ lib/wine/rasapi16.dll16.so
 lib/wine/rasapi32.dll.so
 lib/wine/rasdlg.dll.so
 lib/wine/reg.exe.so
+lib/wine/regapi.dll.so
 lib/wine/regedit.exe.so
 lib/wine/regsvcs.exe.so
 lib/wine/regsvr32.exe.so
@@ -1738,6 +1744,7 @@ lib/wine/winoldap.mod16.so
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16.so
 lib/wine/winspool.drv.so
+lib/wine/winsta.dll.so
 lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so