Updated to wine-20030618

6 files changed, 95 insertions, 47 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 640629f3d18..363b361dfaf 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.41 2003/03/09 19:12:37 jschauma Exp $
+# $NetBSD: Makefile,v 1.42 2003/06/23 08:12:57 adam Exp $
 
-DISTNAME=		Wine-20030219
+DISTNAME=		Wine-20030618
 PKGNAME=		${DISTNAME:S/W/w/}
-PKGREVISION=		1
-WRKSRC= 		${WRKDIR}/wine-20030219
+WRKSRC= 		${WRKDIR}/${DISTNAME:tl}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
 
-MAINTAINER=		junyoung@netbsd.org
+MAINTAINER=		adam@netbsd.org
 HOMEPAGE=		http://www.winehq.com/
 COMMENT=		Free implementation of Windows on Unix (still alpha)
 
@@ -18,6 +17,7 @@ ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_GMAKE=		YES
+USE_LIBTOOL		=YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-curses
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 2dd98c09d51..2bea5f3a3ca 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/03/04 11:45:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2003/06/23 08:12:58 adam Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -10,6 +10,7 @@ bin/widl
 bin/wine
 bin/wineboot
 bin/winebuild
+bin/winecfg
 bin/wineclipsrv
 bin/wineconsole
 bin/winedbg
@@ -98,6 +99,7 @@ include/wine/windows/comcat.h
 include/wine/windows/commctrl.h
 include/wine/windows/commdlg.h
 include/wine/windows/compobj.h
+include/wine/windows/control.h
 include/wine/windows/cpl.h
 include/wine/windows/custcntl.h
 include/wine/windows/d3d.h
@@ -117,12 +119,22 @@ include/wine/windows/digitalv.h
 include/wine/windows/dinput.h
 include/wine/windows/dispdib.h
 include/wine/windows/dlgs.h
+include/wine/windows/dls1.h
+include/wine/windows/dmdls.h
+include/wine/windows/dmerror.h
 include/wine/windows/dmo.h
 include/wine/windows/dmoreg.h
 include/wine/windows/dmort.h
+include/wine/windows/dmplugin.h
+include/wine/windows/dmusbuff.h
+include/wine/windows/dmusicc.h
+include/wine/windows/dmusicf.h
+include/wine/windows/dmusici.h
+include/wine/windows/dmusics.h
 include/wine/windows/docobj.h
 include/wine/windows/dplay.h
 include/wine/windows/dplobby.h
+include/wine/windows/dsconf.h
 include/wine/windows/dsdriver.h
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
@@ -143,6 +155,10 @@ include/wine/windows/lmbrowsr.h
 include/wine/windows/lmcons.h
 include/wine/windows/lmerr.h
 include/wine/windows/lmwksta.h
+include/wine/windows/iphlpapi.h
+include/wine/windows/ipifcons.h
+include/wine/windows/iprtrmib.h
+include/wine/windows/iptypes.h
 include/wine/windows/lzexpand.h
 include/wine/windows/mapi.h
 include/wine/windows/mapicode.h
@@ -168,8 +184,10 @@ include/wine/windows/ntddstor.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntstatus.h
 include/wine/windows/oaidl.h
+include/wine/windows/oaidl.idl
 include/wine/windows/objbase.h
 include/wine/windows/objidl.h
+include/wine/windows/objidl.idl
 include/wine/windows/ocidl.h
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
@@ -206,10 +224,12 @@ include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
 include/wine/windows/storage.h
+include/wine/windows/strmif.h
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/tlhelp32.h
 include/wine/windows/unknwn.h
+include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
 include/wine/windows/uuids.h
 include/wine/windows/ver.h
@@ -247,12 +267,13 @@ include/wine/windows/ws2tcpip.h
 include/wine/windows/wshisotp.h
 include/wine/windows/wsipx.h
 include/wine/windows/wtypes.h
+include/wine/windows/wtypes.idl
 include/wine/windows/zmouse.h
 lib/libntdll.dll.so
 lib/libwine.so
-lib/libwine.so.1.0
+lib/libwine.so.1
 lib/libwine_unicode.so
-lib/libwine_unicode.so.1.0
+lib/libwine_unicode.so.1
 lib/libwine_uuid.a
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
@@ -285,6 +306,16 @@ lib/wine/dinput.dll.so
 lib/wine/dinput8.dll.so
 lib/wine/dispdib.dll.so
 lib/wine/display.dll.so
+lib/wine/dmband.dll.so
+lib/wine/dmcompos.dll.so
+lib/wine/dmime.dll.so
+lib/wine/dmloader.dll.so
+lib/wine/dmscript.dll.so
+lib/wine/dmstyle.dll.so
+lib/wine/dmsynth.dll.so
+lib/wine/dmusic.dll.so
+lib/wine/dmusic32.dll.so
+lib/wine/dpnhpast.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
 lib/wine/dsound.dll.so
@@ -298,6 +329,7 @@ lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
 lib/wine/imm.dll.so
 lib/wine/imm32.dll.so
+lib/wine/iphlpapi.dll.so
 lib/wine/joystick.drv.so
 lib/wine/kernel32.dll.so
 lib/wine/keyboard.dll.so
@@ -320,6 +352,16 @@ lib/wine/libddraw.def
 lib/wine/libdevenum.def
 lib/wine/libdinput.def
 lib/wine/libdinput8.def
+lib/wine/libdmband.def
+lib/wine/libdmcompos.def
+lib/wine/libdmime.def
+lib/wine/libdmloader.def
+lib/wine/libdmscript.def
+lib/wine/libdmstyle.def
+lib/wine/libdmsynth.def
+lib/wine/libdmusic.def
+lib/wine/libdmusic32.def
+lib/wine/libdpnhpast.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
 lib/wine/libdsound.def
@@ -328,6 +370,7 @@ lib/wine/libglu32.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
+lib/wine/libiphlpapi.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
@@ -339,6 +382,7 @@ lib/wine/libmsnet32.def
 lib/wine/libmsrle32.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
+lib/wine/libmsvcrtd.def
 lib/wine/libmsvfw32.def
 lib/wine/libnetapi32.def
 lib/wine/libntdll.def
@@ -409,6 +453,7 @@ lib/wine/msnet32.dll.so
 lib/wine/msrle32.dll.so
 lib/wine/msvcrt.dll.so
 lib/wine/msvcrt20.dll.so
+lib/wine/msvcrtd.dll.so
 lib/wine/msvfw32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/netapi32.dll.so
@@ -480,11 +525,13 @@ lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
 lib/wine/wineboot.exe.so
+lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
 lib/wine/winefile.exe.so
 lib/wine/winejack.drv.so
+lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
 lib/wine/winenas.drv.so
@@ -492,6 +539,7 @@ lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
 lib/wine/wineps16.drv.so
+lib/wine/winevdm.exe.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 84f0e1431a6..c301631b8df 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2003/03/04 11:45:59 wiz Exp $
+$NetBSD: distinfo,v 1.15 2003/06/23 08:12:58 adam Exp $
 
-SHA1 (Wine-20030219.tar.gz) = 682e20ab97b62809c5526cfbf708d22e30d29182
-Size (Wine-20030219.tar.gz) = 8314951 bytes
-SHA1 (patch-aa) = 3b903517cdde2dbe338bd41819de5a2787e5d0de
-SHA1 (patch-ab) = ad0dd7b9c9ca3a9c0d13c52b78c48b95d55c0513
-SHA1 (patch-ac) = a2555dca0eb87ebc63ba239428f030815ce97604
+SHA1 (Wine-20030618.tar.gz) = cd1b353938abff18f3da90419d4a52a6d0f1b4f9
+Size (Wine-20030618.tar.gz) = 8810341 bytes
+SHA1 (patch-aa) = c3eaf40c63a0986df2b1e026435deca7f4c1a7d0
+SHA1 (patch-ab) = 92f25e121fa6b9bb41c84e0af33b291fc5d9c7e4
+SHA1 (patch-ac) = 5960dbeccff696cdcc67edb9b7849226a4b510e5
+SHA1 (patch-ad) = 90f93650b47d8fdc6094a7c29c72e88fc0dca09e
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 190e851c869..6742c66f372 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/10/10 10:48:21 junyoung Exp $
+$NetBSD: patch-aa,v 1.8 2003/06/23 08:12:59 adam Exp $
 
---- Make.rules.in.orig	Wed Oct  2 11:34:09 2002
-+++ Make.rules.in	Thu Oct 10 19:01:06 2002
-@@ -26,7 +26,7 @@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@ $(EXTRACFLAGS)
- OPTIONS   = @OPTIONS@ -D_REENTRANT
--LIBS      = @LIBS@
-+LIBS      = @LIBS@ -lc
- YACC      = @YACC@
- LEX       = @LEX@
- LEXLIB    = @LEXLIB@
-@@ -98,7 +98,7 @@
+--- Make.rules.in.orig	2003-06-14 01:26:02.000000000 +0200
++++ Make.rules.in	2003-06-19 11:33:36.000000000 +0200
+@@ -102,7 +102,7 @@
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                    *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
  
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index aed9818ac40..462fe9d35b1 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2003/03/04 11:46:00 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2003/06/23 08:13:00 adam Exp $
 
---- dlls/ntdll/cdrom.c.orig	Wed Feb 19 23:08:50 2003
-+++ dlls/ntdll/cdrom.c
+--- dlls/ntdll/cdrom.c.orig	2003-04-02 02:59:12.000000000 +0200
++++ dlls/ntdll/cdrom.c	2003-05-30 14:47:32.000000000 +0200
 @@ -53,6 +53,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
@@ -19,13 +19,3 @@ $NetBSD: patch-ab,v 1.13 2003/03/04 11:46:00 wiz Exp $
  #endif
  #ifdef HAVE_LINUX_UCDROM_H
  # include <linux/ucdrom.h>
-@@ -286,7 +296,9 @@ static int CDROM_SyncCache(int dev)
-     toc->Length[0] = tsz >> 8;
-     toc->Length[1] = tsz;
-    
-+#if 0
-     TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
-+#endif
- 
-     for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
-     {
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index ed01ba4d2f0..374afbe2580 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
+$NetBSD: patch-ac,v 1.6 2003/06/23 08:13:00 adam Exp $
 
---- configure.orig	Tue Oct  8 11:03:41 2002
-+++ configure	Fri Oct 11 00:54:07 2002
-@@ -10982,7 +10982,7 @@
+--- configure.orig	2003-06-18 22:35:38.000000000 +0200
++++ configure	2003-06-19 11:34:00.000000000 +0200
+@@ -12230,7 +12230,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_X11" = "x"
    then
       ac_cv_lib_soname_X11="libX11.so"
-@@ -11048,7 +11048,7 @@
+@@ -12295,7 +12295,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_Xext" = "x"
    then
       ac_cv_lib_soname_Xext="libXext.so"
-@@ -11114,7 +11114,7 @@
+@@ -12360,7 +12360,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_Xrender" = "x"
    then
       ac_cv_lib_soname_Xrender="libXrender.so"
-@@ -11180,7 +11180,7 @@
+@@ -12425,7 +12425,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -38,3 +38,21 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_freetype" = "x"
    then
       ac_cv_lib_soname_freetype="libfreetype.so"
+@@ -14770,7 +14770,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  wine_cv_linux_gethostbyname_r_6=yes
++  wine_cv_linux_gethostbyname_r_6=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15656,7 +15656,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_member_siginfo_t_si_fd=yes
++  ac_cv_member_siginfo_t_si_fd=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5