Update emulators/wine to 1.0, as requested in PR pkg/38985.

Add missing dep on libxml2.

Also merge some stuff from wip/wine:
  - more options (esound, ldap, dbus, ssl, x11)
  - split PLIST to accomodate extra files on Linux and FreeBSD (PR pkg/36320)

This also fixes the broken build against current openldap. (PR pkg/38025)

8 files changed, 246 insertions, 104 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 8e980ca26b5..156cd036f55 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.142 2008/02/04 20:10:35 tnn Exp $
+# $NetBSD: Makefile,v 1.143 2008/06/22 23:38:18 dholland Exp $
 
-DISTNAME=	wine-0.9.44
-PKGREVISION=	2
+DISTNAME=	wine-1.0
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -9,7 +8,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.winehq.com/
-COMMENT=	Free implementation of Windows on Unix (still alpha)
+COMMENT=	Free implementation of Windows on Unix
 
 BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 
@@ -38,32 +37,14 @@ LIBS+=			${LDFLAGS}
 .include "options.mk"
 
 post-install:
-.for tool in bin2res fnt2bdf
+.for tool in fnt2bdf
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool} \
 		${PREFIX}/bin
 .endfor
 
-.include "../../audio/esound/buildlink3.mk"
-.include "../../databases/openldap-client/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
-.include "../../graphics/freetype2/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/lcms/buildlink3.mk"
-.include "../../graphics/libungif/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../x11/libICE/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXcursor/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/libXinerama/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXrender/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/PLIST.FreeBSD b/emulators/wine/PLIST.FreeBSD
new file mode 100644
index 00000000000..f2bbdb7d395
--- /dev/null
+++ b/emulators/wine/PLIST.FreeBSD
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.FreeBSD,v 1.1 2008/06/22 23:38:18 dholland Exp $
+bin/wine-pthread
diff --git a/emulators/wine/PLIST.Linux b/emulators/wine/PLIST.Linux
new file mode 100644
index 00000000000..73ec8a8c402
--- /dev/null
+++ b/emulators/wine/PLIST.Linux
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST.Linux,v 1.1 2008/06/22 23:38:18 dholland Exp $
+bin/wine-pthread
+bin/wine-kthread
+bin/wine-preloader
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST.common
index e78f986c631..9e37cf5d12a 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST.common
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.68 2008/04/12 22:43:00 jlam Exp $
-bin/bin2res
+@comment $NetBSD: PLIST.common,v 1.1 2008/06/22 23:38:18 dholland Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
@@ -21,14 +20,12 @@ bin/winedump
 bin/winefile
 bin/wineg++
 bin/winegcc
-bin/winelauncher
 bin/winemaker
 bin/winemine
 bin/winepath
 bin/wineprefixcreate
 bin/wineserver
 bin/wineshelllink
-bin/winhelp
 bin/wmc
 bin/wrc
 include/wine/debug.h
@@ -72,9 +69,15 @@ include/wine/msvcrt/time.h
 include/wine/msvcrt/unistd.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/svcctl.h
+include/wine/svcctl.idl
 include/wine/unicode.h
 include/wine/windows/accctrl.h
 include/wine/windows/aclapi.h
+include/wine/windows/activaut.h
+include/wine/windows/activaut.idl
+include/wine/windows/activdbg.h
+include/wine/windows/activdbg.idl
 include/wine/windows/activscp.h
 include/wine/windows/activscp.idl
 include/wine/windows/adshlp.h
@@ -92,6 +95,12 @@ include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
 include/wine/windows/basetyps.h
+include/wine/windows/bcrypt.h
+include/wine/windows/bits.h
+include/wine/windows/bits.idl
+include/wine/windows/bits1_5.h
+include/wine/windows/bits1_5.idl
+include/wine/windows/bitsmsg.h
 include/wine/windows/cderr.h
 include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
@@ -105,6 +114,7 @@ include/wine/windows/compobj.h
 include/wine/windows/control.h
 include/wine/windows/control.idl
 include/wine/windows/cor.h
+include/wine/windows/corerror.h
 include/wine/windows/cpl.h
 include/wine/windows/custcntl.h
 include/wine/windows/cvconst.h
@@ -123,7 +133,16 @@ include/wine/windows/d3drm.h
 include/wine/windows/d3drmdef.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
+include/wine/windows/d3dx8.h
 include/wine/windows/d3dx8core.h
+include/wine/windows/d3dx8math.h
+include/wine/windows/d3dx8math.inl
+include/wine/windows/d3dx8mesh.h
+include/wine/windows/d3dx9.h
+include/wine/windows/d3dx9core.h
+include/wine/windows/d3dx9math.h
+include/wine/windows/d3dx9math.inl
+include/wine/windows/d3dx9tex.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbinit.idl
 include/wine/windows/dbprop.idl
@@ -136,10 +155,13 @@ include/wine/windows/ddeml.h
 include/wine/windows/ddk/compstui.h
 include/wine/windows/ddk/hidsdi.h
 include/wine/windows/ddk/imm.h
+include/wine/windows/ddk/mountmgr.h
 include/wine/windows/ddk/ntddcdvd.h
+include/wine/windows/ddk/ntddk.h
 include/wine/windows/ddk/ntddser.h
 include/wine/windows/ddk/ntddtape.h
 include/wine/windows/ddk/wdm.h
+include/wine/windows/ddk/winddiui.h
 include/wine/windows/ddk/winsplp.h
 include/wine/windows/ddraw.h
 include/wine/windows/ddrawi.h
@@ -148,6 +170,8 @@ include/wine/windows/ddstream.idl
 include/wine/windows/devenum.idl
 include/wine/windows/devguid.h
 include/wine/windows/digitalv.h
+include/wine/windows/dimm.h
+include/wine/windows/dimm.idl
 include/wine/windows/dinput.h
 include/wine/windows/dispdib.h
 include/wine/windows/dispex.h
@@ -182,6 +206,7 @@ include/wine/windows/dsgetdc.h
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
 include/wine/windows/dsrole.h
+include/wine/windows/dvdmedia.h
 include/wine/windows/dwmapi.h
 include/wine/windows/dxdiag.h
 include/wine/windows/dxerr8.h
@@ -192,6 +217,7 @@ include/wine/windows/dxgi.idl
 include/wine/windows/dxgitype.h
 include/wine/windows/dxgitype.idl
 include/wine/windows/dyngraph.idl
+include/wine/windows/errorrep.h
 include/wine/windows/errors.h
 include/wine/windows/evcode.h
 include/wine/windows/evntrace.h
@@ -201,7 +227,10 @@ include/wine/windows/exdisp.idl
 include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
+include/wine/windows/fusion.h
+include/wine/windows/fusion.idl
 include/wine/windows/gdiplus.h
+include/wine/windows/gdipluscolor.h
 include/wine/windows/gdipluscolormatrix.h
 include/wine/windows/gdiplusenums.h
 include/wine/windows/gdiplusflat.h
@@ -219,6 +248,7 @@ include/wine/windows/hlink.idl
 include/wine/windows/htiframe.h
 include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
+include/wine/windows/i_cryptasn1tls.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
 include/wine/windows/icftypes.h
@@ -228,14 +258,20 @@ include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
+include/wine/windows/imnact.h
+include/wine/windows/imnact.idl
+include/wine/windows/imnxport.h
+include/wine/windows/imnxport.idl
 include/wine/windows/indexsrv.h
 include/wine/windows/indexsrv.idl
 include/wine/windows/initguid.h
+include/wine/windows/intshcut.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
 include/wine/windows/iprtrmib.h
 include/wine/windows/iptypes.h
+include/wine/windows/isguids.h
 include/wine/windows/ks.h
 include/wine/windows/ksguid.h
 include/wine/windows/ksmedia.h
@@ -268,8 +304,11 @@ include/wine/windows/mcx.h
 include/wine/windows/mediaerr.h
 include/wine/windows/mediaobj.h
 include/wine/windows/mediaobj.idl
+include/wine/windows/midles.h
 include/wine/windows/mimeinfo.h
 include/wine/windows/mimeinfo.idl
+include/wine/windows/mimeole.h
+include/wine/windows/mimeole.idl
 include/wine/windows/minmax.h
 include/wine/windows/mlang.h
 include/wine/windows/mlang.idl
@@ -333,6 +372,8 @@ include/wine/windows/ocmm.idl
 include/wine/windows/odbcinst.h
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
+include/wine/windows/oleacc.h
+include/wine/windows/oleacc.idl
 include/wine/windows/oleauto.h
 include/wine/windows/olectl.h
 include/wine/windows/oledb.h
@@ -350,6 +391,7 @@ include/wine/windows/powrprof.h
 include/wine/windows/profinfo.h
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
+include/wine/windows/propvarutil.h
 include/wine/windows/prsht.h
 include/wine/windows/psapi.h
 include/wine/windows/pshpack1.h
@@ -358,6 +400,8 @@ include/wine/windows/pshpack4.h
 include/wine/windows/pshpack8.h
 include/wine/windows/pstore.h
 include/wine/windows/pstore.idl
+include/wine/windows/qedit.h
+include/wine/windows/qedit.idl
 include/wine/windows/ras.h
 include/wine/windows/reason.h
 include/wine/windows/regstr.h
@@ -366,6 +410,7 @@ include/wine/windows/richole.h
 include/wine/windows/richole.idl
 include/wine/windows/rmxfguid.h
 include/wine/windows/rpc.h
+include/wine/windows/rpcasync.h
 include/wine/windows/rpcdce.h
 include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
@@ -396,6 +441,8 @@ include/wine/windows/shobjidl.idl
 include/wine/windows/shtypes.h
 include/wine/windows/shtypes.idl
 include/wine/windows/sipbase.h
+include/wine/windows/slerror.h
+include/wine/windows/slpublic.h
 include/wine/windows/snmp.h
 include/wine/windows/softpub.h
 include/wine/windows/sql.h
@@ -430,6 +477,7 @@ include/wine/windows/vdmdbg.h
 include/wine/windows/ver.h
 include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
+include/wine/windows/wfext.h
 include/wine/windows/winbase.h
 include/wine/windows/wincon.h
 include/wine/windows/wincred.h
@@ -440,6 +488,7 @@ include/wine/windows/windows.h
 include/wine/windows/windowsx.h
 include/wine/windows/winerror.h
 include/wine/windows/wingdi.h
+include/wine/windows/winhttp.h
 include/wine/windows/wininet.h
 include/wine/windows/winineti.h
 include/wine/windows/winioctl.h
@@ -487,6 +536,7 @@ lib/libwine.so.1
 lib/libwine.so.1.0
 lib/wine/acledit.dll.so
 lib/wine/activeds.dll.so
+lib/wine/actxprxy.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
@@ -513,8 +563,11 @@ lib/wine/control.exe.so
 lib/wine/credui.dll.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/cryptdlg.dll.so
 lib/wine/cryptdll.dll.so
 lib/wine/cryptnet.dll.so
+lib/wine/cryptui.dll.so
+lib/wine/ctapi32.dll.so
 lib/wine/ctl3d.dll16
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll16
@@ -524,6 +577,20 @@ lib/wine/d3d9.dll.so
 lib/wine/d3dim.dll.so
 lib/wine/d3drm.dll.so
 lib/wine/d3dx8.dll.so
+lib/wine/d3dx9_24.dll.so
+lib/wine/d3dx9_25.dll.so
+lib/wine/d3dx9_26.dll.so
+lib/wine/d3dx9_27.dll.so
+lib/wine/d3dx9_28.dll.so
+lib/wine/d3dx9_29.dll.so
+lib/wine/d3dx9_30.dll.so
+lib/wine/d3dx9_31.dll.so
+lib/wine/d3dx9_32.dll.so
+lib/wine/d3dx9_33.dll.so
+lib/wine/d3dx9_34.dll.so
+lib/wine/d3dx9_35.dll.so
+lib/wine/d3dx9_36.dll.so
+lib/wine/d3dx9_37.dll.so
 lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
@@ -552,6 +619,7 @@ lib/wine/dpnet.dll.so
 lib/wine/dpnhpast.dll.so
 lib/wine/dpnlobby.dll.so
 lib/wine/dsound.dll.so
+lib/wine/dssenh.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dwmapi.dll.so
 lib/wine/dxdiagn.dll.so
@@ -559,11 +627,13 @@ lib/wine/eject.exe.so
 lib/wine/expand.exe.so
 lib/wine/explorer.exe.so
 lib/wine/faultrep.dll.so
+lib/wine/fusion.dll.so
 lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 lib/wine/gdiplus.dll.so
 ${PLIST.opengl}lib/wine/glu32.dll.so
 lib/wine/gphoto2.ds.so
+lib/wine/gpkcsp.dll.so
 lib/wine/hal.dll.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
@@ -579,15 +649,20 @@ lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
 lib/wine/imm.dll16
 lib/wine/imm32.dll.so
+lib/wine/inetcomm.dll.so
 lib/wine/infosoft.dll.so
+lib/wine/initpki.dll.so
 lib/wine/inkobj.dll.so
 lib/wine/inseng.dll.so
 lib/wine/iphlpapi.dll.so
+lib/wine/itircl.dll.so
 lib/wine/itss.dll.so
+lib/wine/jscript.dll.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv16
 lib/wine/krnl386.exe16
 lib/wine/libactiveds.def
+lib/wine/libadsiid.a
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
 lib/wine/libatl.def
@@ -601,15 +676,18 @@ lib/wine/libclusapi.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcompstui.def
+lib/wine/libcredui.def
 lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
 lib/wine/libcryptdll.def
+lib/wine/libcryptnet.def
 lib/wine/libctl3d32.def
 lib/wine/libd3d8.def
 lib/wine/libd3d9.def
 lib/wine/libd3dim.def
 lib/wine/libd3drm.def
 lib/wine/libd3dx8.def
+lib/wine/libd3dx9.def
 lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
@@ -635,6 +713,7 @@ lib/wine/libhlink.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
+lib/wine/libinetcomm.def
 lib/wine/libiphlpapi.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
@@ -648,6 +727,7 @@ lib/wine/libmsdmo.def
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
+lib/wine/libmsvcr71.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
 lib/wine/libmsvcrt40.def
@@ -689,6 +769,7 @@ lib/wine/libshdocvw.def
 lib/wine/libshell32.def
 lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
+lib/wine/libslc.def
 lib/wine/libsnmpapi.def
 lib/wine/libspoolss.def
 lib/wine/libsti.def
@@ -698,6 +779,7 @@ lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libuserenv.def
 lib/wine/libusp10.def
 lib/wine/libuuid.a
 lib/wine/libuxtheme.def
@@ -733,6 +815,7 @@ lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
 lib/wine/mmsystem.dll16
 lib/wine/monodebg.vxd.so
+lib/wine/mountmgr.sys.so
 lib/wine/mouse.drv16
 lib/wine/mpr.dll.so
 lib/wine/mprapi.dll.so
@@ -740,6 +823,7 @@ lib/wine/msacm.dll16
 lib/wine/msacm32.dll.so
 lib/wine/msacm32.drv.so
 lib/wine/msadp32.acm.so
+lib/wine/mscat32.dll.so
 lib/wine/mscms.dll.so
 lib/wine/mscoree.dll.so
 lib/wine/msdmo.dll.so
@@ -750,9 +834,13 @@ lib/wine/mshtml.tlb.so
 lib/wine/msi.dll.so
 lib/wine/msiexec.exe.so
 lib/wine/msimg32.dll.so
+lib/wine/msimtf.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
+lib/wine/mssip32.dll.so
+lib/wine/msvcirt.dll.so
+lib/wine/msvcr71.dll.so
 lib/wine/msvcrt.dll.so
 lib/wine/msvcrt20.dll.so
 lib/wine/msvcrt40.dll.so
@@ -789,19 +877,25 @@ lib/wine/oledlg.dll.so
 lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll16
 lib/wine/olesvr32.dll.so
-${PLIST.opengl}lib/wine/opengl32.dll.so
+lib/wine/olethk32.dll.so
 lib/wine/oleview.exe.so
+${PLIST.opengl}lib/wine/opengl32.dll.so
 lib/wine/pdh.dll.so
 lib/wine/powrprof.dll.so
 lib/wine/printui.dll.so
 lib/wine/progman.exe.so
+lib/wine/propsys.dll.so
 lib/wine/psapi.dll.so
 lib/wine/pstorec.dll.so
 lib/wine/qcap.dll.so
+lib/wine/qedit.dll.so
+lib/wine/qmgr.dll.so
+lib/wine/qmgrprxy.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
+lib/wine/reg.exe.so
 lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
 lib/wine/resutils.dll.so
@@ -813,11 +907,14 @@ lib/wine/rsabase.dll.so
 lib/wine/rsaenh.dll.so
 lib/wine/rundll32.exe.so
 lib/wine/sane.ds.so
+lib/wine/sccbase.dll.so
 lib/wine/schannel.dll.so
+lib/wine/secedit.exe.so
 lib/wine/secur32.dll.so
 lib/wine/security.dll.so
 lib/wine/sensapi.dll.so
 lib/wine/serialui.dll.so
+lib/wine/services.exe.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll16
 lib/wine/sfc.dll.so
@@ -828,7 +925,10 @@ lib/wine/shell.dll16
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
+lib/wine/slbcsp.dll.so
+lib/wine/slc.dll.so
 lib/wine/snmpapi.dll.so
+lib/wine/softpub.dll.so
 lib/wine/sound.drv16
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
@@ -838,6 +938,7 @@ lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
+lib/wine/svchost.exe.so
 lib/wine/svrapi.dll.so
 lib/wine/sxs.dll.so
 lib/wine/system.drv16
@@ -895,15 +996,17 @@ lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv16
 lib/wine/winevdm.exe.so
-lib/wine/winex11.drv.so
+${PLIST.x11}lib/wine/winex11.drv.so
 lib/wine/wing.dll16
 lib/wine/wing32.dll.so
-lib/wine/winhelp.exe.so
+lib/wine/winhelp.exe16
+lib/wine/winhlp32.exe.so
 lib/wine/winhttp.dll.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll16
 lib/wine/winnls32.dll.so
+lib/wine/winoldap.mod16
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
@@ -912,6 +1015,7 @@ lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
 lib/wine/wldap32.dll.so
+lib/wine/wmi.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wordpad.exe.so
 lib/wine/wow32.dll.so
@@ -921,6 +1025,9 @@ lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
 lib/wine/xcopy.exe.so
+man/de.UTF-8/man1/wine.1
+man/fr.UTF-8/man1/wine.1
+man/fr.UTF-8/man1/wineserver.1
 man/man1/widl.1
 man/man1/wine.1
 man/man1/winebuild.1
@@ -935,51 +1042,57 @@ man/man1/wmc.1
 man/man1/wrc.1
 share/aclocal/wine.m4
 share/applications/wine.desktop
-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/jsmalle.fon
-share/wine/fonts/jvgasys.fon
-share/wine/fonts/marlett.ttf
-share/wine/fonts/smae1255.fon
-share/wine/fonts/smae1256.fon
-share/wine/fonts/smae1257.fon
-share/wine/fonts/smalle.fon
-share/wine/fonts/smallee.fon
-share/wine/fonts/smalleg.fon
-share/wine/fonts/smaller.fon
-share/wine/fonts/smallet.fon
-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
+${PLIST.x11}share/wine/fonts/coue1255.fon
+${PLIST.x11}share/wine/fonts/coue1256.fon
+${PLIST.x11}share/wine/fonts/coue1257.fon
+${PLIST.x11}share/wine/fonts/coure.fon
+${PLIST.x11}share/wine/fonts/couree.fon
+${PLIST.x11}share/wine/fonts/coureg.fon
+${PLIST.x11}share/wine/fonts/courer.fon
+${PLIST.x11}share/wine/fonts/couret.fon
+${PLIST.x11}share/wine/fonts/cvgasys.fon
+${PLIST.x11}share/wine/fonts/hvgasys.fon
+${PLIST.x11}share/wine/fonts/jsmalle.fon
+${PLIST.x11}share/wine/fonts/jvgasys.fon
+${PLIST.x11}share/wine/fonts/marlett.ttf
+${PLIST.x11}share/wine/fonts/smae1255.fon
+${PLIST.x11}share/wine/fonts/smae1256.fon
+${PLIST.x11}share/wine/fonts/smae1257.fon
+${PLIST.x11}share/wine/fonts/smalle.fon
+${PLIST.x11}share/wine/fonts/smallee.fon
+${PLIST.x11}share/wine/fonts/smalleg.fon
+${PLIST.x11}share/wine/fonts/smaller.fon
+${PLIST.x11}share/wine/fonts/smallet.fon
+${PLIST.x11}share/wine/fonts/ssee1255.fon
+${PLIST.x11}share/wine/fonts/ssee1256.fon
+${PLIST.x11}share/wine/fonts/ssee1257.fon
+${PLIST.x11}share/wine/fonts/ssee874.fon
+${PLIST.x11}share/wine/fonts/sserife.fon
+${PLIST.x11}share/wine/fonts/sserifee.fon
+${PLIST.x11}share/wine/fonts/sserifeg.fon
+${PLIST.x11}share/wine/fonts/sserifer.fon
+${PLIST.x11}share/wine/fonts/sserifet.fon
+${PLIST.x11}share/wine/fonts/svgasys.fon
+${PLIST.x11}share/wine/fonts/tahoma.ttf
+${PLIST.x11}share/wine/fonts/tahomabd.ttf
+${PLIST.x11}share/wine/fonts/vgas1255.fon
+${PLIST.x11}share/wine/fonts/vgas1256.fon
+${PLIST.x11}share/wine/fonts/vgas1257.fon
+${PLIST.x11}share/wine/fonts/vgas874.fon
+${PLIST.x11}share/wine/fonts/vgasys.fon
+${PLIST.x11}share/wine/fonts/vgasyse.fon
+${PLIST.x11}share/wine/fonts/vgasysg.fon
+${PLIST.x11}share/wine/fonts/vgasysr.fon
+${PLIST.x11}share/wine/fonts/vgasyst.fon
 share/wine/generic.ppd
 share/wine/wine.inf
