Update to Wine 0.9.47. Among others, this brings the following changes:

 - New scheme for OpenGL support in child windows.
 - Lots of fixes for regression test failures.
 - Lots of bug fixes.
 - A Tahoma replacement font.

Adjust pkg-message as far as goes about FreeBSD releases.  Add a temporary
patch of mine (already accepted upstream) to build with a wider range of
versions of bison.

10 files changed, 56 insertions, 14 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 3835c9ce8b72..d7565f12f553 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.46
-PORTREVISION=	1
+PORTVERSION=	0.9.47
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index c642699b7a99..784f2baa3bf1 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.46.tar.bz2) = aa729097ddb324185a3e092b37a5f9fe
-SHA256 (wine-0.9.46.tar.bz2) = 71fce4535cdcb9caa9fe98c5db8e798942dfb91e917d8fe28d3b2e34f855ae30
-SIZE (wine-0.9.46.tar.bz2) = 12453473
+MD5 (wine-0.9.47.tar.bz2) = dfeeb7c137a1abab917f82dafbef5c8a
+SHA256 (wine-0.9.47.tar.bz2) = 1dcadb7ea25422245c4a609ac051bb4eae68ef89094c78022f5ecd7ae994095b
+SIZE (wine-0.9.47.tar.bz2) = 12587681
diff --git a/emulators/wine-devel/files/patch-tools-widl b/emulators/wine-devel/files/patch-tools-widl
new file mode 100644
index 000000000000..8113f56c5d04
--- /dev/null
+++ b/emulators/wine-devel/files/patch-tools-widl
@@ -0,0 +1,16 @@
+Index: tools/widl/parser.y
+===================================================================
+RCS file: /home/wine/wine/tools/widl/parser.y,v
+retrieving revision 1.136
+retrieving revision 1.137
+diff -u -3 -p -u -r1.136 -r1.137
+--- tools/widl/parser.y	9 Oct 2007 18:39:27 -0000	1.136
++++ tools/widl/parser.y	15 Oct 2007 16:29:13 -0000	1.137
+@@ -514,6 +514,7 @@ uuid_string:
+ 	| aSTRING				{ if (!is_valid_uuid($1))
+ 						    yyerror("invalid UUID: %s", $1);
+ 						  $$ = parse_uuid($1); }
++        ;
+ 
+ callconv:
+ 	| tSTDCALL
diff --git a/emulators/wine-devel/files/pkg-message.in b/emulators/wine-devel/files/pkg-message.in
index 5a29eb19315e..5cc88943c6a3 100644
--- a/emulators/wine-devel/files/pkg-message.in
+++ b/emulators/wine-devel/files/pkg-message.in
@@ -1,5 +1,5 @@
-Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before
-FreeBSD 5.3 will generally not work properly.
+Wine should build on FreeBSD 4.x and above, but versions before FreeBSD 6.2
+will generally not work properly.
 
 The port also installs some of Wine's doc files which describe additional
 things that are not in the manual pages, see:
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 844dc2a64085..2d6d0a1e0208 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -122,7 +122,9 @@ include/wine/windows/d3drm.h
 include/wine/windows/d3drmdef.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx8.h
 include/wine/windows/d3dx8core.h
+include/wine/windows/d3dx8math.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbinit.idl
 include/wine/windows/dbprop.idl
@@ -756,6 +758,7 @@ lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/msvcirt.dll.so
 lib/wine/msvcrt.dll.so
 lib/wine/msvcrt20.dll.so
 lib/wine/msvcrt40.dll.so
@@ -802,6 +805,7 @@ lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/pstorec.dll.so
 lib/wine/qcap.dll.so
+lib/wine/qmgr.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
@@ -960,6 +964,8 @@ lib/wine/xcopy.exe.so
 %%DATADIR%%/wine/fonts/sserifer.fon
 %%DATADIR%%/wine/fonts/sserifet.fon
 %%DATADIR%%/wine/fonts/svgasys.fon
