Changes 0.9.29:

- More work on the new Direct3D state management.
- Debugger support for Mac OS.
- Many OLE fixes and improvements.
- Audio input support on Mac OS.
- Lots of bug fixes.

5 files changed, 20 insertions, 19 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f088685f0d9..562af17708a 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.121 2007/01/02 15:33:33 adam Exp $
+# $NetBSD: Makefile,v 1.122 2007/01/10 09:09:49 adam Exp $
 
-DISTNAME=	wine-0.9.28
+DISTNAME=	wine-0.9.29
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 195228cfd5b..61bacf062d2 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2007/01/02 15:33:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.54 2007/01/10 09:09:49 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -328,6 +328,7 @@ include/wine/windows/regstr.h
 include/wine/windows/richedit.h
 include/wine/windows/richole.h
 include/wine/windows/richole.idl
+include/wine/windows/rmxfguid.h
 include/wine/windows/rpc.h
 include/wine/windows/rpcdce.h
 include/wine/windows/rpcdcep.h
@@ -529,7 +530,6 @@ lib/wine/infosoft.dll.so
 lib/wine/inseng.dll.so
 lib/wine/iphlpapi.dll.so
 lib/wine/itss.dll.so
-lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv16
 lib/wine/krnl386.exe16
@@ -813,6 +813,7 @@ lib/wine/winedos.dll.so
 lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
 lib/wine/winejack.drv.so
+lib/wine/winejoystick.drv.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 327a5b0162c..5f892834afe 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,26 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/10 21:12:03 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2007/01/10 09:09:49 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
 
-.if !empty(BUILDLINK_DEPTH:M+)
+.if ${BUILDLINK_DEPTH} == "+"
 BUILDLINK_DEPENDS+=	wine
 .endif
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
 BUILDLINK_PACKAGES+=	wine
-
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine
 
-.if !empty(WINE_BUILDLINK3_MK:M+)
+.if ${WINE_BUILDLINK3_MK} == "+"
 BUILDLINK_API_DEPENDS.wine+=	wine>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .endif	# WINE_BUILDLINK3_MK
 
-.include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
+.if !empty(PKG_BUILD_OPTIONS.wine:Mopengl)
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
+.endif
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
 
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 2c70bf423d5..a02fa115910 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.58 2007/01/02 15:33:33 adam Exp $
+$NetBSD: distinfo,v 1.59 2007/01/10 09:09:49 adam Exp $
 
-SHA1 (wine-0.9.28.tar.bz2) = 87848d0ce6aabc246890c0c552dd9714dbc45287
-RMD160 (wine-0.9.28.tar.bz2) = a90fd5181448e07fea9f5fea0f25539f2d5a267d
-Size (wine-0.9.28.tar.bz2) = 11406644 bytes
-SHA1 (patch-aa) = ba1c86faa7e9d7008622f105359229d3593e3cee
+SHA1 (wine-0.9.29.tar.bz2) = 6bab2eb5426f5a4c88ff82cad7ef71fae30ed166
+RMD160 (wine-0.9.29.tar.bz2) = f97c417c92e2548574e558eaa966dce8df836648
+Size (wine-0.9.29.tar.bz2) = 11447017 bytes
+SHA1 (patch-aa) = d2e381ee03022c77c36dc2e63f98c39db7a0ad9c
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 7f34f406e712a3f13c7b6cc0e5219de38a2754cf
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 64a69e1a8f1..e8c7a263453 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.24 2006/10/29 20:03:58 adam Exp $
+$NetBSD: patch-aa,v 1.25 2007/01/10 09:09:49 adam Exp $
 
---- Make.rules.in.orig	2006-10-27 17:20:13.000000000 +0200
+--- Make.rules.in.orig	2007-01-09 16:42:47.000000000 +0100
 +++ Make.rules.in
-@@ -112,7 +112,7 @@ CLEAN_FILES     = *.o *.a *.so *.ln *.$(
-                   *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core
+@@ -117,7 +117,7 @@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_
+                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \
+                 $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res)
  
- IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) 
 -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
 +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o)