From 9df1111e471b34110848fc316d1b12a6e84e2173 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 22 Jan 2004 15:46:43 +0000 Subject: Changes 20040121: - Many improvements in the shell32 dll. - Better support for constructors in C++ Winelib apps. - Improved Regedit tool. - Full support for graphic tablets. - Lots of DirectMusic improvements. - Better support for video playback. - Full IME support for Asian locales. - Lots of bug fixes. Pkgsrc: wine does not seem to need unlimited data size (in fact, I tried smaller limit then the default and it worked), so MESSAGE removed. --- emulators/wine/MESSAGE | 8 -------- emulators/wine/Makefile | 12 ++++-------- emulators/wine/PLIST | 16 +++++++++++++++- emulators/wine/distinfo | 9 ++++----- emulators/wine/patches/patch-ac | 8 ++++---- emulators/wine/patches/patch-ae | 14 -------------- 6 files changed, 27 insertions(+), 40 deletions(-) delete mode 100644 emulators/wine/MESSAGE delete mode 100644 emulators/wine/patches/patch-ae (limited to 'emulators') diff --git a/emulators/wine/MESSAGE b/emulators/wine/MESSAGE deleted file mode 100644 index 48fc6bb0f3c..00000000000 --- a/emulators/wine/MESSAGE +++ /dev/null @@ -1,8 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/01/17 15:21:22 wiz Exp $ - -wine needs the data segment size limit set to over 265000, e.g. by - ulimit -d 265000 -in ksh or bash. Otherwise, you'll get an out of memory error. - -=========================================================================== diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 945a879645c..1e0dece41d5 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.65 2004/01/22 08:36:04 grant Exp $ +# $NetBSD: Makefile,v 1.66 2004/01/22 15:46:43 adam Exp $ # -DISTNAME= Wine-20031212 +DISTNAME= Wine-20040121 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/ \ +MASTER_SITES= http://www.ibiblio.org/pub/Linux/ALPHA/wine/development/ \ ${MASTER_SITE_SOURCEFORGE:=wine/} \ ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} @@ -24,7 +24,6 @@ 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_X11= YES USE_GNU_TOOLS+= make @@ -35,8 +34,6 @@ CONFIGURE_ARGS+= --without-curses #--disable-debug --disable-trace CONFIGURE_ENV+= ac_cv_path_ARTSCCONFIG=${TRUE} CONFIGURE_ENV+= ac_cv_prog_sane_devel=no -UNLIMIT_RESOURCES= datasize - REPLACE_PERL= tools/winemaker tools/winedump/function_grep.pl # The Wine configure script has problems locating the libraries in the @@ -70,7 +67,6 @@ post-install: .include "../../graphics/glut/buildlink2.mk" .include "../../graphics/jpeg/buildlink2.mk" .include "../../graphics/libungif/buildlink2.mk" -.include "../../textproc/icu/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index ba364444fe7..e2ad6ea4d59 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.21 2004/01/17 15:22:22 wiz Exp $ +@comment $NetBSD: PLIST,v 1.22 2004/01/22 15:46:43 adam Exp $ bin/function_grep.pl bin/notepad bin/progman @@ -9,6 +9,7 @@ bin/wcmd bin/widl bin/wine bin/wineboot +bin/winebrowser bin/winebuild bin/winecfg bin/wineclipsrv @@ -98,6 +99,7 @@ include/wine/windows/d3dtypes.h include/wine/windows/d3dvec.inl include/wine/windows/d3dx8core.h include/wine/windows/dbghelp.h +include/wine/windows/dbt.h include/wine/windows/dde.h include/wine/windows/ddeml.h include/wine/windows/ddraw.h @@ -108,6 +110,7 @@ include/wine/windows/dinput.h include/wine/windows/dispdib.h include/wine/windows/dlgs.h include/wine/windows/dls1.h +include/wine/windows/dls2.h include/wine/windows/dmdls.h include/wine/windows/dmerror.h include/wine/windows/dmo.h @@ -136,6 +139,7 @@ include/wine/windows/exdisp.idl include/wine/windows/fci.h include/wine/windows/fdi.h include/wine/windows/guiddef.h +include/wine/windows/icm.h include/wine/windows/icmpapi.h include/wine/windows/imagehlp.h include/wine/windows/imm.h @@ -167,6 +171,7 @@ include/wine/windows/mmreg.h include/wine/windows/mmsystem.h include/wine/windows/msacm.h include/wine/windows/msacmdlg.h +include/wine/windows/msacmdrv.h include/wine/windows/msi.h include/wine/windows/msiquery.h include/wine/windows/mssip.h @@ -329,11 +334,13 @@ lib/wine/dplay.dll.so lib/wine/dplayx.dll.so lib/wine/dpnhpast.dll.so lib/wine/dsound.dll.so +lib/wine/dswave.dll.so lib/wine/expand.exe.so lib/wine/gdi.exe.so lib/wine/gdi32.dll.so lib/wine/glu32.dll.so lib/wine/glut32.dll.so +lib/wine/iccvid.dll.so lib/wine/icinfo.exe.so lib/wine/icmp.dll.so lib/wine/imaadp32.acm.so @@ -379,9 +386,11 @@ lib/wine/libdplay.def lib/wine/libdplayx.def lib/wine/libdpnhpast.def lib/wine/libdsound.def +lib/wine/libdswave.def lib/wine/libgdi32.def lib/wine/libglu32.def lib/wine/libglut32.def +lib/wine/libiccvid.def lib/wine/libicmp.def lib/wine/libimagehlp.def lib/wine/libimm32.def @@ -399,10 +408,12 @@ lib/wine/libmsnet32.def lib/wine/libmsrle32.def lib/wine/libmsvcrt.def lib/wine/libmsvcrt20.def +lib/wine/libmsvcrt40.def lib/wine/libmsvcrtd.def lib/wine/libmsvfw32.def lib/wine/libmswsock.def lib/wine/libnetapi32.def +lib/wine/libnewdev.def lib/wine/libntdll.def lib/wine/libodbc32.def lib/wine/libole32.def @@ -477,11 +488,13 @@ lib/wine/msnet32.dll.so lib/wine/msrle32.dll.so lib/wine/msvcrt.dll.so lib/wine/msvcrt20.dll.so +lib/wine/msvcrt40.dll.so lib/wine/msvcrtd.dll.so lib/wine/msvfw32.dll.so lib/wine/msvideo.dll.so lib/wine/mswsock.dll.so lib/wine/netapi32.dll.so +lib/wine/newdev.dll.so lib/wine/notepad.exe.so lib/wine/ntdll.dll.so lib/wine/odbc32.dll.so @@ -553,6 +566,7 @@ lib/wine/winealsa.drv.so lib/wine/winearts.drv.so lib/wine/wineaudioio.drv.so lib/wine/wineboot.exe.so +lib/wine/winebrowser.exe.so lib/wine/winecfg.exe.so lib/wine/wineconsole.exe.so lib/wine/wined3d.dll.so diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 6cd79f3b6b9..07f058a0511 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.20 2003/12/16 11:10:47 adam Exp $ +$NetBSD: distinfo,v 1.21 2004/01/22 15:46:43 adam Exp $ -SHA1 (Wine-20031212.tar.gz) = a385d3571e6da54435842c335eef8a7a90f4e5ed -Size (Wine-20031212.tar.gz) = 9691334 bytes +SHA1 (Wine-20040121.tar.gz) = 442c6f1997f3206502f3a4883ce3fa6ceab20aab +Size (Wine-20040121.tar.gz) = 9865181 bytes SHA1 (patch-aa) = 27f2fa6bf9825ce17fb8723c7cf3fbc0dd0ac7b3 SHA1 (patch-ab) = 313180ea924c224ebecad0b8764584230497f8ed -SHA1 (patch-ac) = 94d9f08fe255a67c1a6ed67819b1ce5cbf178f7c +SHA1 (patch-ac) = f24e5e01cb6e96cad463c3e63ff82fd25ed1c66d SHA1 (patch-ad) = 28c15181eab48f1e82d10046b77fa1ebac3c4ef6 -SHA1 (patch-ae) = 770a4267a3593d28444ab48b0a285defa3dfeecb diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac index 7bc9e6af198..6a0772034e1 100644 --- a/emulators/wine/patches/patch-ac +++ b/emulators/wine/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.10 2003/12/16 11:10:47 adam Exp $ +$NetBSD: patch-ac,v 1.11 2004/01/22 15:46:43 adam Exp $ ---- configure.orig 2003-12-13 03:51:20.000000000 +0000 +--- configure.orig 2004-01-22 01:02:29.000000000 +0000 +++ configure -@@ -15905,7 +15905,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -17544,7 +17544,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.10 2003/12/16 11:10:47 adam Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -16791,7 +16791,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -18551,7 +18551,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 4706cc4cc11..00000000000 --- a/emulators/wine/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2003/12/16 11:10:47 adam Exp $ - ---- dlls/netapi32/nbt.c.orig 2003-12-15 16:32:57.000000000 +0000 -+++ dlls/netapi32/nbt.c -@@ -72,8 +72,8 @@ - #include "winbase.h" - #include "wine/debug.h" - #include "winreg.h" --#include "iphlpapi.h" - #include "winsock2.h" -+#include "iphlpapi.h" - #include "netbios.h" - #include "nbnamecache.h" - -- cgit v1.2.3