Changes 0.9.9:

  - Many new features and improvements in Richedit.
  - More Web browser support.
  - Recursive directory change notifications.
  - Wine installation is now fully relocatable.
  - Direct3D 8 and 9 now use the same code.
  - Many debugger improvements.
  - Systray is now handled by the explorer process.
  - Lots of bug fixes

7 files changed, 84 insertions, 77 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 14388bd0c21..db7bf069929 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.98 2006/02/26 07:48:11 wiz Exp $
+# $NetBSD: Makefile,v 1.99 2006/03/06 13:46:01 adam Exp $
 
-DISTNAME=	wine-0.9.8
+DISTNAME=	wine-0.9.9
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
@@ -21,7 +21,7 @@ USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison gmake mktemp
 GNU_CONFIGURE=		yes
-#CONFIGURE_ARGS+=	--disable-debug
+CONFIGURE_ARGS+=	--disable-debug
 CONFIGURE_ARGS+=	--disable-trace
 UNLIMIT_RESOURCES=	datasize
 
@@ -31,7 +31,7 @@ REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
 # buildlink directory, so prepend all of the LDFLAGS necessary to link
 # against the libraries.
 #
-CONFIGURE_ENV+=		X_LIBS="${LDFLAGS:M*:Q}"
+CONFIGURE_ENV+=		X_LIBS=${LDFLAGS:M*:Q}
 CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -DDEVOSSAUDIO=\"${DEVOSSAUDIO}\""
 LIBS+=			${LDFLAGS}
 
@@ -39,7 +39,8 @@ LIBS+=			${LDFLAGS}
 
 post-install:
 .for tool in bin2res fnt2bdf
-	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} ${PREFIX}/bin
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} \
+		${PREFIX}/bin
 .endfor
 
 .include "../../audio/esound/buildlink3.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 4445c582271..78ceed9bbaf 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2006/02/26 07:48:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.38 2006/03/06 13:46:01 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -259,6 +259,7 @@ include/wine/windows/msxml2.idl
 include/wine/windows/msxml2did.h
 include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
+include/wine/windows/ndrtypes.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
 include/wine/windows/ntddcdrm.h
@@ -414,7 +415,7 @@ lib/wine/amstream.dll.so
 lib/wine/atl.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
-lib/wine/avifile.dll.so
+lib/wine/avifile.dll16
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/cabinet.dll.so
@@ -425,16 +426,16 @@ lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
-lib/wine/comm.drv.so
-lib/wine/commdlg.dll.so
-lib/wine/compobj.dll.so
+lib/wine/comm.drv16
+lib/wine/commdlg.dll16
+lib/wine/compobj.dll16
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/cryptdll.dll.so
-lib/wine/ctl3d.dll.so
+lib/wine/ctl3d.dll16
 lib/wine/ctl3d32.dll.so
-lib/wine/ctl3dv2.dll.so
+lib/wine/ctl3dv2.dll16
 lib/wine/d3d8.dll.so
 lib/wine/d3d9.dll.so
 lib/wine/d3dim.dll.so
@@ -443,13 +444,13 @@ lib/wine/d3dx8.dll.so
 lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
-lib/wine/ddeml.dll.so
+lib/wine/ddeml.dll16
 lib/wine/ddraw.dll.so
 lib/wine/devenum.dll.so
 lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
-lib/wine/dispdib.dll.so
-lib/wine/display.drv.so
+lib/wine/dispdib.dll16
+lib/wine/display.drv16
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -469,7 +470,7 @@ lib/wine/dxdiagn.dll.so
 lib/wine/eject.exe.so
 lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
-lib/wine/gdi.exe.so
+lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
 lib/wine/glut32.dll.so
@@ -481,14 +482,14 @@ lib/wine/icmp.dll.so
 lib/wine/ifsmgr.vxd.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
-lib/wine/imm.dll.so
+lib/wine/imm.dll16
 lib/wine/imm32.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.drv.so
-lib/wine/krnl386.exe.so
+lib/wine/keyboard.drv16
+lib/wine/krnl386.exe16
 lib/wine/libactiveds.def
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
@@ -607,7 +608,7 @@ lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
 lib/wine/lz32.dll.so
-lib/wine/lzexpand.dll.so
+lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
 lib/wine/mciavi32.dll.so
 lib/wine/mcicda.dll.so
@@ -616,16 +617,17 @@ lib/wine/mciwave.drv.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
-lib/wine/mmsystem.dll.so
+lib/wine/mmsystem.dll16
 lib/wine/monodebg.vxd.so
-lib/wine/mouse.drv.so
+lib/wine/mouse.drv16
 lib/wine/mpr.dll.so
-lib/wine/msacm.dll.so
+lib/wine/msacm.dll16
 lib/wine/msacm.drv.so
 lib/wine/msacm32.dll.so
 lib/wine/msadp32.acm.so
 lib/wine/mscms.dll.so
 lib/wine/msdmo.dll.so
+lib/wine/msftedit.dll.so
 lib/wine/msg711.acm.so
 lib/wine/mshtml.dll.so
 lib/wine/msi.dll.so
@@ -640,7 +642,7 @@ lib/wine/msvcrt40.dll.so
 lib/wine/msvcrtd.dll.so
 lib/wine/msvfw32.dll.so
 lib/wine/msvidc32.dll.so
-lib/wine/msvideo.dll.so
+lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
 lib/wine/netapi32.dll.so
@@ -650,20 +652,20 @@ lib/wine/ntdll.dll.so
 lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
-lib/wine/ole2.dll.so
-lib/wine/ole2conv.dll.so
-lib/wine/ole2disp.dll.so
-lib/wine/ole2nls.dll.so
-lib/wine/ole2prox.dll.so
-lib/wine/ole2thk.dll.so
+lib/wine/ole2.dll16
+lib/wine/ole2conv.dll16
+lib/wine/ole2disp.dll16
+lib/wine/ole2nls.dll16
+lib/wine/ole2prox.dll16
+lib/wine/ole2thk.dll16
 lib/wine/ole32.dll.so
 lib/wine/oleacc.dll.so
 lib/wine/oleaut32.dll.so
-lib/wine/olecli.dll.so
+lib/wine/olecli.dll16
 lib/wine/olecli32.dll.so
 lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
-lib/wine/olesvr.dll.so
+lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
 lib/wine/opengl32.dll.so
 lib/wine/powrprof.dll.so
@@ -671,7 +673,7 @@ lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
-lib/wine/rasapi16.dll.so
+lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
 lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
@@ -687,39 +689,39 @@ lib/wine/security.dll.so
 lib/wine/sensapi.dll.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
-lib/wine/setupx.dll.so
+lib/wine/setupx.dll16
 lib/wine/sfc.dll.so
 lib/wine/shdocvw.dll.so
-lib/wine/shell.dll.so
+lib/wine/shell.dll16
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 lib/wine/snmpapi.dll.so
-lib/wine/sound.drv.so
+lib/wine/sound.drv16
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
 lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
-lib/wine/storage.dll.so
-lib/wine/stress.dll.so
-lib/wine/system.drv.so
+lib/wine/storage.dll16
+lib/wine/stress.dll16
+lib/wine/system.drv16
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
-lib/wine/toolhelp.dll.so
-lib/wine/twain.dll.so
+lib/wine/toolhelp.dll16
+lib/wine/twain.dll16
 lib/wine/twain_32.dll.so
-lib/wine/typelib.dll.so
+lib/wine/typelib.dll16
 lib/wine/unicows.dll.so
 lib/wine/uninstaller.exe.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
-lib/wine/user.exe.so
+lib/wine/user.exe16
 lib/wine/user32.dll.so
 lib/wine/usp10.dll.so
 lib/wine/uxtheme.dll.so
 lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
-lib/wine/ver.dll.so
+lib/wine/ver.dll16
 lib/wine/version.dll.so
 lib/wine/vmm.vxd.so
 lib/wine/vnbt.vxd.so
@@ -727,12 +729,12 @@ lib/wine/vnetbios.vxd.so
 lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
-lib/wine/w32sys.dll.so
+lib/wine/w32sys.dll16
 lib/wine/wcmd.exe.so
-lib/wine/win32s16.dll.so
-lib/wine/win87em.dll.so
-lib/wine/winaspi.dll.so
-lib/wine/windebug.dll.so
+lib/wine/win32s16.dll16
+lib/wine/win87em.dll16
+lib/wine/winaspi.dll16
+lib/wine/windebug.dll16
 lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
@@ -753,18 +755,18 @@ lib/wine/winenas.drv.so
 lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
-lib/wine/wineps16.drv.so
+lib/wine/wineps16.drv16
 lib/wine/winevdm.exe.so
 lib/wine/winex11.drv.so
-lib/wine/wing.dll.so
+lib/wine/wing.dll16
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
-lib/wine/winnls.dll.so
+lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
-lib/wine/winsock.dll.so
+lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
-lib/wine/wintab.dll.so
+lib/wine/wintab.dll16
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
@@ -772,7 +774,7 @@ lib/wine/wldap32.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
 lib/wine/wow32.dll.so
-lib/wine/wprocs.dll.so
+lib/wine/wprocs.dll16
 lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 550c233b7d0..31251e07e9a 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.40 2006/02/26 07:48:11 wiz Exp $
