Changes 0.9.10:

  - Improved ESD audio driver.
  - More Web browser improvements in mshtml and wininet.
  - Direct3D fixes and preparation for ddraw code migration.
  - Explorer process now managing the desktop window.
  - Lots of bug fixes.

6 files changed, 52 insertions, 53 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 9eb4a09ba67..98850e3dcdf 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2006/03/13 08:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.102 2006/03/31 10:48:00 adam Exp $
 
-DISTNAME=	wine-0.9.9
+DISTNAME=	wine-0.9.10
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index f2918979df8..49880ae65a9 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2006/03/13 08:31:23 adam Exp $
+@comment $NetBSD: PLIST,v 1.40 2006/03/31 10:48:00 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -791,42 +791,41 @@ man/man1/wmc.1
 man/man1/wrc.1
 share/aclocal/wine.m4
 share/applications/wine.desktop
-share/fonts/wine/coue1255.fon
-share/fonts/wine/coue1256.fon
-share/fonts/wine/coue1257.fon
-share/fonts/wine/coure.fon
-share/fonts/wine/couree.fon
-share/fonts/wine/coureg.fon
-share/fonts/wine/courer.fon
-share/fonts/wine/couret.fon
-share/fonts/wine/cvgasys.fon
-share/fonts/wine/hvgasys.fon
-share/fonts/wine/jvgasys.fon
-share/fonts/wine/marlett.ttf
-share/fonts/wine/ssee1255.fon
-share/fonts/wine/ssee1256.fon
-share/fonts/wine/ssee1257.fon
-share/fonts/wine/ssee874.fon
-share/fonts/wine/sserife.fon
-share/fonts/wine/sserifee.fon
-share/fonts/wine/sserifeg.fon
-share/fonts/wine/sserifer.fon
-share/fonts/wine/sserifet.fon
-share/fonts/wine/svgasys.fon
-share/fonts/wine/vgas1255.fon
-share/fonts/wine/vgas1256.fon
-share/fonts/wine/vgas1257.fon
-share/fonts/wine/vgas874.fon
-share/fonts/wine/vgasys.fon
-share/fonts/wine/vgasyse.fon
-share/fonts/wine/vgasysg.fon
-share/fonts/wine/vgasysr.fon
-share/fonts/wine/vgasyst.fon
+share/wine/fonts/coue1255.fon
+share/wine/fonts/coue1256.fon
+share/wine/fonts/coue1257.fon
+share/wine/fonts/coure.fon
+share/wine/fonts/couree.fon
+share/wine/fonts/coureg.fon
+share/wine/fonts/courer.fon
+share/wine/fonts/couret.fon
+share/wine/fonts/cvgasys.fon
+share/wine/fonts/hvgasys.fon
+share/wine/fonts/jvgasys.fon
+share/wine/fonts/marlett.ttf
+share/wine/fonts/ssee1255.fon
+share/wine/fonts/ssee1256.fon
+share/wine/fonts/ssee1257.fon
+share/wine/fonts/ssee874.fon
+share/wine/fonts/sserife.fon
+share/wine/fonts/sserifee.fon
+share/wine/fonts/sserifeg.fon
+share/wine/fonts/sserifer.fon
+share/wine/fonts/sserifet.fon
+share/wine/fonts/svgasys.fon
+share/wine/fonts/vgas1255.fon
+share/wine/fonts/vgas1256.fon
+share/wine/fonts/vgas1257.fon
+share/wine/fonts/vgas874.fon
+share/wine/fonts/vgasys.fon
+share/wine/fonts/vgasyse.fon
+share/wine/fonts/vgasysg.fon
+share/wine/fonts/vgasysr.fon
+share/wine/fonts/vgasyst.fon
 share/wine/generic.ppd
 share/wine/wine.inf
+@dirrm share/wine/fonts
 @dirrm share/wine
