Changes Wine-20031118:

- Many printing improvements.
- Run-time detection of NPTL threading.
- Lots of code merges from Crossover Office 2.1.
- Some reorganization of the source tree.
- Lots of bug fixes.

5 files changed, 24 insertions, 31 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 3958ef3f1e4..c7c3cb8816e 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2003/11/30 22:58:41 jschauma Exp $
+# $NetBSD: Makefile,v 1.55 2003/12/01 15:59:50 adam Exp $
 
-DISTNAME=		Wine-20031016
+DISTNAME=		Wine-20031118
 PKGNAME=		${DISTNAME:S/W/w/}
-PKGREVISION=		1
 WRKSRC= 		${WRKDIR}/${DISTNAME:S/W/w/}
 CATEGORIES=		emulators
 MASTER_SITES=		http://www.ibiblio.org/Linux/ALPHA/wine/development/ \
@@ -25,7 +24,7 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 YACC=			${PREFIX}/bin/bison -y
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--without-curses #--without-opengl
+CONFIGURE_ARGS+=	--without-curses #--disable-debug --disable-trace
 CONFIGURE_ENV+=		ac_cv_path_ARTSCCONFIG=${TRUE}
 CONFIGURE_ENV+=		ac_cv_prog_sane_devel=no
 
@@ -54,7 +53,6 @@ post-install:
 	${INSTALL_DATA} config ${EGDIR}/wine.conf &&			\
 	${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd &&		\
 	${INSTALL_DATA} system.ini ${EGDIR}/system.ini &&		\
-#	${INSTALL_DATA} win.ini ${EGDIR}/win.ini
 	${RMDIR} ${PREFIX}/man/man3w
 
 .include "../../graphics/MesaLib/buildlink2.mk"
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index c4c1a77d74e..28b7b0bb171 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2003/10/26 09:59:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.18 2003/12/01 15:59:50 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -68,7 +68,10 @@ include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/unicode.h
 include/wine/windows/accctrl.h
+include/wine/windows/amvideo.h
+include/wine/windows/amvideo.idl
 include/wine/windows/audevcod.h
+include/wine/windows/aviriff.h
 include/wine/windows/axcore.idl
 include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
@@ -137,7 +140,6 @@ include/wine/windows/icmpapi.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
 include/wine/windows/initguid.h
-include/wine/windows/instance.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
 include/wine/windows/ipifcons.h
@@ -209,6 +211,7 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/sddl.h
 include/wine/windows/servprov.h
 include/wine/windows/servprov.idl
 include/wine/windows/setupapi.h
@@ -286,12 +289,14 @@ lib/wine/avifile.dll.so
 lib/wine/aviinfo.exe.so
 lib/wine/aviplay.exe.so
 lib/wine/cabinet.dll.so
+lib/wine/capi2032.dll.so
+lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
 lib/wine/commdlg.dll.so
-lib/wine/comm.drv.so 
+lib/wine/comm.drv.so
 lib/wine/compobj.dll.so
 lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
@@ -310,7 +315,7 @@ 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/display.drv.so
 lib/wine/dmband.dll.so
 lib/wine/dmcompos.dll.so
 lib/wine/dmime.dll.so
@@ -343,6 +348,8 @@ lib/wine/libadvapi32.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
 lib/wine/libcabinet.def
+lib/wine/libcapi2032.def
+lib/wine/libcfgmgr32.def
 lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
@@ -427,6 +434,7 @@ lib/wine/libuser32.def
 lib/wine/libuxtheme.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
+lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwineps.def
 lib/wine/libwininet.def
@@ -543,6 +551,7 @@ lib/wine/wineaudioio.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
+lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
 lib/wine/winefile.exe.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index cd3ef5ca69d..56e9b6f3947 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2003/10/17 13:54:18 adam Exp $
+$NetBSD: distinfo,v 1.19 2003/12/01 15:59:50 adam Exp $
 
-SHA1 (Wine-20031016.tar.gz) = 5ce9e4ee45adff54df1dc8b5a73b940ece96f96b
-Size (Wine-20031016.tar.gz) = 9452596 bytes
+SHA1 (Wine-20031118.tar.gz) = b9463f02a45c547300b51bba5de05b9d8f3d94c7
+Size (Wine-20031118.tar.gz) = 9539006 bytes
 SHA1 (patch-aa) = 27f2fa6bf9825ce17fb8723c7cf3fbc0dd0ac7b3
 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed
-SHA1 (patch-ac) = c69e31c356a47b31ab5c0fa877213956b24846da
+SHA1 (patch-ac) = 673842c2f071be15916a8aebf2c449ce4216d8ea
 SHA1 (patch-ad) = 437b44a5682a24b8b9bcdcffedaa8266e79ee2b7
-SHA1 (patch-ae) = 00d8f780c51df22af7aac147e80979c258b01a3e
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 6bba2bf55fb..a9c6af465cf 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2003/10/17 13:54:18 adam Exp $
+$NetBSD: patch-ac,v 1.9 2003/12/01 15:59:50 adam Exp $
 
---- configure.orig	2003-10-17 00:46:13.000000000 +0200
+--- configure.orig	2003-11-19 05:00:07.000000000 +0100
 +++ configure
-@@ -15186,7 +15186,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -15801,7 +15801,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.8 2003/10/17 13:54:18 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -16072,7 +16072,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -16687,7 +16687,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-ae b/emulators/wine/patches/patch-ae
deleted file mode 100644
index 47d486638fb..00000000000
--- a/emulators/wine/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2003/09/15 10:52:26 adam Exp $
-
---- scheduler/pthread.c.orig	2003-09-15 11:23:23.000000000 +0200
-+++ scheduler/pthread.c
-@@ -81,6 +81,8 @@ struct pthread_descr_struct
-     const void        *tsd_data[MAX_TSD];   /* for libc internal tsd variables */
- };
- 
-+struct __res_state *__res_state(void);
-+
- typedef struct pthread_descr_struct *pthread_descr;
- 
- static struct pthread_descr_struct initial_descr;