Changes 1.1.16:

* Improved SANE scanner support.
* Support for digital CD audio playback.
* Improved cookies management in Wininet.
* Support for building stand-alone 16-bit modules.
* Many fixes to the regression tests on Windows.
* Various bug fixes.

6 files changed, 37 insertions, 34 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 2b6552cd1b4..c57f98badb7 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2009/02/19 19:26:17 adam Exp $
+# $NetBSD: Makefile,v 1.11 2009/02/28 15:30:13 adam Exp $
 
-DISTNAME=	wine-1.1.15
+DISTNAME=	wine-1.1.16
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine-devel/PLIST.common b/emulators/wine-devel/PLIST.common
index 2147e9ed3b8..f5ffa190edb 100644
--- a/emulators/wine-devel/PLIST.common
+++ b/emulators/wine-devel/PLIST.common
@@ -1,16 +1,13 @@
-@comment $NetBSD: PLIST.common,v 1.6 2009/02/19 19:26:17 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2009/02/28 15:30:13 adam Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/msiexec
 bin/notepad
-bin/progman
 bin/regedit
 bin/regsvr32
-bin/uninstaller
 bin/widl
 bin/wine
 bin/wineboot
-bin/winebrowser
 bin/winebuild
 bin/winecfg
 bin/wineconsole
@@ -129,7 +126,9 @@ include/wine/windows/cvconst.h
 include/wine/windows/d3d.h
 include/wine/windows/d3d10.h
 include/wine/windows/d3d10.idl
+include/wine/windows/d3d10effect.h
 include/wine/windows/d3d10misc.h
+include/wine/windows/d3d10shader.h
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
 include/wine/windows/d3d8types.h
@@ -408,6 +407,8 @@ include/wine/windows/optary.h
 include/wine/windows/optary.idl
 include/wine/windows/pdh.h
 include/wine/windows/pdhmsg.h
+include/wine/windows/perhist.h
+include/wine/windows/perhist.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
@@ -866,6 +867,7 @@ lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
 lib/wine/mciavi32.dll.so
 lib/wine/mcicda.dll.so
+lib/wine/mciqtz32.dll.so
 lib/wine/mciseq.dll.so
 lib/wine/mciwave.dll.so
 lib/wine/midimap.dll.so
@@ -1066,14 +1068,14 @@ lib/wine/winevdm.exe.so
 ${PLIST.x11}lib/wine/winex11.drv.so
 lib/wine/wing.dll16
 lib/wine/wing32.dll.so
-lib/wine/winhelp.exe16
+lib/wine/winhelp.exe16.so
 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/winoldap.mod16.so
 lib/wine/winscard.dll.so
 lib/wine/winsock.dll16
 lib/wine/winspool.drv.so
@@ -1145,6 +1147,7 @@ ${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/symbol.ttf
 ${PLIST.x11}share/wine/fonts/tahoma.ttf
 ${PLIST.x11}share/wine/fonts/tahomabd.ttf
 ${PLIST.x11}share/wine/fonts/vgas1255.fon
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index b1f4164d3c9..7222480ec95 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.8 2009/02/19 19:26:17 adam Exp $
+$NetBSD: distinfo,v 1.9 2009/02/28 15:30:13 adam Exp $
 
-SHA1 (wine-1.1.15.tar.bz2) = 99267058cf14d52b55c360d6e3af337d81695974
-RMD160 (wine-1.1.15.tar.bz2) = 5203e46e498ae064a07d5ebe83fcb5ded3bc422d
-Size (wine-1.1.15.tar.bz2) = 15057931 bytes
+SHA1 (wine-1.1.16.tar.bz2) = 02f3363de5a2476b513beca3da2bb42aeeff5218
+RMD160 (wine-1.1.16.tar.bz2) = 449baa620eea114d65a8a65d1f0e88d377b94615
+Size (wine-1.1.16.tar.bz2) = 15178491 bytes
 SHA1 (patch-aa) = 91e612766286d8bc05d419a3dfd0c1b8a1852a54
 SHA1 (patch-ab) = 90cb810b02d22f8e96389e6c1d4f230c11fb1d8c
 SHA1 (patch-ac) = 81816d4e04cfb13ce407355140d61135a1d494e6
-SHA1 (patch-ad) = e001fe447b64e73ee45be55f985044dd911ed196
+SHA1 (patch-ad) = 28eda8273241200e11ab8da945f0713c1cfb27ba
 SHA1 (patch-ae) = 23bd992e3b56e1838e27753d8cc48112d7de7bcb
-SHA1 (patch-af) = 51d4a4f90e8af30ec6449b7a0f390e6a826f2cfe
+SHA1 (patch-af) = f3577aa88f6594feb9a4819742a37b6d69d82cb5
 SHA1 (patch-ah) = 61520f1e238762496502b25ea257b98b01799124
 SHA1 (patch-ai) = 54453ed21f52d1da6a7f89bc437f7b318db5058f
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
 SHA1 (patch-ak) = ff41f617d2ae7bbff57af52dda85647bc4fba354
-SHA1 (patch-ba) = dbd8fd07ca75da9667b28fb7e6536f617b2f2745
+SHA1 (patch-ba) = 1f15a31a23e869cceb3e4038bb02275f2c5dee8c
 SHA1 (patch-bb) = 77cad41a7e8e34f12243e53f6c1cec998bedefda
 SHA1 (patch-bc) = bf8b1f4aed78de9326824e227df7831e5c8b4dc3
 SHA1 (patch-ca) = 90df667407765c473f1331ec8113088fdddc58e5
diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad
index 6c20daea61e..484f1f24f37 100644
--- a/emulators/wine-devel/patches/patch-ad
+++ b/emulators/wine-devel/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
+$NetBSD: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $
 
---- dlls/iphlpapi/ipstats.c.orig	2009-02-13 18:01:33.000000000 +0100
+--- dlls/iphlpapi/ipstats.c.orig	2009-02-27 23:21:46.000000000 +0100
 +++ dlls/iphlpapi/ipstats.c
-@@ -28,6 +28,10 @@
+@@ -27,6 +27,10 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
  #ifdef HAVE_ALIAS_H
  #include <alias.h>
  #endif
-@@ -286,7 +290,7 @@ DWORD getInterfaceStatsByName(const char
+@@ -287,7 +291,7 @@ DWORD getInterfaceStatsByName(const char
  
  DWORD getICMPStats(MIB_ICMP *stats)
  {
@@ -22,7 +22,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    size_t needed;
-@@ -483,7 +487,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
+@@ -484,7 +488,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
  
  DWORD getIPStats(PMIB_IPSTATS stats)
  {
@@ -31,7 +31,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    int ip_ttl, ip_forwarding;
-@@ -652,7 +656,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
+@@ -653,7 +657,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
  
  DWORD getTCPStats(MIB_TCPSTATS *stats)
  {
@@ -40,7 +40,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
  #ifndef TCPTV_MIN  /* got removed in Mac OS X for some reason */
  #define TCPTV_MIN 2
  #define TCPTV_REXMTMAX 128
-@@ -789,7 +793,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
+@@ -790,7 +794,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
  
  DWORD getUDPStats(MIB_UDPSTATS *stats)
  {
@@ -49,7 +49,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
    int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    struct udpstat udp_stat;
-@@ -1031,7 +1035,11 @@ DWORD getNumRoutes(void)
+@@ -1032,7 +1036,11 @@ DWORD getNumRoutes(void)
  
        /* Ignore all entries except for gateway routes which aren't
           multicast */
@@ -61,7 +61,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
           continue;
  
        RouteCount++;
-@@ -1107,8 +1115,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1108,8 +1116,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
            /* Ignore all entries except for gateway routes which aren't
               multicast */
@@ -74,7 +74,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
               continue;
  
            memset (&table->table[table->dwNumEntries], 0,
-@@ -1269,7 +1281,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -1270,7 +1282,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
  
  DWORD getNumArpEntries(void)
  {
@@ -83,7 +83,7 @@ $NetBSD: patch-ad,v 1.4 2009/02/19 19:26:17 adam Exp $
    int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
    DWORD arpEntries = 0;
-@@ -1325,7 +1337,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
+@@ -1326,7 +1338,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
      if (numEntries > 1)
        size += (numEntries - 1) * sizeof(MIB_IPNETROW);
      table = HeapAlloc(heap, flags, size);
diff --git a/emulators/wine-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af
index 32e7ef0e197..37b7a1a3baa 100644
--- a/emulators/wine-devel/patches/patch-af
+++ b/emulators/wine-devel/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2009/01/30 19:39:04 adam Exp $
+$NetBSD: patch-af,v 1.6 2009/02/28 15:30:13 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2009-01-30 17:54:01.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2009-02-27 23:21:46.000000000 +0100
 +++ dlls/ntdll/signal_i386.c
-@@ -402,8 +402,13 @@ enum i386_trap_code
+@@ -403,8 +403,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 */
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index ffb04d69d6d..cd4c9a07343 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,16 +1,16 @@
-$NetBSD: patch-ba,v 1.7 2009/02/19 19:26:17 adam Exp $
+$NetBSD: patch-ba,v 1.8 2009/02/28 15:30:13 adam Exp $
 
---- configure.orig	2009-02-13 18:01:33.000000000 +0100
+--- configure.orig	2009-02-27 23:21:46.000000000 +0100
 +++ configure
-@@ -3945,7 +3945,6 @@ TOOLSDIR=$wine_cv_toolsdir
+@@ -3947,7 +3947,6 @@ TOOLSDIR=$wine_cv_toolsdir
  
- if test -n "$host_alias"
+ if test -n "$host_alias" -a "$host_alias" != "$build_alias"
  then
 -    TARGETFLAGS="-b $host_alias $TARGETFLAGS"
  
  fi
  
-@@ -17911,6 +17910,11 @@ MAIN_BINARY="wine-pthread"
+@@ -17913,6 +17912,11 @@ MAIN_BINARY="wine-pthread"
  
          EXTRA_BINARIES="wine-pthread"
   ;;