Changes 20040309:

* Much improved winegcc tool, now used to build Wine itself.
* VxDs are now separate libraries for better modularity.
* Improvements and simplifications to the drive configuration.
* New setupapi INF script to create the initial registry.
* Many improvements to the various multimedia dlls.
* Lots of bug fixes.

5 files changed, 61 insertions, 37 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index a812aa3f88b..74cd13e5892 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.69 2004/02/23 23:54:39 abs Exp $
+# $NetBSD: Makefile,v 1.70 2004/03/12 11:13:48 adam Exp $
 #
 
-DISTNAME=	Wine-20040213
+DISTNAME=	Wine-20040309
 PKGNAME=	${DISTNAME:S/W/w/}
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \
@@ -21,9 +21,8 @@ CONFLICTS=	rewind-[0-9]*
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386 NetBSD-2*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD*-i386 Linux*-i386 SunOS*-i386
 
-BUILDLINK_DEPENDS.freetype2=	freetype>=2.1.4
 WRKSRC=		 	${WRKDIR}/${DISTNAME:S/W/w/}
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 USE_X11=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
@@ -46,27 +45,23 @@ LIBS+=			${LDFLAGS}
 .include "../../mk/bsd.prefs.mk"
 
 .if defined(USE_CUPS) && (${USE_CUPS} == YES)
-.  include "../../print/cups/buildlink2.mk"
+.  include "../../print/cups/buildlink3.mk"
 BUILD_DEFS+=		USE_CUPS
 .endif
 
-EGDIR=			${PREFIX}/share/examples/wine
+EGDIR=			${PREFIX}/share/wine
 
 post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${EGDIR}/winedefault.reg
-	cd ${WRKSRC}/documentation/samples &&				\
-	${INSTALL_DATA} config ${EGDIR}/wine.conf &&			\
-	${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd &&		\
-	${INSTALL_DATA} system.ini ${EGDIR}/system.ini &&		\
+	${INSTALL_DATA} ${WRKSRC}/documentation/samples/config ${EGDIR}/config
 	${RMDIR} ${PREFIX}/man/man3w
 
-.include "../../graphics/MesaLib/buildlink2.mk"
-.include "../../graphics/freetype2/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../graphics/glut/buildlink2.mk"
-.include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/libungif/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/glut/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/libungif/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 5bd0f513937..7998871e1d5 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2004/02/16 14:06:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2004/03/12 11:13:48 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -26,7 +26,6 @@ bin/winemine
 bin/winepath
 bin/wineserver
 bin/wineshelllink
-bin/winewrap
 bin/winhelp
 bin/wmc
 bin/wrc
@@ -69,9 +68,13 @@ include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/unicode.h
 include/wine/windows/accctrl.h
+include/wine/windows/amstream.h
+include/wine/windows/amstream.idl
 include/wine/windows/amvideo.h
 include/wine/windows/amvideo.idl
 include/wine/windows/audevcod.h
+include/wine/windows/austream.h
+include/wine/windows/austream.idl
 include/wine/windows/aviriff.h
 include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
@@ -104,6 +107,8 @@ include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddraw.h
 include/wine/windows/ddrawi.h
+include/wine/windows/ddstream.h
+include/wine/windows/ddstream.idl
 include/wine/windows/devenum.idl
 include/wine/windows/digitalv.h
 include/wine/windows/dinput.h
@@ -132,7 +137,10 @@ include/wine/windows/dsconf.h
 include/wine/windows/dsdriver.h
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
+include/wine/windows/dxerr8.h
+include/wine/windows/dxerr9.h
 include/wine/windows/dyngraph.idl
+include/wine/windows/evcode.h
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 include/wine/windows/exdisp.idl
@@ -155,6 +163,8 @@ include/wine/windows/lmapibuf.h
 include/wine/windows/lmbrowsr.h
 include/wine/windows/lmcons.h
 include/wine/windows/lmerr.h
+include/wine/windows/lmserver.h
+include/wine/windows/lmshare.h
 include/wine/windows/lmstats.h
 include/wine/windows/lmwksta.h
 include/wine/windows/lzexpand.h
@@ -168,6 +178,8 @@ include/wine/windows/mediaobj.h
 include/wine/windows/minmax.h
 include/wine/windows/mmddk.h
 include/wine/windows/mmreg.h
+include/wine/windows/mmstream.h
+include/wine/windows/mmstream.idl
 include/wine/windows/mmsystem.h
 include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
@@ -232,6 +244,7 @@ include/wine/windows/sipbase.h
 include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
+include/wine/windows/sspi.h
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
@@ -287,6 +300,7 @@ lib/libwine.so.1
 lib/libwine_unicode.so
 lib/libwine_unicode.so.1
 lib/wine/advapi32.dll.so
+lib/wine/amstream.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll.so
@@ -342,6 +356,7 @@ lib/wine/glut32.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
 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
@@ -352,6 +367,7 @@ lib/wine/kernel32.dll.so
 lib/wine/keyboard.drv.so
 lib/wine/krnl386.exe.so
 lib/wine/libadvapi32.def
+lib/wine/libamstream.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
@@ -386,6 +402,8 @@ lib/wine/libdplayx.def
 lib/wine/libdpnhpast.def
 lib/wine/libdsound.def
 lib/wine/libdswave.def
+lib/wine/libdxerr8.a
+lib/wine/libdxerr9.a
 lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libglu32.def
@@ -432,6 +450,7 @@ lib/wine/librasapi32.def
 lib/wine/libriched32.def
 lib/wine/librpcrt4.def
 lib/wine/librsabase.def
+lib/wine/libsecur32.def
 lib/wine/libserialui.def
 lib/wine/libsetupapi.def
 lib/wine/libshdocvw.def
@@ -474,7 +493,9 @@ lib/wine/mcicda.drv.so
 lib/wine/mciseq.drv.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.drv.so
+lib/wine/mmdevldr.vxd.so
 lib/wine/mmsystem.dll.so
+lib/wine/monodebg.vxd.so
 lib/wine/mouse.drv.so
 lib/wine/mpr.dll.so
 lib/wine/msacm.dll.so
@@ -531,6 +552,7 @@ lib/wine/rpcrt4.dll.so
 lib/wine/rpcss.exe.so
 lib/wine/rsabase.dll.so
 lib/wine/rundll32.exe.so
+lib/wine/secur32.dll.so
 lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll.so
@@ -558,8 +580,14 @@ lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
 lib/wine/uxtheme.dll.so
+lib/wine/vdhcp.vxd.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
+lib/wine/vmm.vxd.so
+lib/wine/vnbt.vxd.so
+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/wcmd.exe.so
@@ -607,18 +635,19 @@ lib/wine/wprocs.dll.so
 lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/x11drv.dll.so
+man/man1/widl.1
 man/man1/wine.1
 man/man1/winebuild.1
+man/man1/winedump.1
 man/man1/winemaker.1
 man/man1/wmc.1
 man/man1/wrc.1
 man/man5/wine.conf.5
 share/aclocal/wine.m4
-share/examples/wine/generic.ppd
-share/examples/wine/system.ini
-share/examples/wine/wine.conf
-share/examples/wine/winedefault.reg
-@dirrm share/examples/wine
+share/wine/config
+share/wine/generic.ppd
+share/wine/wine.inf
+@dirrm share/wine
 @dirrm lib/wine
 @dirrm include/wine/windows
 @dirrm include/wine/msvcrt/sys
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 762c77c4645..ab4c2f46788 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2004/02/16 14:06:58 adam Exp $
+$NetBSD: distinfo,v 1.23 2004/03/12 11:13:48 adam Exp $
 
-SHA1 (Wine-20040213.tar.gz) = b3c4b778cb4fa54bb0bc27f08ee8494b3b2b66eb
-Size (Wine-20040213.tar.gz) = 9933262 bytes
-SHA1 (patch-aa) = 1b3867d550221956bb4058b6b8b3a79c7f451d6f
+SHA1 (Wine-20040309.tar.gz) = a6125bc2127898f5add300a017698d2ced52299a
+Size (Wine-20040309.tar.gz) = 10060696 bytes
+SHA1 (patch-aa) = 5bb5b286cb43794e945c637afe03012a339db946
 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
-SHA1 (patch-ac) = faaeb3a07135d7c0ecd4c884006e3f0526747376
+SHA1 (patch-ac) = 7f63d8e6b763b8d8ec451fa28ad2acafa440b77a
 SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6
 SHA1 (patch-ae) = 691113bab9f24bcbabd786e7f1ff2fe0933d721f
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index a6f98b0a18e..f0d97af04d0 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/02/16 14:06:58 adam Exp $
+$NetBSD: patch-aa,v 1.12 2004/03/12 11:13:48 adam Exp $
 
---- Make.rules.in.orig	2004-01-27 00:11:18.000000000 +0000
+--- Make.rules.in.orig	2004-03-03 20:30:46.000000000 +0000
 +++ Make.rules.in
-@@ -104,7 +104,7 @@ conf_manext     = 5
+@@ -105,7 +105,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                    *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
  
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 77cf5bcd0fd..324db20f9a3 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.12 2004/02/16 14:06:58 adam Exp $
+$NetBSD: patch-ac,v 1.13 2004/03/12 11:13:48 adam Exp $
 
---- configure.orig	2004-02-13 23:41:13.000000000 +0000
+--- configure.orig	2004-03-10 03:37:58.000000000 +0000
 +++ configure
-@@ -17598,7 +17598,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17894,7 +17894,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.12 2004/02/16 14:06:58 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18605,7 +18605,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19564,7 +19564,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then