WHAT'S NEW with Wine-20031212: (see ChangeLog for details)

        - Initial implementation of XDND drag&drop support.
        - Improved startup performance on remote displays.
        - Major improvements in the oleaut32 dll.
        - Some support for Netbios functions.
        - Work around for Exec Shield and prelinking troubles.
        - Many code cleanups.
        - Lots of bug fixes.

6 files changed, 55 insertions, 27 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index c7c3cb8816e..9df3fa41d0e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,27 +1,32 @@
-# $NetBSD: Makefile,v 1.55 2003/12/01 15:59:50 adam Exp $
+# $NetBSD: Makefile,v 1.56 2003/12/16 11:10:47 adam Exp $
+#
+
+DISTNAME=	Wine-20031212
+PKGNAME=	${DISTNAME:S/W/w/}
+WRKSRC= 	${WRKDIR}/${DISTNAME:S/W/w/}
+CATEGORIES=	emulators
+MASTER_SITES=	http://www.ibiblio.org/Linux/ALPHA/wine/development/ \
+		${MASTER_SITE_SOURCEFORGE:=wine/} \
+		${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
+
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://www.winehq.com/
+COMMENT=	Free implementation of Windows on Unix (still alpha)
 
-DISTNAME=		Wine-20031118
-PKGNAME=		${DISTNAME:S/W/w/}
-WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
-CATEGORIES=		emulators
-MASTER_SITES=		http://www.ibiblio.org/Linux/ALPHA/wine/development/ \
-			${MASTER_SITE_SOURCEFORGE:=wine/} \
-			${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
+BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
-MAINTAINER=		adam@NetBSD.org
-HOMEPAGE=		http://www.winehq.com/
-COMMENT=		Free implementation of Windows on Unix (still alpha)
+YACC=		${PREFIX}/bin/bison -y
 
-CONFLICTS=		rewind-[0-9]*
+CONFLICTS=	rewind-[0-9]*
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 
+BUILDLINK_DEPENDS.freetype2=	freetype>=2.1.4
+
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
-BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
-YACC=			${PREFIX}/bin/bison -y
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-curses #--disable-debug --disable-trace
@@ -58,7 +63,10 @@ post-install:
 .include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/glu/buildlink2.mk"
+.include "../../graphics/glut/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/libungif/buildlink2.mk"
+.include "../../textproc/icu/buildlink2.mk"
+
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 28b7b0bb171..3663b791fa1 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2003/12/01 15:59:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.19 2003/12/16 11:10:47 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -333,6 +333,7 @@ lib/wine/expand.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
+lib/wine/glut32.dll.so
 lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
 lib/wine/imaadp32.acm.so
@@ -380,6 +381,7 @@ lib/wine/libdpnhpast.def
 lib/wine/libdsound.def
 lib/wine/libgdi32.def
 lib/wine/libglu32.def
+lib/wine/libglut32.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
@@ -428,6 +430,7 @@ lib/wine/libsti.def
 lib/wine/libtapi32.def
 lib/wine/libttydrv.def
 lib/wine/libtwain_32.def
+lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
@@ -530,6 +533,7 @@ lib/wine/toolhelp.dll.so
 lib/wine/ttydrv.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
+lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
@@ -564,6 +568,7 @@ lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
 lib/wine/wineps16.drv.so
+lib/wine/winetest.exe.so
 lib/wine/winevdm.exe.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 56e9b6f3947..6cd79f3b6b9 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.19 2003/12/01 15:59:50 adam Exp $
+$NetBSD: distinfo,v 1.20 2003/12/16 11:10:47 adam Exp $
 
-SHA1 (Wine-20031118.tar.gz) = b9463f02a45c547300b51bba5de05b9d8f3d94c7
-Size (Wine-20031118.tar.gz) = 9539006 bytes
+SHA1 (Wine-20031212.tar.gz) = a385d3571e6da54435842c335eef8a7a90f4e5ed
+Size (Wine-20031212.tar.gz) = 9691334 bytes
 SHA1 (patch-aa) = 27f2fa6bf9825ce17fb8723c7cf3fbc0dd0ac7b3
 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
-SHA1 (patch-ac) = 673842c2f071be15916a8aebf2c449ce4216d8ea
-SHA1 (patch-ad) = 437b44a5682a24b8b9bcdcffedaa8266e79ee2b7
+SHA1 (patch-ac) = 94d9f08fe255a67c1a6ed67819b1ce5cbf178f7c
+SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6
+SHA1 (patch-ae) = 770a4267a3593d28444ab48b0a285defa3dfeecb
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index a9c6af465cf..7bc9e6af198 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.9 2003/12/01 15:59:50 adam Exp $
+$NetBSD: patch-ac,v 1.10 2003/12/16 11:10:47 adam Exp $
 
---- configure.orig	2003-11-19 05:00:07.000000000 +0100
+--- configure.orig	2003-12-13 03:51:20.000000000 +0000
 +++ configure
-@@ -15801,7 +15801,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -15905,7 +15905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.9 2003/12/01 15:59:50 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16687,7 +16687,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -16791,7 +16791,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad
index 846364efd3b..37175db5dd6 100644
--- a/emulators/wine/patches/patch-ad
+++ b/emulators/wine/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2003/09/15 10:51:39 adam Exp $
+$NetBSD: patch-ad,v 1.6 2003/12/16 11:10:47 adam Exp $
 
---- dlls/iphlpapi/ifenum.c.orig	2003-09-06 01:08:37.000000000 +0200
+--- dlls/iphlpapi/ifenum.c.orig	2003-11-30 06:03:21.000000000 +0000
 +++ dlls/iphlpapi/ifenum.c
-@@ -70,6 +70,7 @@
+@@ -56,6 +56,7 @@
  #endif
  
  #include <sys/types.h>
diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae
new file mode 100644
index 00000000000..4706cc4cc11
--- /dev/null
+++ b/emulators/wine/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.7 2003/12/16 11:10:47 adam Exp $
+
+--- dlls/netapi32/nbt.c.orig	2003-12-15 16:32:57.000000000 +0000
++++ dlls/netapi32/nbt.c
+@@ -72,8 +72,8 @@
+ #include "winbase.h"
+ #include "wine/debug.h"
+ #include "winreg.h"
+-#include "iphlpapi.h"
+ #include "winsock2.h"
++#include "iphlpapi.h"
+ #include "netbios.h"
+ #include "nbnamecache.h"
+