Changes 0.9.13:

- New GPhoto backend for TWAIN.
- Dynamic drive configuration using HAL.
- A gazillion Direct3D fixes.
- New TCP transport for RPC.
- Lots of bug fixes.

6 files changed, 27 insertions, 21 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 080d7232d35..150bcddc48b 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.104 2006/04/14 09:06:49 adam Exp $
+# $NetBSD: Makefile,v 1.105 2006/05/12 20:53:36 adam Exp $
 
-DISTNAME=	wine-0.9.12
+DISTNAME=	wine-0.9.13
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
 		http://ibiblio.org/pub/linux/system/emulators/wine/
@@ -17,6 +17,7 @@ ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/W/w/}
 USE_DIRS+=		xdg-1.1
+USE_LANGUAGES=		c
 USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison gmake mktemp
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index cde52ca329f..5a7fe719199 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.42 2006/04/14 09:06:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.43 2006/05/12 20:53:36 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -237,6 +237,7 @@ include/wine/windows/mmreg.h
 include/wine/windows/mmstream.h
 include/wine/windows/mmstream.idl
 include/wine/windows/mmsystem.h
+include/wine/windows/mprapi.h
 include/wine/windows/msacm.h
 include/wine/windows/msacmdlg.h
 include/wine/windows/msacmdrv.h
@@ -348,6 +349,7 @@ include/wine/windows/tchar.h
 include/wine/windows/textserv.h
 include/wine/windows/tlhelp32.h
 include/wine/windows/tmschema.h
+include/wine/windows/twain.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
 include/wine/windows/urlmon.h
@@ -475,6 +477,7 @@ lib/wine/gdi.exe16
 lib/wine/gdi32.dll.so
 ${WINE_OPENGL}lib/wine/glu32.dll.so
 ${WINE_OPENGL}lib/wine/glut32.dll.so
+lib/wine/gphoto2.ds.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
 lib/wine/iccvid.dll.so
@@ -541,6 +544,7 @@ lib/wine/liblz32.def
 lib/wine/libmapi32.def
 lib/wine/libmlang.def
 lib/wine/libmpr.def
+lib/wine/libmprapi.def
 lib/wine/libmsacm32.def
 lib/wine/libmscms.def
 lib/wine/libmsdmo.def
@@ -616,7 +620,7 @@ lib/wine/mapi32.dll.so
 lib/wine/mciavi32.dll.so
 lib/wine/mcicda.dll.so
 lib/wine/mciseq.dll.so
-lib/wine/mciwave.drv.so
+lib/wine/mciwave.dll.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
 lib/wine/mmdevldr.vxd.so
@@ -624,9 +628,10 @@ lib/wine/mmsystem.dll16
 lib/wine/monodebg.vxd.so
 lib/wine/mouse.drv16
 lib/wine/mpr.dll.so
+lib/wine/mprapi.dll.so
 lib/wine/msacm.dll16
-lib/wine/msacm.drv.so
 lib/wine/msacm32.dll.so
+lib/wine/msacm32.drv.so
 lib/wine/msadp32.acm.so
 lib/wine/mscms.dll.so
 lib/wine/msdmo.dll.so
@@ -687,6 +692,7 @@ lib/wine/rpcss.exe.so
 lib/wine/rsabase.dll.so
 lib/wine/rsaenh.dll.so
 lib/wine/rundll32.exe.so
+lib/wine/sane.ds.so
 lib/wine/secur32.dll.so
 lib/wine/security.dll.so
 lib/wine/sensapi.dll.so
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index 22891236b27..e638b5d2b34 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2006/04/06 06:21:59 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2006/05/12 20:53:36 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
 BUILDLINK_PACKAGES+=	wine
 
 .if !empty(WINE_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.wine+=	wine>=0.9nb1
-BUILDLINK_ABI_DEPENDS.wine?=	wine>=0.9.6nb1
+BUILDLINK_ABI_DEPENDS.wine+=	wine>=0.9.6nb1
 BUILDLINK_PKGSRCDIR.wine?=	../../emulators/wine
 .endif	# WINE_BUILDLINK3_MK
 
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index c54e24019ee..0bbe4f55893 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.44 2006/04/14 09:06:49 adam Exp $
+$NetBSD: distinfo,v 1.45 2006/05/12 20:53:36 adam Exp $
 
-SHA1 (wine-0.9.12.tar.bz2) = fc1b6902b8a6ba94c14317873ffb9cafd9e79c9d
-RMD160 (wine-0.9.12.tar.bz2) = 0fd46a2e4c3df5d379324eb991429d5c03566a44
-Size (wine-0.9.12.tar.bz2) = 10726811 bytes
+SHA1 (wine-0.9.13.tar.bz2) = 955ef5dff9310769a8fcdf10fd5658e9110539d3
+RMD160 (wine-0.9.13.tar.bz2) = 320a2b0e46f2b39fe3c2b460d78d4cd04a7ce45c
+Size (wine-0.9.13.tar.bz2) = 10823249 bytes
 SHA1 (patch-aa) = 52b95bbc7ac3e2181963836c80c959be4e134a05
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 70b73319b201ace9b1718e06069b667cb645e8b8
+SHA1 (patch-ac) = 8ce71679b7aa96961c72cf5627766c877f61be0a
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
 SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
-SHA1 (patch-ak) = ba724d106a8bd5c47a6f100680f49655827a3f52
+SHA1 (patch-ak) = e42edb9973240dd0193702112f15de372fdb0f0b
 SHA1 (patch-al) = e778c70a4cc79577a0427d1c253ac4477a27d803
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index d9341c88924..7b98b5a2d71 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.27 2006/04/14 09:06:49 adam Exp $
+$NetBSD: patch-ac,v 1.28 2006/05/12 20:53:37 adam Exp $
 
---- configure.orig	2006-04-13 13:17:07.000000000 +0200
+--- configure.orig	2006-05-11 18:01:56.000000000 +0200
 +++ configure
-@@ -16606,7 +16606,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -17347,7 +17347,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.27 2006/04/14 09:06:49 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -18303,7 +18303,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -19044,7 +19044,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-ak b/emulators/wine/patches/patch-ak
index 1f82881829a..12dbc6369c2 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.5 2006/02/26 07:48:11 wiz Exp $
+$NetBSD: patch-ak,v 1.6 2006/05/12 20:53:37 adam Exp $
 
---- dlls/ntdll/file.c.orig	2006-02-15 17:02:43.000000000 +0100
+--- dlls/ntdll/file.c.orig	2006-05-11 18:02:02.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1592,6 +1592,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+@@ -1599,6 +1599,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }