Update to 0.9.8:

0.9.8:
  - Better Web browser support.
  - Beginnings of a Wordpad application.
  - Many richedit improvements.
  - A number of Direct3D fixes.
  - A few more options in winecfg.
  - Lots of bug fixes.

0.9.7:
  - Directory change notifications can use inotify now.
  - Hardware breakpoints in the Wine debugger.
  - Beginnings of support for tape APIs.
  - A bunch of improvements to the IDL compiler.
  - Better scheme for mapping My Documents etc. to Unix directories.
  - Lots of bug fixes.

pkgsrc change:
Install fnt2bdf and bin2res tools. Improve PLIST.

Ok adam@

8 files changed, 63 insertions, 35 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 002b33a891d..14388bd0c21 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.97 2006/02/05 23:09:05 joerg Exp $
+# $NetBSD: Makefile,v 1.98 2006/02/26 07:48:11 wiz Exp $
 
-DISTNAME=	wine-0.9.6
-PKGREVISION=	1
+DISTNAME=	wine-0.9.8
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
@@ -17,6 +16,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/W/w/}
+USE_DIRS+=		xdg-1.1
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison gmake mktemp
@@ -37,6 +37,11 @@ LIBS+=			${LDFLAGS}
 
 .include "options.mk"
 
+post-install:
+.for tool in bin2res fnt2bdf
+	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} ${PREFIX}/bin
+.endfor
+
 .include "../../audio/esound/buildlink3.mk"
 .include "../../databases/openldap/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 378152bdc43..4445c582271 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.36 2006/01/20 14:58:17 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2006/02/26 07:48:11 wiz Exp $
+bin/bin2res
+bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
@@ -122,7 +124,9 @@ include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddk/cfgmgr32.h
+include/wine/windows/ddk/ntddcdvd.h
 include/wine/windows/ddk/ntddser.h
+include/wine/windows/ddk/ntddtape.h
 include/wine/windows/ddk/wdm.h
 include/wine/windows/ddk/winsplp.h
 include/wine/windows/ddraw.h
@@ -159,6 +163,7 @@ include/wine/windows/dplay.h
 include/wine/windows/dplay8.h
 include/wine/windows/dplobby.h
 include/wine/windows/dplobby8.h
+include/wine/windows/dpnathlp.h
 include/wine/windows/dsconf.h
 include/wine/windows/dsdriver.h
 include/wine/windows/dshow.h
@@ -236,6 +241,7 @@ include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
 include/wine/windows/mscat.h
+include/wine/windows/mshtmcid.h
 include/wine/windows/mshtmdid.h
 include/wine/windows/mshtmhst.h
 include/wine/windows/mshtmhst.idl
@@ -315,6 +321,7 @@ include/wine/windows/sensevts.idl
 include/wine/windows/servprov.h
 include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
+include/wine/windows/sfc.h
 include/wine/windows/shellapi.h
 include/wine/windows/shldisp.h
 include/wine/windows/shldisp.idl
@@ -561,12 +568,12 @@ lib/wine/libquartz.def
 lib/wine/librasapi32.def
 lib/wine/libriched20.def
 lib/wine/librpcrt4.def
-lib/wine/librsabase.def
 lib/wine/librsaenh.def
 lib/wine/libsecur32.def
 lib/wine/libsensapi.def
 lib/wine/libserialui.def
 lib/wine/libsetupapi.def
+lib/wine/libsfc.def
 lib/wine/libshdocvw.def
 lib/wine/libshell32.def
 lib/wine/libshfolder.def
@@ -584,7 +591,6 @@ lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
-lib/wine/libw32skrnl.def
 lib/wine/libwinecrt0.a
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
@@ -682,6 +688,7 @@ lib/wine/sensapi.dll.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll.so
+lib/wine/sfc.dll.so
 lib/wine/shdocvw.dll.so
 lib/wine/shell.dll.so
 lib/wine/shell32.dll.so
@@ -747,7 +754,6 @@ lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
-lib/wine/winetest.exe.so
 lib/wine/winevdm.exe.so
 lib/wine/winex11.drv.so
 lib/wine/wing.dll.so
@@ -764,6 +770,7 @@ lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 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/ws2_32.dll.so
@@ -817,6 +824,8 @@ share/wine/generic.ppd
 share/wine/wine.inf
 @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
 @dirrm include/wine/windows
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 1f9caad369a..550c233b7d0 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,16 +1,17 @@
-$NetBSD: distinfo,v 1.39 2006/01/20 14:58:17 adam Exp $
+$NetBSD: distinfo,v 1.40 2006/02/26 07:48:11 wiz Exp $
 
-SHA1 (wine-0.9.6.tar.bz2) = 8fde8657c67929da25449431cfa7baebb36add4f
-RMD160 (wine-0.9.6.tar.bz2) = 5fb3005c84318e837782bd1b78d0694f3f7ce576
-Size (wine-0.9.6.tar.bz2) = 10454441 bytes
+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 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 6622a244112e29d617beb4ee3942872c25e2a015
-SHA1 (patch-ad) = 92abc177dc37ed983ec6079cd08ad7a1472e178a
+SHA1 (patch-ac) = 87054d8c1673d32ac621e435de308609ffdacbc8
+SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
-SHA1 (patch-af) = 672c95b9eec3f0cfcb096a40022500c64e5dc9c4
+SHA1 (patch-af) = bceafa71ee9e1546f04d192d43fe00c98d8bec7b
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
 SHA1 (patch-ah) = f6df19bd14ea8760933ca3787d55b6699897b8db
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
-SHA1 (patch-ak) = a04c52387feca981a66edaceb5d0563558c7cbaa
+SHA1 (patch-ak) = ba724d106a8bd5c47a6f100680f49655827a3f52
+SHA1 (patch-al) = e778c70a4cc79577a0427d1c253ac4477a27d803
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 8b3b14e0d4c..2d5fcfb60a1 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.22 2006/01/20 14:58:18 adam Exp $
+$NetBSD: patch-ac,v 1.23 2006/02/26 07:48:11 wiz Exp $
 
---- configure.orig	2006-01-19 15:13:50.000000000 +0100
+--- configure.orig	2006-02-15 17:02:40.000000000 +0100
 +++ configure
-@@ -16166,7 +16166,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -16202,7 +16202,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.22 2006/01/20 14:58:18 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18068,7 +18068,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -17899,7 +17899,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 23bd41e66ee..9f028a1913f 100644
--- a/emulators/wine/patches/patch-ad
+++ b/emulators/wine/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2005/01/14 13:00:05 adam Exp $
+$NetBSD: patch-ad,v 1.8 2006/02/26 07:48:11 wiz Exp $
 
---- dlls/iphlpapi/ifenum.c.orig	2004-12-23 18:41:05.000000000 +0000
+--- dlls/iphlpapi/ifenum.c.orig	2006-02-15 17:02:42.000000000 +0100
 +++ dlls/iphlpapi/ifenum.c
-@@ -55,6 +55,7 @@
+@@ -39,6 +39,7 @@
  #endif
  
  #include <sys/types.h>
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index b86508709ab..1ac3d05c7be 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,21 +1,22 @@
-$NetBSD: patch-af,v 1.15 2006/01/20 14:58:18 adam Exp $
+$NetBSD: patch-af,v 1.16 2006/02/26 07:48:11 wiz Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2006-01-19 15:14:04.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2006-02-15 16:02:43.000000000 +0000
 +++ dlls/ntdll/signal_i386.c
-@@ -204,7 +204,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -208,7 +208,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
--#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
++#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -328,7 +328,45 @@ typedef ucontext_t SIGCONTEXT;
+@@ -332,8 +332,45 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
--#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\
+-#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||\
+-    defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
 +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
 +# include <sys/ucontext.h>
 +# include <sys/types.h>
@@ -53,8 +54,8 @@ $NetBSD: patch-af,v 1.15 2006/01/20 14:58:18 adam Exp $
 +
 +#endif	/* NetBSD */
 +
-+
 +#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) ||\
-     defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
++    defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
  
  #define EAX_sig(context)     ((context)->sc_eax)
+ #define EBX_sig(context)     ((context)->sc_ebx)
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index 2bac5841175..1f82881829a 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.4 2006/01/20 14:58:18 adam Exp $
+$NetBSD: patch-ak,v 1.5 2006/02/26 07:48:11 wiz Exp $
 
---- dlls/ntdll/file.c.orig	2006-01-20 14:08:25.000000000 +0100
+--- dlls/ntdll/file.c.orig	2006-02-15 17:02:43.000000000 +0100
 +++ dlls/ntdll/file.c
-@@ -1587,6 +1587,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+@@ -1592,6 +1592,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }
@@ -35,6 +35,6 @@ $NetBSD: patch-ak,v 1.4 2006/01/20 14:58:18 adam Exp $
 +	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
 +	    info->Characteristics |= FILE_REMOTE_DEVICE;
 +	}
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
          struct statfs stfs;
  
diff --git a/emulators/wine/patches/patch-al b/emulators/wine/patches/patch-al
new file mode 100644
index 00000000000..6a2937d481d
--- /dev/null
+++ b/emulators/wine/patches/patch-al
@@ -0,0 +1,12 @@
+$NetBSD: patch-al,v 1.5 2006/02/26 07:48:11 wiz Exp $
+
+--- dlls/riched20/tests/editor.c.orig	2006-02-15 16:02:44.000000000 +0000
++++ dlls/riched20/tests/editor.c
+@@ -18,6 +18,7 @@
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <winsock.h>
+ #include <wine/test.h>
+ #include <windows.h>
+ #include <richedit.h>