-@dirrm share/wine/fonts
+${PLIST.x11}@dirrm share/wine/fonts
 @dirrm share/wine
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm man/fr.UTF-8/man1
+@dirrm man/fr.UTF-8
+@dirrm man/de.UTF-8/man1
+@dirrm man/de.UTF-8
 @dirrm lib/wine
 @dirrm include/wine/windows/ddk
 @dirrm include/wine/windows
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 38302c092bd..5068037dcb9 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.75 2008/01/09 17:46:41 reinoud Exp $
+$NetBSD: distinfo,v 1.76 2008/06/22 23:38:18 dholland Exp $
 
-SHA1 (wine-0.9.44.tar.bz2) = 77f820444198688085b3148ca0054bdf8aebf839
-RMD160 (wine-0.9.44.tar.bz2) = 4d726aea99b12ecf757785e22f531bb03a1a79b7
-Size (wine-0.9.44.tar.bz2) = 12377043 bytes
-SHA1 (patch-aa) = 3b84f2f7693b79ed5de432a6ab8faf4ec258f57a
+SHA1 (wine-1.0.tar.bz2) = 84150abdda18bc34b187335c6862718a6e08d255
+RMD160 (wine-1.0.tar.bz2) = 1dbfa38e54e7d6269ad4110f22b2791393fd3b59
+Size (wine-1.0.tar.bz2) = 13981030 bytes
+SHA1 (patch-aa) = 906623f16ac87380c63f0c8e80d6490142380566
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ac) = e28e9ea8563546a41672f16c8e111e5d37ffbe92
 SHA1 (patch-ad) = 978bdd94b75a2d671d5ed97d7664ff60488683cd
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
-SHA1 (patch-af) = ff365b8c6f60adfe0cc47113db53de1dd27bb064
+SHA1 (patch-af) = ab3cbc988619ea5f277b8677481742513351d989
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index 2321013e327..6b1298160c9 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,18 +1,64 @@
-# $NetBSD: options.mk,v 1.8 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: options.mk,v 1.9 2008/06/22 23:38:18 dholland Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=	cups opengl sane
-PKG_SUGGESTED_OPTIONS=	opengl
+PKG_SUPPORTED_OPTIONS=	cups opengl sane esound ldap dbus ssl x11
+PKG_SUGGESTED_OPTIONS=	opengl esound ldap dbus ssl x11
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		opengl
+PLIST_VARS+=		opengl x11
+
+.if !empty(PKG_OPTIONS:Mesound)
+.include "../../audio/esound/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-ldap
+.endif
+
+.if !empty(PKG_OPTIONS:Mdbus)
+.include "../../sysutils/dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mssl)
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-openssl
+.endif
 
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-cups
+.endif
+
+.if !empty(PKG_OPTIONS:Mx11)
+PLIST.x11=		yes
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/lcms/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXrandr/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --without-x11
 .endif
 