+%%DATADIR%%/wine/fonts/tahoma.ttf
+%%DATADIR%%/wine/fonts/tahomabd.ttf
 %%DATADIR%%/wine/fonts/vgas1255.fon
 %%DATADIR%%/wine/fonts/vgas1256.fon
 %%DATADIR%%/wine/fonts/vgas1257.fon
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 3835c9ce8b72..d7565f12f553 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.46
-PORTREVISION=	1
+PORTVERSION=	0.9.47
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index c642699b7a99..784f2baa3bf1 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.46.tar.bz2) = aa729097ddb324185a3e092b37a5f9fe
-SHA256 (wine-0.9.46.tar.bz2) = 71fce4535cdcb9caa9fe98c5db8e798942dfb91e917d8fe28d3b2e34f855ae30
-SIZE (wine-0.9.46.tar.bz2) = 12453473
+MD5 (wine-0.9.47.tar.bz2) = dfeeb7c137a1abab917f82dafbef5c8a
+SHA256 (wine-0.9.47.tar.bz2) = 1dcadb7ea25422245c4a609ac051bb4eae68ef89094c78022f5ecd7ae994095b
+SIZE (wine-0.9.47.tar.bz2) = 12587681
diff --git a/emulators/wine/files/patch-tools-widl b/emulators/wine/files/patch-tools-widl
new file mode 100644
index 000000000000..8113f56c5d04
--- /dev/null
+++ b/emulators/wine/files/patch-tools-widl
@@ -0,0 +1,16 @@
+Index: tools/widl/parser.y
+===================================================================
+RCS file: /home/wine/wine/tools/widl/parser.y,v
+retrieving revision 1.136
+retrieving revision 1.137
+diff -u -3 -p -u -r1.136 -r1.137
+--- tools/widl/parser.y	9 Oct 2007 18:39:27 -0000	1.136
++++ tools/widl/parser.y	15 Oct 2007 16:29:13 -0000	1.137
+@@ -514,6 +514,7 @@ uuid_string:
+ 	| aSTRING				{ if (!is_valid_uuid($1))
+ 						    yyerror("invalid UUID: %s", $1);
+ 						  $$ = parse_uuid($1); }
++        ;
+ 
+ callconv:
+ 	| tSTDCALL
diff --git a/emulators/wine/files/pkg-message.in b/emulators/wine/files/pkg-message.in
index 5a29eb19315e..5cc88943c6a3 100644
--- a/emulators/wine/files/pkg-message.in
+++ b/emulators/wine/files/pkg-message.in
@@ -1,5 +1,5 @@
-Wine should build on FreeBSD 4.x and FreeBSD 5.x, but versions before
-FreeBSD 5.3 will generally not work properly.
+Wine should build on FreeBSD 4.x and above, but versions before FreeBSD 6.2
+will generally not work properly.
 
 The port also installs some of Wine's doc files which describe additional
 things that are not in the manual pages, see:
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 844dc2a64085..2d6d0a1e0208 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -122,7 +122,9 @@ include/wine/windows/d3drm.h
 include/wine/windows/d3drmdef.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx8.h
 include/wine/windows/d3dx8core.h
+include/wine/windows/d3dx8math.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbinit.idl
 include/wine/windows/dbprop.idl
@@ -756,6 +758,7 @@ lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/msvcirt.dll.so
 lib/wine/msvcrt.dll.so
 lib/wine/msvcrt20.dll.so
 lib/wine/msvcrt40.dll.so
@@ -802,6 +805,7 @@ lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/pstorec.dll.so
 lib/wine/qcap.dll.so
+lib/wine/qmgr.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
@@ -960,6 +964,8 @@ lib/wine/xcopy.exe.so
 %%DATADIR%%/wine/fonts/sserifer.fon
 %%DATADIR%%/wine/fonts/sserifet.fon
 %%DATADIR%%/wine/fonts/svgasys.fon
+%%DATADIR%%/wine/fonts/tahoma.ttf
+%%DATADIR%%/wine/fonts/tahomabd.ttf
 %%DATADIR%%/wine/fonts/vgas1255.fon
 %%DATADIR%%/wine/fonts/vgas1256.fon
 %%DATADIR%%/wine/fonts/vgas1257.fon