+$NetBSD: distinfo,v 1.41 2006/03/06 13:46:01 adam Exp $
 
-SHA1 (wine-0.9.8.tar.bz2) = a1f7e397ed11f69515c228151eb359bd17974601
-RMD160 (wine-0.9.8.tar.bz2) = 54b44b3733cb1628189830e3e8295efa848af6f1
-Size (wine-0.9.8.tar.bz2) = 10563571 bytes
-SHA1 (patch-aa) = 21f26a1d1a2e6c07f5c9b795d8e8636409573519
+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 (patch-aa) = 52b95bbc7ac3e2181963836c80c959be4e134a05
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 87054d8c1673d32ac621e435de308609ffdacbc8
+SHA1 (patch-ac) = 95bbcdecaafd35e7de5767ab92fc114bf8c63003
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
-SHA1 (patch-af) = bceafa71ee9e1546f04d192d43fe00c98d8bec7b
+SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
-SHA1 (patch-ah) = f6df19bd14ea8760933ca3787d55b6699897b8db
+SHA1 (patch-ah) = bb3df1bd03b9077faa788d678fec2390ca50cc64
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
 SHA1 (patch-ak) = ba724d106a8bd5c47a6f100680f49655827a3f52
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index e7ad33a4969..22ca10eabe9 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.19 2006/01/20 14:58:18 adam Exp $
+$NetBSD: patch-aa,v 1.20 2006/03/06 13:46:01 adam Exp $
 
---- Make.rules.in.orig	2005-10-06 18:06:04.000000000 +0200
+--- Make.rules.in.orig	2006-03-02 18:16:51.000000000 +0100
 +++ Make.rules.in
-@@ -109,7 +109,7 @@ conf_manext     = 5
+@@ -110,7 +110,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                    *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
  
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 2d5fcfb60a1..e2508a5bdf1 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.23 2006/02/26 07:48:11 wiz Exp $
+$NetBSD: patch-ac,v 1.24 2006/03/06 13:46:01 adam Exp $
 
---- configure.orig	2006-02-15 17:02:40.000000000 +0100
+--- configure.orig	2006-03-02 18:16:51.000000000 +0100
 +++ configure
-@@ -16202,7 +16202,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16387,7 +16387,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.23 2006/02/26 07:48:11 wiz Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17899,7 +17899,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -18084,7 +18084,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-af b/emulators/wine/patches/patch-af
index 1ac3d05c7be..19dbefb9bad 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.16 2006/02/26 07:48:11 wiz Exp $
+$NetBSD: patch-af,v 1.17 2006/03/06 13:46:01 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2006-02-15 16:02:43.000000000 +0000
+--- dlls/ntdll/signal_i386.c.orig	2006-03-02 18:16:51.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
-@@ -208,7 +208,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -215,7 +215,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.16 2006/02/26 07:48:11 wiz Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -332,8 +332,45 @@ typedef ucontext_t SIGCONTEXT;
+@@ -339,8 +339,45 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
diff --git a/emulators/wine/patches/patch-ah b/emulators/wine/patches/patch-ah
index fc7429f7e82..85c919265e0 100644
--- a/emulators/wine/patches/patch-ah
+++ b/emulators/wine/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.7 2005/10/26 08:32:59 adam Exp $
+$NetBSD: patch-ah,v 1.8 2006/03/06 13:46:01 adam Exp $
 
---- tools/Makefile.in.orig	2005-10-06 16:10:02.000000000 +0000
+--- tools/Makefile.in.orig	2006-03-02 18:16:57.000000000 +0100
 +++ tools/Makefile.in
-@@ -53,16 +53,16 @@ make_ctests$(EXEEXT): make_ctests.o
+@@ -55,19 +55,19 @@ make_ctests$(EXEEXT): make_ctests.o
  	$(CC) $(CFLAGS) -o $@ make_ctests.o
  
  fnt2bdf$(EXEEXT): fnt2bdf.o
@@ -13,6 +13,10 @@ $NetBSD: patch-ah,v 1.7 2005/10/26 08:32:59 adam Exp $
 -	$(CC) $(CFLAGS) -o $@ fnt2fon.o $(LIBPORT)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ fnt2fon.o $(LIBPORT)
  
+ relpath$(EXEEXT): relpath.o
+-	$(CC) $(CFLAGS) -o $@ relpath.o $(LIBPORT)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ relpath.o $(LIBPORT)
+ 
  sfnt2fnt$(EXEEXT): sfnt2fnt.o
 -	$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS)
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ sfnt2fnt.o $(LIBUNICODE) $(LIBPORT) $(FREETYPELIBS)