-@dirrm share/fonts/wine
-@unexec ${RMDIR} %D/share/fonts 2>/dev/null || ${TRUE}
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/wine
 @dirrm include/wine/windows/ddk
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 31251e07e9a..c94e048dddc 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.41 2006/03/06 13:46:01 adam Exp $
+$NetBSD: distinfo,v 1.42 2006/03/31 10:48:00 adam Exp $
 
-SHA1 (wine-0.9.9.tar.bz2) = efdff295b4996873c54e3536b73022dea41af923
-RMD160 (wine-0.9.9.tar.bz2) = 50f53da5a8be9ecdb7a982307952effc4754d5ec
-Size (wine-0.9.9.tar.bz2) = 10546298 bytes
+SHA1 (wine-0.9.10.tar.bz2) = a7ea7937153790bce473e846ae4d14729754b44f
+RMD160 (wine-0.9.10.tar.bz2) = c55c6a1fee2b4386aa91c9dd7b4c52d9c69e87ff
+Size (wine-0.9.10.tar.bz2) = 10618613 bytes
 SHA1 (patch-aa) = 52b95bbc7ac3e2181963836c80c959be4e134a05
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 95bbcdecaafd35e7de5767ab92fc114bf8c63003
+SHA1 (patch-ac) = 4e9704986b1264b4b34b7ee55100d0332cdfb385
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
 SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
-SHA1 (patch-ah) = bb3df1bd03b9077faa788d678fec2390ca50cc64
+SHA1 (patch-ah) = 8a21e8804036546d76464218b4346930ee757de2
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
 SHA1 (patch-ak) = ba724d106a8bd5c47a6f100680f49655827a3f52
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 5f10e9c8b01..f94abe8d28b 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/03/13 08:31:23 adam Exp $
+# $NetBSD: options.mk,v 1.4 2006/03/31 10:48:00 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
 PKG_SUPPORTED_OPTIONS=	arts cups opengl sane
@@ -15,12 +15,12 @@ PKG_SUGGESTED_OPTIONS=	opengl
 .endif
 
 .if !empty(PKG_OPTIONS:Mopengl)
-PLIST_SUBST=	WINE_OPENGL=""
+PLIST_SUBST+=	WINE_OPENGL=""
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-opengl
-PLIST_SUBST=	WINE_OPENGL="@comment "
+PLIST_SUBST+=	WINE_OPENGL="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Msane)
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index e2508a5bdf1..749fd4a813b 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.24 2006/03/06 13:46:01 adam Exp $
+$NetBSD: patch-ac,v 1.25 2006/03/31 10:48:00 adam Exp $
 
---- configure.orig	2006-03-02 18:16:51.000000000 +0100
+--- configure.orig	2006-03-15 15:50:30.000000000 +0100
 +++ configure
-@@ -16387,7 +16387,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16407,7 +16407,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.24 2006/03/06 13:46:01 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18084,7 +18084,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -18104,7 +18104,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-ah b/emulators/wine/patches/patch-ah
index 85c919265e0..f8c41f1e7b6 100644
--- a/emulators/wine/patches/patch-ah
+++ b/emulators/wine/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.8 2006/03/06 13:46:01 adam Exp $
+$NetBSD: patch-ah,v 1.9 2006/03/31 10:48:00 adam Exp $
 
---- tools/Makefile.in.orig	2006-03-02 18:16:57.000000000 +0100
+--- tools/Makefile.in.orig	2006-03-15 15:50:51.000000000 +0100
 +++ tools/Makefile.in
 @@ -55,19 +55,19 @@ make_ctests$(EXEEXT): make_ctests.o
  	$(CC) $(CFLAGS) -o $@ make_ctests.o
@@ -25,5 +25,5 @@ $NetBSD: patch-ah,v 1.8 2006/03/06 13:46:01 adam Exp $
 -	$(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ bin2res.o $(LIBPORT)
  
- wineprefixcreate: wineprefixcreate.in
- 	sed -e 's,@dlldir\@,$(dlldir),g' -e 's,@datadir\@,$(datadir),g' $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)
+ wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT)
+ 	sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)