-.if !empty(PKG_OPTIONS:Mopengl)
+.if !empty(PKG_OPTIONS:Mopengl) && !empty(PKG_OPTIONS:Mx11)
 PLIST.opengl=		yes
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/glut/buildlink3.mk"
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 49360e39ad4..c91b16a24b6 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.28 2007/07/01 10:04:26 adam Exp $
+$NetBSD: patch-aa,v 1.29 2008/06/22 23:38:18 dholland Exp $
 
---- Make.rules.in.orig	2007-06-29 19:36:20.000000000 +0200
-+++ Make.rules.in
-@@ -119,7 +119,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)
+--- Make.rules.in.orig	2008-06-17 10:07:31.000000000 -0400
++++ Make.rules.in	2008-06-22 12:22:40.000000000 -0400
+@@ -120,7 +120,7 @@
+ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \
+                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc)
  
 -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)
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index d3ce5c2b078..39cf8aaa84d 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $
+$NetBSD: patch-af,v 1.24 2008/06/22 23:38:18 dholland Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2007-05-11 19:35:02.000000000 +0200
-+++ dlls/ntdll/signal_i386.c
-@@ -167,7 +167,7 @@ typedef struct trapframe SIGCONTEXT;
+--- dlls/ntdll/signal_i386.c.orig	2008-06-17 10:07:31.000000000 -0400
++++ dlls/ntdll/signal_i386.c	2008-06-22 13:19:30.000000000 -0400
+@@ -199,7 +199,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -290,6 +290,43 @@ typedef ucontext_t SIGCONTEXT;
+@@ -332,6 +332,39 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
@@ -29,33 +29,29 @@ $NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $
 +#define ESI_sig(context)	((context)->uc_mcontext.__gregs[_REG_ESI])
 +#define EDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDI])
 +#define EBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBP])
++#define ESP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
 +
 +#define CS_sig(context)		((context)->uc_mcontext.__gregs[_REG_CS])
 +#define DS_sig(context)		((context)->uc_mcontext.__gregs[_REG_DS])
 +#define ES_sig(context)		((context)->uc_mcontext.__gregs[_REG_ES])
++#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
 +#define FS_sig(context)		((context)->uc_mcontext.__gregs[_REG_FS])
 +#define GS_sig(context)		((context)->uc_mcontext.__gregs[_REG_GS])
-+#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
 +
 +#define EFL_sig(context)	((context)->uc_mcontext.__gregs[_REG_EFL])
-+
 +#define EIP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
-+#define ESP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
-+
 +#define TRAP_sig(context)	((context)->uc_mcontext.__gregs[_REG_TRAPNO])
 +#define ERROR_sig(context)	((context)->uc_mcontext.__gregs[_REG_ERR])
 +
-+#define FAULT_ADDRESS		(__siginfo->si_addr)
-+
-+#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
-+#define HANDLER_CONTEXT (__context)
++#define FPU_sig(context)     NULL
++#define FPUX_sig(context)    ((XMM_SAVE_AREA32 *)&((context)->uc_mcontext.__fpregs))
 +
 +#endif /* __NetBSD__ */
 +
  WINE_DEFAULT_DEBUG_CHANNEL(seh);
  
  typedef int (*wine_signal_handler)(unsigned int sig);
-@@ -322,8 +359,13 @@ enum i386_trap_code
+@@ -366,8 +399,13 @@ enum i386_trap_code
      TRAP_x86_PAGEFLT    = T_PAGEFLT,    /* Page fault */
      TRAP_x86_ARITHTRAP  = T_ARITHTRAP,  /* Floating point exception */
      TRAP_x86_ALIGNFLT   = T_ALIGNFLT,   /* Alignment check exception */
@@ -69,7 +65,7 @@ $NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $
  #else
      TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
      TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
-@@ -1385,7 +1427,11 @@ BOOL SIGNAL_Init(void)
+@@ -1561,7 +1599,11 @@ BOOL SIGNAL_Init(void)
  #endif  /* HAVE_SIGALTSTACK */
  
      sig_act.sa_mask = server_block_set;