ports/158406: [patch] update wine 1.3.21 -> 1.3.23

[David Naylor]

>Number:         158406
>Category:       ports
>Synopsis:       [patch] update wine 1.3.21 -> 1.3.23
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 28 19:50:06 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     David Naylor
>Release:        FreeBSD
>Organization:
Private
>Environment:
>Description:
Update wine from 1.3.21 to 1.3.23, also add support for XInput2 (required for some games to run properly, relating to mouse warping) and properly handle the OpenAL option.  
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -u /usr/ports/emulators/wine/Makefile wine/Makefile
--- /usr/ports/emulators/wine/Makefile	2011-06-06 04:08:38.000000000 +0200
+++ wine/Makefile	2011-06-25 15:21:26.000000000 +0200
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-DISTVERSION=	1.3.21
-PORTREVISION=	1
+DISTVERSION=	1.3.23
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -23,7 +22,8 @@
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		lcms.1:${PORTSDIR}/graphics/lcms \
 		png.6:${PORTSDIR}/graphics/png \
-		xml2:${PORTSDIR}/textproc/libxml2
+		xml2:${PORTSDIR}/textproc/libxml2 \
+		libXi.6:${PORTSDIR}/x11/libXi
 
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
@@ -107,8 +107,10 @@
 .ifdef WITH_OPENAL
 CONFIGURE_ARGS+=	--with-openal
 USE_OPENAL=		yes
+PLIST_SUB=		OPENAL=""
 .else
 CONFIGURE_ARGS+=	--without-openal
+PLIST_SUB=		OPENAL="@comment "
 .endif
 
 .ifdef WITH_WINEMAKER
@@ -134,7 +136,8 @@
 	          ${MAN1PREFIX}/man/de.UTF-8/man1/wineserver.1 \
 	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wine.1 \
 	          ${MAN1PREFIX}/man/fr.UTF-8/man1/winemaker.1 \
-	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1
+	          ${MAN1PREFIX}/man/fr.UTF-8/man1/wineserver.1 \
+	          ${MAN1PREFIX}/man/pl.UTF-8/man1/wine.1
 	@-${RMDIR} -p ${MAN1PREFIX}/man/de.UTF-8/man1 \
 	              ${MAN1PREFIX}/man/fr.UTF-8/man1
 	${MV} -f ${WINELIBDIR}/libwine.so.1.0 ${WINELIBDIR}/libwine.so.1
diff -u /usr/ports/emulators/wine/distinfo wine/distinfo
--- /usr/ports/emulators/wine/distinfo	2011-05-30 04:31:19.000000000 +0200
+++ wine/distinfo	2011-06-25 13:47:17.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (wine-1.3.21.tar.bz2) = 6c089df0d164c442a5620f7b5eee48ab21fd746a75793731cc3a028b20df57a0
-SIZE (wine-1.3.21.tar.bz2) = 19371426
+SHA256 (wine-1.3.23.tar.bz2) = 386c8939c5881b4625b045356a18ed7c7b20eab693f643e17185c96bac084792
+SIZE (wine-1.3.23.tar.bz2) = 19474860
Common subdirectories: /usr/ports/emulators/wine/files and wine/files
diff -u /usr/ports/emulators/wine/pkg-plist wine/pkg-plist
--- /usr/ports/emulators/wine/pkg-plist	2011-05-30 04:31:19.000000000 +0200
+++ wine/pkg-plist	2011-06-25 15:27:49.000000000 +0200
@@ -255,8 +255,8 @@
 include/wine/windows/dxfile.h
 include/wine/windows/dxgi.h
 include/wine/windows/dxgi.idl
+include/wine/windows/dxgiformat.h
 include/wine/windows/dxgitype.h
-include/wine/windows/dxgitype.idl
 include/wine/windows/dyngraph.idl
 include/wine/windows/endpointvolume.h
 include/wine/windows/endpointvolume.idl
@@ -271,6 +271,7 @@
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/fltdefs.h
 include/wine/windows/fusion.h
 include/wine/windows/fusion.idl
 include/wine/windows/gameux.h
@@ -303,6 +304,8 @@
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
+include/wine/windows/iextag.h
+include/wine/windows/iextag.idl
 include/wine/windows/ifdef.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
@@ -1104,6 +1107,7 @@
 lib/wine/fakedlls/olesvr32.dll
 lib/wine/fakedlls/olethk32.dll
 lib/wine/fakedlls/oleview.exe
+%%OPENAL%%lib/wine/fakedlls/openal32.dll
 lib/wine/fakedlls/opengl32.dll
 lib/wine/fakedlls/pdh.dll
 lib/wine/fakedlls/pidgen.dll
@@ -1202,6 +1206,7 @@
 lib/wine/fakedlls/userenv.dll
 lib/wine/fakedlls/usp10.dll
 lib/wine/fakedlls/uxtheme.dll
+lib/wine/fakedlls/vbscript.dll
 lib/wine/fakedlls/vcomp.dll
 lib/wine/fakedlls/vdhcp.vxd
 lib/wine/fakedlls/vdmdbg.dll
@@ -1595,6 +1600,7 @@
 lib/wine/olesvr32.dll.so
 lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
+%%OPENAL%%lib/wine/openal32.dll.so
 lib/wine/opengl32.dll.so
 lib/wine/pdh.dll.so
 lib/wine/pidgen.dll.so
@@ -1693,6 +1699,7 @@
 lib/wine/userenv.dll.so
 lib/wine/usp10.dll.so
 lib/wine/uxtheme.dll.so
+lib/wine/vbscript.dll.so
 lib/wine/vcomp.dll.so
 lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so


>Release-Note:
>Audit-Trail:
>Unformatted: