>Number:         17661
>Category:       pkg
>Synopsis:       Wine update to 20020710
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Jul 20 05:32:00 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6_BETA4
>Organization:
	
>Environment:
	
	
System: NetBSD zunpc 1.6_BETA4 NetBSD 1.6_BETA4 (ZUNPC) #1: Sat Jul 6 01:47:43 CEST 2002 zuntum@zunpc:/usr/cvs/src/sys/arch/i386/compile/ZUNPC i386
Architecture: i386
Machine: i386
>Description:
	emulators/wine version 20020411 refused to run my polish-english dictionary executable
	properly. I have updated the wine package to 20020710 version and the problem disappeared.

	XXX: I am not sure whether patches/patch-ab attached here is entirely correct.
	I was getting some "NGROUP undeclared" errors, and the patch seems to fix those.

	I also get the following message when I run wine:

	>Wine cannot find the FreeType font library.  To enable Wine to
	>use TrueType fonts please install a version of FreeType greater than
	>or equal to 2.0.5.
	>http://www.freetype.org

	I think I *do* have freetype (it is included in XFree86 4.x, is it not),
	and the proper buildlink.mk *is* mentioned at the beginning of the build proccess.
	No idea.

	If you think the update is okay, please commit it yourself. Yep, I know we're in the freeze,
	but it makes significant improvement at least for me.

? patches/patch-ab
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/wine/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	2002/04/20 08:20:16	1.27
+++ Makefile	2002/07/20 12:24:16
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.27 2002/04/20 08:20:16 rh Exp $
 
-DISTNAME=		Wine-20020411
+DISTNAME=		Wine-20020710
 PKGNAME=		${DISTNAME:S/W/w/}
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/wine/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- PLIST	2002/04/20 08:20:16	1.3
+++ PLIST	2002/07/20 12:24:16
@@ -1,22 +1,27 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/20 08:20:16 rh Exp $
-bin/fnt2bdf
+@comment $NetBSD$
 bin/function_grep.pl
+bin/notepad
+bin/progman
+bin/regedit
+bin/regsvr32
+bin/uninstaller
+bin/wcmd
 bin/wine
 bin/winebuild
 bin/wineclipsrv
 bin/wineconsole
-bin/wineconsole.so
 bin/winedbg
-bin/winedbg.so
 bin/winedump
+bin/winefile
 bin/winelauncher
 bin/winemaker
+bin/winemine
+bin/winepath
 bin/wineserver
 bin/wineshelllink
+bin/winhelp
 bin/wmc
 bin/wrc
-include/wine/amaudio.h
-include/wine/amvideo.h
 include/wine/audevcod.h
 include/wine/basetsd.h
 include/wine/cderr.h
@@ -25,7 +30,6 @@
 include/wine/commctrl.h
 include/wine/commdlg.h
 include/wine/compobj.h
-include/wine/control.h
 include/wine/cpl.h
 include/wine/d3d.h
 include/wine/d3dcaps.h
@@ -46,9 +50,6 @@
 include/wine/dplobby.h
 include/wine/dshow.h
 include/wine/dsound.h
-include/wine/dvdmedia.h
-include/wine/errors.h
-include/wine/evcode.h
 include/wine/guiddef.h
 include/wine/imagehlp.h
 include/wine/imm.h
@@ -97,6 +98,7 @@
 include/wine/msvcrt/time.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
+include/wine/mswsock.h
 include/wine/nb30.h
 include/wine/nspapi.h
 include/wine/ntsecapi.h
@@ -136,7 +138,6 @@
 include/wine/sqlext.h
 include/wine/sqltypes.h
 include/wine/storage.h
-include/wine/strmif.h
 include/wine/tapi.h
 include/wine/tlhelp32.h
 include/wine/unknwn.h
@@ -160,6 +161,7 @@
 include/wine/wine/obj_cache.h
 include/wine/wine/obj_channel.h
 include/wine/wine/obj_clientserver.h
+include/wine/wine/obj_comcat.h
 include/wine/wine/obj_commdlgbrowser.h
 include/wine/wine/obj_connection.h
 include/wine/wine/obj_contextmenu.h
@@ -167,11 +169,11 @@
 include/wine/wine/obj_dataobject.h
 include/wine/wine/obj_dockingwindowframe.h
 include/wine/wine/obj_dragdrop.h
+include/wine/wine/obj_enumguid.h
 include/wine/wine/obj_enumidlist.h
 include/wine/wine/obj_errorinfo.h
 include/wine/wine/obj_extracticon.h
 include/wine/wine/obj_inplace.h
-include/wine/wine/obj_ksproperty.h
 include/wine/wine/obj_marshal.h
 include/wine/wine/obj_misc.h
 include/wine/wine/obj_moniker.h
@@ -228,32 +230,40 @@
 lib/libwine_unicode.so
 lib/libwine_unicode.so.1.0
 lib/libwine_uuid.a
-lib/libwinspool.drv.so
-lib/libx11drv.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/avicap32.dll.so
 lib/wine/avifil32.dll.so
 lib/wine/avifile.dll.so
+lib/wine/aviinfo.exe.so
+lib/wine/aviplay.exe.so
+lib/wine/clock.exe.so
+lib/wine/cmdlgtst.exe.so
+lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
 lib/wine/comm.dll.so
 lib/wine/commdlg.dll.so
 lib/wine/compobj.dll.so
+lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
+lib/wine/d3d8.dll.so
 lib/wine/dciman32.dll.so
 lib/wine/ddeml.dll.so
 lib/wine/ddraw.dll.so
 lib/wine/devenum.dll.so
 lib/wine/dinput.dll.so
+lib/wine/dinput8.dll.so
 lib/wine/dispdib.dll.so
 lib/wine/display.dll.so
 lib/wine/dplay.dll.so
 lib/wine/dplayx.dll.so
 lib/wine/dsound.dll.so
+lib/wine/expand.exe.so
 lib/wine/gdi.exe.so
 lib/wine/gdi32.dll.so
 lib/wine/glu32.dll.so
+lib/wine/icinfo.exe.so
 lib/wine/icmp.dll.so
 lib/wine/imaadp32.acm.so
 lib/wine/imagehlp.dll.so
@@ -278,8 +288,9 @@
 lib/wine/msacm.dll.so
 lib/wine/msacm.drv.so
 lib/wine/msacm32.dll.so
+lib/wine/msadp32.acm.so
 lib/wine/msdmo.dll.so
-lib/wine/msg711.drv.so
+lib/wine/msg711.acm.so
 lib/wine/msimg32.dll.so
 lib/wine/msisys.ocx.so
 lib/wine/msnet32.dll.so
@@ -289,6 +300,7 @@
 lib/wine/msvfw32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/netapi32.dll.so
+lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/ole2.dll.so
@@ -306,11 +318,17 @@
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
 lib/wine/opengl32.dll.so
+lib/wine/osversioncheck.exe.so
+lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
 lib/wine/rasapi16.dll.so
 lib/wine/rasapi32.dll.so
+lib/wine/regapi.exe.so
+lib/wine/regedit.exe.so
+lib/wine/regsvr32.exe.so
+lib/wine/regtest.exe.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
 lib/wine/serialui.dll.so
@@ -321,6 +339,7 @@
 lib/wine/shell32.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
+lib/wine/snmpapi.dll.so
 lib/wine/sound.dll.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll.so
@@ -331,24 +350,36 @@
 lib/wine/ttydrv.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
+lib/wine/uninstaller.exe.so
 lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
 lib/wine/ver.dll.so
 lib/wine/version.dll.so
+lib/wine/view.exe.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll.so
+lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll.so
 lib/wine/win87em.dll.so
 lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
+lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
+lib/wine/wineconsole.exe.so
+lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/winefile.exe.so
+lib/wine/winemine.exe.so
+lib/wine/winemp3.acm.so
 lib/wine/wineoss.drv.so
+lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
 lib/wine/wineps16.dll.so
+lib/wine/winetest.exe.so
 lib/wine/wing.dll.so
+lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
 lib/wine/winmm.dll.so
 lib/wine/winnls.dll.so
@@ -356,6 +387,7 @@
 lib/wine/winsock.dll.so
 lib/wine/winspool.drv.so
 lib/wine/wintrust.dll.so
+lib/wine/winver.exe.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/wine/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo	2002/04/20 08:20:16	1.7
+++ distinfo	2002/07/20 12:24:16
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.7 2002/04/20 08:20:16 rh Exp $
 
-SHA1 (Wine-20020411.tar.gz) = d83060fc97f02bf9deaef0a23951042d631f268c
-Size (Wine-20020411.tar.gz) = 7270988 bytes
+SHA1 (Wine-20020710.tar.gz) = 69e0bc8e52e01e209cf30508b49add62d24bc82a
+Size (Wine-20020710.tar.gz) = 7371859 bytes
 SHA1 (patch-aa) = bf45f5b343bda55a0809459469a2476b566ad7d5
+SHA1 (patch-ab) = 8f24e498cf382f70213d722e2ecf64e694c6b730


NEW FILE: patches/patch-ab

$NetBSD$

--- memory/global.c.orig	Wed Jul  3 21:10:44 2002
+++ memory/global.c
@@ -22,6 +22,7 @@
 #include "config.h"
 #include "wine/port.h"
 
+#include <sys/param.h>
 #include <sys/types.h>
 #include <stdlib.h>
 #include <time.h>
	
>How-To-Repeat:
	
>Fix:
	
>Release-Note:
>Audit-Trail:
>Unformatted: