From 4dd83da34bab72671ed077a6fcb40d1b835e3813 Mon Sep 17 00:00:00 2001 From: junyoung Date: Fri, 15 Mar 2002 04:10:20 +0000 Subject: Update Wine to 20020228 snapshot. --- emulators/wine/DESCR | 2 +- emulators/wine/Makefile | 45 +++- emulators/wine/PLIST | 359 ++++++++++++++++++++++++++- emulators/wine/distinfo | 24 +- emulators/wine/patches/patch-aa | 23 +- emulators/wine/patches/patch-ab | 22 -- emulators/wine/patches/patch-ac | 205 ---------------- emulators/wine/patches/patch-ad | 19 -- emulators/wine/patches/patch-ae | 23 -- emulators/wine/patches/patch-af | 527 ---------------------------------------- emulators/wine/patches/patch-ag | 20 -- emulators/wine/patches/patch-ah | 36 --- emulators/wine/patches/patch-ai | 49 ---- emulators/wine/patches/patch-aj | 37 --- emulators/wine/patches/patch-ak | 23 -- emulators/wine/patches/patch-al | 74 ------ emulators/wine/patches/patch-am | 31 --- emulators/wine/patches/patch-an | 20 -- emulators/wine/patches/patch-ao | 162 ------------ emulators/wine/patches/patch-ap | 10 - emulators/wine/patches/patch-aq | 14 -- 21 files changed, 402 insertions(+), 1323 deletions(-) delete mode 100644 emulators/wine/patches/patch-ab delete mode 100644 emulators/wine/patches/patch-ac delete mode 100644 emulators/wine/patches/patch-ad delete mode 100644 emulators/wine/patches/patch-ae delete mode 100644 emulators/wine/patches/patch-af delete mode 100644 emulators/wine/patches/patch-ag delete mode 100644 emulators/wine/patches/patch-ah delete mode 100644 emulators/wine/patches/patch-ai delete mode 100644 emulators/wine/patches/patch-aj delete mode 100644 emulators/wine/patches/patch-ak delete mode 100644 emulators/wine/patches/patch-al delete mode 100644 emulators/wine/patches/patch-am delete mode 100644 emulators/wine/patches/patch-an delete mode 100644 emulators/wine/patches/patch-ao delete mode 100644 emulators/wine/patches/patch-ap delete mode 100644 emulators/wine/patches/patch-aq (limited to 'emulators') diff --git a/emulators/wine/DESCR b/emulators/wine/DESCR index a5b157b5d2f..92c27c88ff9 100644 --- a/emulators/wine/DESCR +++ b/emulators/wine/DESCR @@ -2,7 +2,7 @@ Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x and Win32 executables) on Unix. It consists of a program loader which loads and executes an Microsoft Windows binary, and a library that implements Windows API calls using their Unix or X11 -equivalents. The library may also be used for porting Win32 code into +equivalents. The library may also be used for porting Win32 code into native Unix executables. Wine is free software, and its license (contained in the file LICENSE) is diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 8673a215849..61d4cc1013a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,30 +1,49 @@ -# $NetBSD: Makefile,v 1.24 2001/12/26 23:03:43 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2002/03/15 04:10:20 junyoung Exp $ -DISTNAME= Wine-981211 -PKGNAME= wine-981211 +DISTNAME= Wine-20020228 +PKGNAME= wine-20020228 WRKSRC= ${WRKDIR}/${PKGNAME} CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE:=ALPHA/wine/development/} -MAINTAINER= mycroft@netbsd.org +MAINTAINER= junyoung@netbsd.org HOMEPAGE= http://www.winehq.com/ -COMMENT= Beta Windows (3.1x, 95, NT) emulator +COMMENT= Free implementation of Windows on Unix (still alpha) -ONLY_FOR_PLATFORM= NetBSD-*-i386 +ONLY_FOR_PLATFORM= NetBSD-1.[5-9]*-i386 -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-dll USE_BUILDLINK_ONLY= YES +USE_GMAKE= YES +GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --without-curses -post-install: - ${INSTALL_DATA} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf.example +# The Wine configure script has problems locating the freetype-config +# script and the libraries in the buildlink directory, so explicitly +# set the location of freetype-config and prepend all of the LDFLAGS +# necessary to link against the libraries. +# +CONFIGURE_ENV+= ft_devel=${FREETYPE_CONFIG} +CONFIGURE_ENV+= X_LIBS="${LDFLAGS}" +LIBS+= ${LDFLAGS} .include "../../mk/bsd.prefs.mk" -.if ${OBJECT_FMT} == "ELF" -BROKEN= Does not work on ELF systems. +.if defined(USE_CUPS) && (${USE_CUPS} == YES) +.include "../../print/cups/buildlink.mk" +BUILD_DEFS+= USE_CUPS .endif -.include "../../graphics/xpm/buildlink.mk" +EGDIR= ${PREFIX}/share/examples/wine + +post-install: + ${INSTALL_DATA_DIR} ${EGDIR} + cd ${WRKSRC}/documentation/samples; \ + ${INSTALL_DATA} config ${EGDIR}/wine.conf; \ + ${INSTALL_DATA} generic.ppd ${EGDIR}/generic.ppd; \ + ${INSTALL_DATA} system.ini ${EGDIR}/system.ini + +.include "../../graphics/Mesa/buildlink.mk" +.include "../../graphics/freetype2/buildlink.mk" +.include "../../graphics/jpeg/buildlink.mk" .include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST index 7fb68735cd0..2a783caf959 100644 --- a/emulators/wine/PLIST +++ b/emulators/wine/PLIST @@ -1,12 +1,359 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:13 zuntum Exp $ -bin/dosmod +@comment $NetBSD: PLIST,v 1.2 2002/03/15 04:10:20 junyoung Exp $ +bin/fnt2bdf +bin/function_grep.pl bin/wine -etc/wine.conf.example +bin/winebuild +bin/wineclipsrv +bin/wineconsole +bin/wineconsole.so +bin/winedbg +bin/winedbg.so +bin/winedump +bin/winelauncher +bin/winemaker +bin/wineserver +bin/wineshelllink +bin/wmc +bin/wrc +include/wine/amaudio.h +include/wine/amvideo.h +include/wine/audevcod.h +include/wine/basetsd.h +include/wine/cderr.h +include/wine/cguid.h +include/wine/comcat.h +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 +include/wine/d3dtypes.h +include/wine/d3dvec.inl +include/wine/dde.h +include/wine/ddeml.h +include/wine/ddraw.h +include/wine/digitalv.h +include/wine/dinput.h +include/wine/dispdib.h +include/wine/dlgs.h +include/wine/docobj.h +include/wine/dplay.h +include/wine/dplobby.h +include/wine/dshow.h +include/wine/dsound.h +include/wine/errors.h +include/wine/evcode.h +include/wine/guiddef.h +include/wine/imagehlp.h +include/wine/imm.h +include/wine/initguid.h +include/wine/instance.h +include/wine/lmcons.h +include/wine/lzexpand.h +include/wine/mapi.h +include/wine/mapicode.h +include/wine/mapidefs.h +include/wine/mciavi.h +include/wine/mcx.h +include/wine/minmax.h +include/wine/mmreg.h +include/wine/mmsystem.h +include/wine/msacm.h +include/wine/msacmdlg.h +include/wine/msvcrt/conio.h +include/wine/msvcrt/crtdbg.h +include/wine/msvcrt/ctype.h +include/wine/msvcrt/direct.h +include/wine/msvcrt/dos.h +include/wine/msvcrt/eh.h +include/wine/msvcrt/excpt.h +include/wine/msvcrt/fcntl.h +include/wine/msvcrt/io.h +include/wine/msvcrt/locale.h +include/wine/msvcrt/malloc.h +include/wine/msvcrt/mbctype.h +include/wine/msvcrt/mbstring.h +include/wine/msvcrt/process.h +include/wine/msvcrt/search.h +include/wine/msvcrt/setjmp.h +include/wine/msvcrt/share.h +include/wine/msvcrt/stddef.h +include/wine/msvcrt/stdio.h +include/wine/msvcrt/stdlib.h +include/wine/msvcrt/string.h +include/wine/msvcrt/sys/stat.h +include/wine/msvcrt/sys/timeb.h +include/wine/msvcrt/sys/types.h +include/wine/msvcrt/sys/utime.h +include/wine/msvcrt/time.h +include/wine/msvcrt/wchar.h +include/wine/msvcrt/wctype.h +include/wine/nb30.h +include/wine/nspapi.h +include/wine/ntsecapi.h +include/wine/oaidl.h +include/wine/objbase.h +include/wine/objidl.h +include/wine/ocidl.h +include/wine/ole2.h +include/wine/ole2ver.h +include/wine/oleauto.h +include/wine/olectl.h +include/wine/oledlg.h +include/wine/oleidl.h +include/wine/poppack.h +include/wine/prsht.h +include/wine/psapi.h +include/wine/pshpack1.h +include/wine/pshpack2.h +include/wine/pshpack4.h +include/wine/pshpack8.h +include/wine/ras.h +include/wine/regstr.h +include/wine/richedit.h +include/wine/rpc.h +include/wine/rpcdce.h +include/wine/rpcdcep.h +include/wine/rpcndr.h +include/wine/rpcnterr.h +include/wine/rpcproxy.h +include/wine/servprov.h +include/wine/setupapi.h +include/wine/shellapi.h +include/wine/shlguid.h +include/wine/shlobj.h +include/wine/shlwapi.h +include/wine/sql.h +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 +include/wine/urlmon.h +include/wine/uuids.h +include/wine/ver.h +include/wine/vfw.h +include/wine/vfwmsgs.h +include/wine/winbase.h +include/wine/wincon.h +include/wine/wincrypt.h +include/wine/windef.h include/wine/windows.h -include/wine/wintypes.h +include/wine/windowsx.h +include/wine/wine/debug.h +include/wine/wine/exception.h +include/wine/wine/icmpapi.h +include/wine/wine/ipexport.h +include/wine/wine/library.h +include/wine/wine/obj_base.h +include/wine/wine/obj_cache.h +include/wine/wine/obj_channel.h +include/wine/wine/obj_clientserver.h +include/wine/wine/obj_commdlgbrowser.h +include/wine/wine/obj_connection.h +include/wine/wine/obj_contextmenu.h +include/wine/wine/obj_control.h +include/wine/wine/obj_dataobject.h +include/wine/wine/obj_dockingwindowframe.h +include/wine/wine/obj_dragdrop.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 +include/wine/wine/obj_oleaut.h +include/wine/wine/obj_olefont.h +include/wine/wine/obj_oleobj.h +include/wine/wine/obj_oleundo.h +include/wine/wine/obj_oleview.h +include/wine/wine/obj_picture.h +include/wine/wine/obj_property.h +include/wine/wine/obj_propertystorage.h +include/wine/wine/obj_queryassociations.h +include/wine/wine/obj_serviceprovider.h +include/wine/wine/obj_shellbrowser.h +include/wine/wine/obj_shellextinit.h +include/wine/wine/obj_shellfolder.h +include/wine/wine/obj_shelllink.h +include/wine/wine/obj_shellview.h +include/wine/wine/obj_storage.h +include/wine/wine/obj_webbrowser.h +include/wine/wine/unicode.h +include/wine/winerror.h +include/wine/wingdi.h +include/wine/wininet.h +include/wine/winioctl.h +include/wine/winnetwk.h +include/wine/winnls.h +include/wine/winnt.h +include/wine/winreg.h +include/wine/winres.h +include/wine/winresrc.h +include/wine/winsock.h +include/wine/winsock2.h +include/wine/winspool.h +include/wine/winsvc.h +include/wine/winuser.h +include/wine/winver.h +include/wine/wnaspi32.h +include/wine/wownt32.h +include/wine/ws2spi.h +include/wine/ws2tcpip.h +include/wine/wshisotp.h +include/wine/wsipx.h +include/wine/wtypes.h +include/wine/zmouse.h +lib/libadvapi32.so +lib/libavicap32.so +lib/libavifil32.so +lib/libavifile.so +lib/libcomctl32.so +lib/libcomdlg32.so +lib/libcomm.so +lib/libcommdlg.so +lib/libcompobj.so +lib/libcrtdll.so +lib/libcrypt32.so +lib/libdciman32.so +lib/libddeml.so +lib/libddraw.so +lib/libdevenum.so +lib/libdinput.so +lib/libdispdib.so +lib/libdisplay.so +lib/libdplay.so +lib/libdplayx.so +lib/libdsound.so +lib/libgdi.so +lib/libgdi32.so +lib/libglu32.so +lib/libicmp.so +lib/libimagehlp.so +lib/libimm.so +lib/libimm32.so +lib/libjoystick.drv.so +lib/libkernel.so +lib/libkernel32.so +lib/libkeyboard.so +lib/liblz32.so +lib/liblzexpand.so +lib/libmapi32.so +lib/libmcianim.drv.so +lib/libmciavi.drv.so +lib/libmcicda.drv.so +lib/libmciseq.drv.so +lib/libmciwave.drv.so +lib/libmidimap.drv.so +lib/libmmsystem.so +lib/libmouse.so +lib/libmpr.so +lib/libmsacm.drv.so +lib/libmsacm.so +lib/libmsacm32.so +lib/libmsdmo.so +lib/libmsimg32.so +lib/libmsnet32.so +lib/libmsrle32.so +lib/libmsvcrt.so +lib/libmsvcrt20.so +lib/libmsvfw32.so +lib/libmsvideo.so +lib/libnetapi32.so +lib/libntdll.so +lib/libodbc32.so +lib/libole2.so +lib/libole2conv.so +lib/libole2disp.so +lib/libole2nls.so +lib/libole2prox.so +lib/libole2thk.so +lib/libole32.so +lib/liboleaut32.so +lib/libolecli.so +lib/libolecli32.so +lib/liboledlg.so +lib/libolepro32.so +lib/libolesvr.so +lib/libolesvr32.so +lib/libopengl32.so +lib/libpsapi.so +lib/libqcap.so +lib/libquartz.so +lib/librasapi16.so +lib/librasapi32.so +lib/libriched32.so +lib/librpcrt4.so +lib/libserialui.so +lib/libsetupapi.so +lib/libsetupx.so +lib/libshdocvw.so +lib/libshell.so +lib/libshell32.so +lib/libshfolder.so +lib/libshlwapi.so +lib/libsound.so +lib/libsti.so +lib/libstorage.so +lib/libstress.so +lib/libsystem.so +lib/libtapi32.so +lib/libtoolhelp.so +lib/libttydrv.so +lib/libtypelib.so +lib/liburl.so +lib/liburlmon.so +lib/libuser.so +lib/libuser32.so +lib/libver.so +lib/libversion.so +lib/libw32skrnl.so +lib/libw32sys.so +lib/libwin32s16.so +lib/libwin87em.so +lib/libwinaspi.so +lib/libwindebug.so lib/libwine.so -lib/libwine.so.1 lib/libwine.so.1.0 -lib/wine.sym +lib/libwine_tsx11.so +lib/libwine_tsx11.so.1.0 +lib/libwine_unicode.so +lib/libwine_unicode.so.1.0 +lib/libwine_uuid.a +lib/libwinedos.so +lib/libwineoss.drv.so +lib/libwineps.so +lib/libwineps16.so +lib/libwing.so +lib/libwininet.so +lib/libwinmm.so +lib/libwinnls.so +lib/libwinnls32.so +lib/libwinsock.so +lib/libwinspool.drv.so +lib/libwintrust.so +lib/libwnaspi32.so +lib/libwow32.so +lib/libwprocs.so +lib/libws2_32.so +lib/libwsock32.so +lib/libx11drv.so man/man1/wine.1 +man/man1/winemaker.1 +man/man1/wmc.1 +man/man1/wrc.1 +man/man5/wine.conf.5 +share/examples/wine/generic.ppd +share/examples/wine/system.ini +share/examples/wine/wine.conf +@dirrm share/examples/wine +@dirrm include/wine/wine +@dirrm include/wine/msvcrt/sys +@dirrm include/wine/msvcrt @dirrm include/wine diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index 8ba176e1c44..8b0855fb47c 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,21 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/12/26 23:03:43 wiz Exp $ +$NetBSD: distinfo,v 1.4 2002/03/15 04:10:20 junyoung Exp $ -SHA1 (Wine-981211.tar.gz) = 4fddd0fa9e4f51234dea2c005e8e3680009effd0 -Size (Wine-981211.tar.gz) = 2712869 bytes -SHA1 (patch-aa) = 05ab47dfa7a696b2633c43c1890949f02d163a36 -SHA1 (patch-ab) = 9743bf2f79391bad0a1aee8b063a710121c4fb19 -SHA1 (patch-ac) = a72b120a97c331033a4f7ced55b6beb70dab1c6d -SHA1 (patch-ad) = 29ab4c1570e912ec84ea5424de80bc6c8cde1a0a -SHA1 (patch-ae) = 22757f141bc5b5872faaf4b8ae92bc4614514d6e -SHA1 (patch-af) = de7c48e884454f7bc6d94fd59c9ce24c7eadfb1c -SHA1 (patch-ag) = d072b7462f8c88206b33eb65809316af5d4e2387 -SHA1 (patch-ah) = 0b08354c433d737017a44095577851ebc339d713 -SHA1 (patch-ai) = 3d444f11a7df0aa06dc8c94c9cb221ec30398e72 -SHA1 (patch-aj) = 24dae7f7a03e644167e55f20b87a4707cae44bde -SHA1 (patch-ak) = b8214a6d2a428e3ae945043c16f5c8470c488fdd -SHA1 (patch-al) = 585e4d75d06913c85035f0ff9b4f0e937c74890f -SHA1 (patch-am) = 03c8cb74e461d3e7b3e362a01b5acc662313df26 -SHA1 (patch-an) = 6dca771c97a74ba46233792679066ffb44949538 -SHA1 (patch-ao) = 799df5221e6a43207054c6639c17185ee0357569 -SHA1 (patch-ap) = 4e7979aa6edde133610c7e727828245440cc8462 -SHA1 (patch-aq) = 4cfb2bb006385b481f5e5944ba84055ca8230fa9 +SHA1 (Wine-20020228.tar.gz) = 4e275f639200752126ebdfdca23daa7f692dbfb4 +Size (Wine-20020228.tar.gz) = 6970746 bytes +SHA1 (patch-aa) = bf45f5b343bda55a0809459469a2476b566ad7d5 diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa index 7c3c3b561ad..4ace8108dfa 100644 --- a/emulators/wine/patches/patch-aa +++ b/emulators/wine/patches/patch-aa @@ -1,12 +1,13 @@ -$NetBSD: patch-aa,v 1.5 1999/11/27 21:24:47 rh Exp $ +$NetBSD: patch-aa,v 1.6 2002/03/15 04:10:20 junyoung Exp $ ---- Make.rules.in.orig Sat Nov 27 22:17:20 1999 -+++ Make.rules.in Sat Nov 27 22:17:20 1999 -@@ -33,6 +33,7 @@ - DIVINCL = -I$(TOPSRCDIR)/include -I$(TOPOBJDIR)/include -I$(SRCDIR) -I. - ALLCFLAGS = $(CFLAGS) $(DEFS) $(OPTIONS) $(DIVINCL) $(X_CFLAGS) - LDCOMBINE = ld -r -+LDSHARE = @LDSHARE@ - AR = ar rc - RM = rm -f - MKDIR = mkdir -p +--- Make.rules.in.orig Tue Jan 15 04:56:46 2002 ++++ Make.rules.in Sat Jan 26 21:08:41 2002 +@@ -31,7 +31,7 @@ + X_CFLAGS = @X_CFLAGS@ + X_LIBS = @X_LIBS@ + XLIB = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lc + YACC = @YACC@ + LEX = @LEX@ + LEXLIB = @LEXLIB@ diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab deleted file mode 100644 index 8d5635b7481..00000000000 --- a/emulators/wine/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2001/12/26 23:03:44 wiz Exp $ - ---- Makefile.in.orig Fri Dec 11 14:26:26 1998 -+++ Makefile.in -@@ -153,7 +153,7 @@ - lib: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) - - wine wine.sym: $(LIBSUBDIRS) $(X11SUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy -- $(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(ALT_LINK) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) -+ $(CC) -o wine $(EMUOBJS) -L. -lwine $(ALT_LINK) $(LDFLAGS) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) - nm -n wine | grep -v _compiled >wine.sym - @echo "Wine build complete." - -@@ -163,7 +163,7 @@ - $(RANLIB) $@ - - libwine.so.1.0: $(LIBOBJS) $(X11OBJS) -- $(CC) -shared -Wl,-soname,libwine.so -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS) $(X_LIBS) $(XLIB) $(LIBS) -+ ${LDSHARE} -o$@ $(LIBOBJS) $(X11OBJS) $(LDOPTIONS) - - install_emu: install_lib - [ -d $(bindir) ] || $(MKDIR) $(bindir) diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac deleted file mode 100644 index 93451f27033..00000000000 --- a/emulators/wine/patches/patch-ac +++ /dev/null @@ -1,205 +0,0 @@ -$NetBSD: patch-ac,v 1.3 1998/12/14 02:17:10 tv Exp $ - ---- configure.orig Fri Dec 11 08:26:26 1998 -+++ configure Sun Dec 13 00:59:26 1998 -@@ -2037,8 +2037,51 @@ - echo "$ac_t""no" 1>&6 - fi - -+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 -+echo "configure:2042: checking for main in -lossaudio" >&5 -+ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lossaudio $LIBS" -+cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" -+ -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_lib=HAVE_LIB`echo ossaudio | sed -e 's/[^a-zA-Z0-9_]/_/g' \ -+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` -+ cat >> confdefs.h <&6 -+fi -+ - echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6 --echo "configure:2042: checking for iswalnum in -lw" >&5 -+echo "configure:2085: checking for iswalnum in -lw" >&5 - ac_lib_var=`echo w'_'iswalnum | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -2489,7 +2532,27 @@ - - ; return 0; } - EOF --if { (eval echo configure:2493: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:2536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_c_opensoundsystem="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ cat > conftest.$ac_ext < -+int main() { -+ -+/* check for one of the Open Sound System specific SNDCTL_ defines */ -+#if !defined(SNDCTL_DSP_STEREO) -+#error No open sound system -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:2556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_c_opensoundsystem="yes" - else -@@ -2500,6 +2563,8 @@ - fi - rm -f conftest* - fi -+rm -f conftest* -+fi - - echo "$ac_t""$ac_cv_c_opensoundsystem" 1>&6 - -@@ -2680,50 +2745,90 @@ - - - DLLFLAGS="" -+LDSHARE="" - if test "$LIB_TARGET" = "libwine.so.1.0" - then -- echo $ac_n "checking "whether we can build a dll"""... $ac_c" 1>&6 --echo "configure:2687: checking "whether we can build a dll"" >&5 --if eval "test \"`echo '$''{'ac_cv_c_dll'+set}'`\" = set"; then -+ echo $ac_n "checking "whether we can build a Linux dll"""... $ac_c" 1>&6 -+echo "configure:2753: checking "whether we can build a Linux dll"" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_dll_linux'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - saved_cflags=$CFLAGS - CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then - rm -rf conftest* -- ac_cv_c_dll="yes" -+ ac_cv_c_dll_linux="yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_c_dll="no" -+ ac_cv_c_dll_linux="no" - fi - rm -f conftest* - CFLAGS=$saved_cflags - - fi - --echo "$ac_t""$ac_cv_c_dll" 1>&6 -- if test "$ac_cv_c_dll" = "yes" -+echo "$ac_t""$ac_cv_c_dll_linux" 1>&6 -+ if test "$ac_cv_c_dll_linux" = "yes" - then - DLLFLAGS="-fPIC" -- else -+ LDSHARE="$$(CC) -shared -Wl,-soname,libwine.so" -+ fi -+ echo $ac_n "checking "whether we can build a NetBSD dll"""... $ac_c" 1>&6 -+echo "configure:2788: checking "whether we can build a NetBSD dll"" >&5 -+if eval "test \"`echo '$''{'ac_cv_c_dll_netbsd'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ saved_cflags=$CFLAGS -+ CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive" -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then -+ rm -rf conftest* -+ ac_cv_c_dll_netbsd="yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_dll_netbsd="no" -+fi -+rm -f conftest* -+ CFLAGS=$saved_cflags -+ -+fi -+ -+echo "$ac_t""$ac_cv_c_dll_netbsd" 1>&6 -+ if test "$ac_cv_c_dll_netbsd" = "yes" -+ then -+ DLLFLAGS="-fPIC" -+ LDSHARE="ld -Bshareable -Bforcearchive" -+ fi -+ if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_netbsd" = "no" -+ then - LIB_TARGET="libwine.a" - fi - fi - - - -+ - echo $ac_n "checking "for reentrant libc"""... $ac_c" 1>&6 --echo "configure:2727: checking "for reentrant libc"" >&5 -+echo "configure:2832: checking "for reentrant libc"" >&5 - if eval "test \"`echo '$''{'wine_cv_libc_reentrant'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -3849,6 +3954,7 @@ - s%@C2MAN@%$C2MAN%g - s%@XLIB@%$XLIB%g - s%@DLLFLAGS@%$DLLFLAGS%g -+s%@LDSHARE@%$LDSHARE%g - /@MAKE_RULES@/r $MAKE_RULES - s%@MAKE_RULES@%%g - diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad deleted file mode 100644 index 01eaca0eccb..00000000000 --- a/emulators/wine/patches/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ad,v 1.2 1998/08/07 10:40:35 agc Exp $ - ---- multimedia/audio.c.orig Sun May 31 18:14:49 1998 -+++ multimedia/audio.c Tue Jun 16 23:58:24 1998 -@@ -28,11 +28,14 @@ - - #ifdef HAVE_OSS - -+#ifdef __NetBSD__ -+#include - #ifdef HAVE_MACHINE_SOUNDCARD_H - # include - #endif - #ifdef HAVE_SYS_SOUNDCARD_H - # include -+#endif - #endif - - #define SOUND_DEV "/dev/dsp" diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae deleted file mode 100644 index f61906c9f5f..00000000000 --- a/emulators/wine/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.3 1999/11/27 21:24:47 rh Exp $ - ---- multimedia/dsound.c.orig Sat Nov 27 22:17:22 1999 -+++ multimedia/dsound.c Sat Nov 27 22:17:22 1999 -@@ -49,13 +49,17 @@ - #include "xmalloc.h" - - #ifdef HAVE_OSS --# include -+#include -+#ifdef __NetBSD__ -+#include -+#else - # ifdef HAVE_MACHINE_SOUNDCARD_H - # include - # endif - # ifdef HAVE_SYS_SOUNDCARD_H - # include - # endif -+#endif - - /* #define USE_DSOUND3D 1 */ - diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af deleted file mode 100644 index 7ffce34788f..00000000000 --- a/emulators/wine/patches/patch-af +++ /dev/null @@ -1,527 +0,0 @@ -$NetBSD: patch-af,v 1.4 1998/12/14 02:17:11 tv Exp $ - ---- multimedia/mcicda.c.orig Thu Dec 10 04:03:00 1998 -+++ multimedia/mcicda.c Sun Dec 13 11:00:34 1998 -@@ -18,6 +18,10 @@ - #include "debug.h" - #include "multimedia.h" - -+#ifdef __NetBSD__ -+#include -+#include -+#else - #ifdef HAVE_LINUX_CDROM_H - # include - #endif -@@ -30,12 +34,17 @@ - #ifdef HAVE_SYS_CDIO_H - # include - #endif -+#endif - -+#ifdef __NetBSD__ -+#define CDAUDIO_DEV "/dev/rcd0d" -+#else - #ifdef __FreeBSD__ - # define CDAUDIO_DEV "/dev/rcd0c" - #else - # define CDAUDIO_DEV "/dev/cdrom" - #endif -+#endif - - #ifdef SOUND_VERSION - # define IOCTL(a,b,c) ioctl(a,b,&c) -@@ -50,7 +59,7 @@ - #define CDFRAMES_PERMIN 4500 - #define SECONDS_PERMIN 60 - --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - typedef struct { - int nUseCount; /* Incremented for each shared open */ - BOOL16 fShareable; /* TRUE if first open was shareable */ -@@ -61,7 +70,7 @@ - int unixdev; - #ifdef linux - struct cdrom_subchnl sc; --#elif defined(__FreeBSD__) -+#else - struct cd_sub_channel_info sc; - #endif - int cdMode; -@@ -103,27 +112,25 @@ - */ - static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - #ifdef linux - struct cdrom_tochdr hdr; --#elif defined(__FreeBSD__) -+#else - struct ioc_toc_header hdr; - #endif - - if (wcda->nTracks == 0) { -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMREADTOCHDR --#elif defined(__FreeBSD__) -- CDIOREADTOCHEADER -+ if (ioctl(wcda->unixdev, CDROMREADTOCHDR, &hdr)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOREADTOCHEADER, &hdr)) { - #endif -- , &hdr)) { - WARN(cdaudio, "(%p) -- Error occured !\n", wcda); - return (WORD)-1; - } - #ifdef linux - wcda->nTracks = hdr.cdth_trk1; --#elif defined(__FreeBSD__) -+#else - wcda->nTracks = hdr.ending_track - hdr.starting_track + 1; - #endif - } -@@ -139,13 +146,13 @@ - */ - static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - int i, length; - int start, last_start = 0; - int total_length = 0; - #ifdef linux - struct cdrom_tocentry entry; --#elif defined(__FreeBSD__) -+#else - struct ioc_read_toc_entry entry; - struct cd_toc_entry toc_buffer; - #endif -@@ -177,31 +184,29 @@ - if (i == wcda->nTracks) - #ifdef linux - entry.cdte_track = CDROM_LEADOUT; --#elif defined(__FreeBSD__) -+#else - #define LEADOUT 0xaa - entry.starting_track = LEADOUT; /* XXX */ - #endif - else - #ifdef linux - entry.cdte_track = i + 1; --#elif defined(__FreeBSD__) -+#else - entry.starting_track = i + 1; - #endif - #ifdef linux - entry.cdte_format = CDROM_MSF; --#elif defined(__FreeBSD__) -+#else - bzero((char *)&toc_buffer, sizeof(toc_buffer)); - entry.address_format = CD_MSF_FORMAT; - entry.data_len = sizeof(toc_buffer); - entry.data = &toc_buffer; - #endif -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMREADTOCENTRY --#elif defined(__FreeBSD__) -- CDIOREADTOCENTRYS -+ if (ioctl(wcda->unixdev, CDROMREADTOCENTRY, &entry)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOREADTOCENTRYS, &entry)) { - #endif -- , &entry)) { - WARN(cdaudio, "error read entry\n"); - return FALSE; - } -@@ -209,7 +214,7 @@ - start = CDFRAMES_PERSEC * (SECONDS_PERMIN * - entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) + - entry.cdte_addr.msf.frame; --#elif defined(__FreeBSD__) -+#else - start = CDFRAMES_PERSEC * (SECONDS_PERMIN * - toc_buffer.addr.msf.minute + toc_buffer.addr.msf.second) + - toc_buffer.addr.msf.frame; -@@ -230,7 +235,7 @@ - wcda->lpbTrackFlags[i] = - #ifdef linux - (entry.cdte_adr << 4) | (entry.cdte_ctrl & 0x0f); --#elif defined(__FreeBSD__) -+#else - (toc_buffer.addr_type << 4) | (toc_buffer.control & 0x0f); - #endif - TRACE(cdaudio, "track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]); -@@ -248,7 +253,7 @@ - */ - static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpOpenParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - DWORD dwDeviceID; - WINE_CDAUDIO* wcda; - -@@ -328,7 +333,7 @@ - */ - static DWORD CDAUDIO_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); -@@ -351,7 +356,7 @@ - static DWORD CDAUDIO_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, - LPMCI_GETDEVCAPS_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; -@@ -403,7 +408,7 @@ - */ - static DWORD CDAUDIO_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - DWORD ret = 0; - LPSTR str = 0; - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); -@@ -445,7 +450,7 @@ - static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime) - { - DWORD dwFrame = 0; --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - UINT16 wTrack; - - TRACE(cdaudio,"(%p, %08lX, %lu);\n", wcda, wcda->dwTimeFormat, dwTime); -@@ -487,9 +492,9 @@ - */ - static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - int oldmode = wcda->cdMode; --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__NetBSD__) - struct ioc_read_subchannel read_sc; - - read_sc.address_format = CD_MSF_FORMAT; -@@ -500,13 +505,11 @@ - #elif linux - wcda->sc.cdsc_format = CDROM_MSF; - #endif -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMSUBCHNL, &wcda->sc --#elif defined(__FreeBSD__) -- CDIOCREADSUBCHANNEL, &read_sc -+ if (ioctl(wcda->unixdev, CDROMSUBCHNL, &wcda->sc)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOCREADSUBCHANNEL, &read_sc)) { - #endif -- )) { - TRACE(cdaudio,"opened or no_media !\n"); - wcda->cdMode = MCI_MODE_OPEN; /* was NOT_READY */ - return TRUE; -@@ -514,13 +517,13 @@ - switch ( - #ifdef linux - wcda->sc.cdsc_audiostatus --#elif defined(__FreeBSD__) -+#else - wcda->sc.header.audio_status - #endif - ) { - #ifdef linux - case CDROM_AUDIO_INVALID: --#elif defined(__FreeBSD__) -+#else - case CD_AS_AUDIO_INVALID: - #endif - WARN(cdaudio, "device doesn't support status, using MCI status.\n"); -@@ -528,7 +531,7 @@ - break; - #ifdef linux - case CDROM_AUDIO_NO_STATUS: --#elif defined(__FreeBSD__) -+#else - case CD_AS_NO_STATUS: - #endif - wcda->cdMode = MCI_MODE_STOP; -@@ -536,7 +539,7 @@ - break; - #ifdef linux - case CDROM_AUDIO_PLAY: --#elif defined(__FreeBSD__) -+#else - case CD_AS_PLAY_IN_PROGRESS: - #endif - wcda->cdMode = MCI_MODE_PLAY; -@@ -544,7 +547,7 @@ - break; - #ifdef linux - case CDROM_AUDIO_PAUSED: --#elif defined(__FreeBSD__) -+#else - case CD_AS_PLAY_PAUSED: - #endif - wcda->cdMode = MCI_MODE_PAUSE; -@@ -554,7 +557,7 @@ - #ifdef linux - TRACE(cdaudio,"status=%02X !\n", - wcda->sc.cdsc_audiostatus); --#elif defined(__FreeBSD__) -+#else - TRACE(cdaudio,"status=%02X !\n", - wcda->sc.header.audio_status); - #endif -@@ -565,7 +568,7 @@ - CDFRAMES_PERMIN * wcda->sc.cdsc_absaddr.msf.minute + - CDFRAMES_PERSEC * wcda->sc.cdsc_absaddr.msf.second + - wcda->sc.cdsc_absaddr.msf.frame; --#elif defined(__FreeBSD__) -+#else - wcda->nCurTrack = wcda->sc.what.position.track_number; - wcda->dwCurFrame = - CDFRAMES_PERMIN * wcda->sc.what.position.absaddr.msf.minute + -@@ -578,7 +581,7 @@ - wcda->sc.cdsc_absaddr.msf.minute, - wcda->sc.cdsc_absaddr.msf.second, - wcda->sc.cdsc_absaddr.msf.frame); --#elif defined(__FreeBSD__) -+#else - TRACE(cdaudio,"%02u-%02u:%02u:%02u \n", - wcda->sc.what.position.track_number, - wcda->sc.what.position.absaddr.msf.minute, -@@ -605,7 +608,7 @@ - static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame) - { - DWORD dwTime = 0; --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - UINT16 wTrack; - UINT16 wMinutes; - UINT16 wSeconds; -@@ -651,7 +654,7 @@ - */ - static DWORD CDAUDIO_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - DWORD ret = 0; - -@@ -759,13 +762,13 @@ - */ - static DWORD CDAUDIO_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - int start, end; - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - DWORD ret = 0; - #ifdef linux - struct cdrom_msf msf; --#elif defined(__FreeBSD__) -+#else - struct ioc_play_msf msf; - #endif - -@@ -796,7 +799,7 @@ - msf.cdmsf_min1 = end / CDFRAMES_PERMIN; - msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; - msf.cdmsf_frame1 = end % CDFRAMES_PERSEC; --#elif defined(__FreeBSD__) -+#else - msf.start_m = start / CDFRAMES_PERMIN; - msf.start_s = (start % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; - msf.start_f = start % CDFRAMES_PERSEC; -@@ -804,23 +807,19 @@ - msf.end_s = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; - msf.end_f = end % CDFRAMES_PERSEC; - #endif -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMSTART --#elif defined(__FreeBSD__) -- CDIOCSTART -+ if (ioctl(wcda->unixdev, CDROMSTART)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOCSTART, NULL)) { - #endif -- )) { - WARN(cdaudio, "motor doesn't start !\n"); - return MCIERR_HARDWARE; - } -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMPLAYMSF --#elif defined(__FreeBSD__) -- CDIOCPLAYMSF -+ if (ioctl(wcda->unixdev, CDROMPLAYMSF, &msf)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOCPLAYMSF, &msf)) { - #endif -- , &msf)) { - WARN(cdaudio, "device doesn't play !\n"); - return MCIERR_HARDWARE; - } -@@ -828,7 +827,7 @@ - TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", - msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0, - msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); --#elif defined(__FreeBSD__) -+#else - TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", - msf.start_m, msf.start_s, msf.start_f, - msf.end_m, msf.end_s, msf.end_f); -@@ -854,20 +853,19 @@ - */ - static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMSTOP --#elif defined(__FreeBSD__) -- CDIOCSTOP -+ if (ioctl(wcda->unixdev, CDROMSTOP)) -+#else -+ if (ioctl(wcda->unixdev, CDIOCSTOP, NULL)) - #endif -- )) return MCIERR_HARDWARE; -+ return MCIERR_HARDWARE; - wcda->mciMode = MCI_MODE_STOP; - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); -@@ -885,20 +883,19 @@ - */ - static DWORD CDAUDIO_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMPAUSE --#elif defined(__FreeBSD__) -- CDIOCPAUSE -+ if (ioctl(wcda->unixdev, CDROMPAUSE)) -+#else -+ if (ioctl(wcda->unixdev, CDIOCPAUSE, NULL)) - #endif -- )) return MCIERR_HARDWARE; -+ return MCIERR_HARDWARE; - wcda->mciMode = MCI_MODE_PAUSE; - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); -@@ -916,20 +913,19 @@ - */ - static DWORD CDAUDIO_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); - - if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMRESUME --#elif defined(__FreeBSD__) -- CDIOCRESUME -+ if (ioctl(wcda->unixdev, CDROMRESUME)) -+#else -+ if (ioctl(wcda->unixdev, CDIOCRESUME, NULL)) - #endif -- )) return MCIERR_HARDWARE; -+ return MCIERR_HARDWARE; - wcda->mciMode = MCI_MODE_STOP; - if (lpParms && (dwFlags & MCI_NOTIFY)) { - TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); -@@ -947,7 +943,7 @@ - */ - static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - DWORD dwRet; - MCI_PLAY_PARMS PlayParms; - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); -@@ -957,13 +953,11 @@ - if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - -- if (ioctl(wcda->unixdev, - #ifdef linux -- CDROMRESUME --#elif defined(__FreeBSD__) -- CDIOCRESUME -+ if (ioctl(wcda->unixdev, CDROMRESUME)) { -+#else -+ if (ioctl(wcda->unixdev, CDIOCRESUME, NULL)) { - #endif -- )) { - perror("ioctl CDROMRESUME"); - return MCIERR_HARDWARE; - } -@@ -1004,16 +998,16 @@ - - if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - --#ifdef __FreeBSD__ -- if (ioctl(wcda->unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; -+ #if defined(__FreeBSD__) || defined(__NetBSD__) -+ if (ioctl(wcda->unixdev, CDIOCALLOW, NULL)) return MCIERR_HARDWARE; - if (open) { -- if (ioctl(wcda->unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; -+ if (ioctl(wcda->unixdev, CDIOCEJECT, NULL)) return MCIERR_HARDWARE; - wcda->mciMode = MCI_MODE_OPEN; - } else { -- if (ioctl(wcda->unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; -+ if (ioctl(wcda->unixdev, CDIOCCLOSE, NULL)) return MCIERR_HARDWARE; - wcda->mciMode = MCI_MODE_STOP; - } -- if (ioctl(wcda->unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -+ if (ioctl(wcda->unixdev, CDIOCPREVENT, NULL)) return MCIERR_HARDWARE; - #elif linux - if (open) { - if (ioctl(wcda->unixdev, CDROMEJECT)) return MCIERR_HARDWARE; -@@ -1032,7 +1026,7 @@ - */ - static DWORD CDAUDIO_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); - - TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); -@@ -1087,7 +1081,7 @@ - LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, - DWORD dwParam1, DWORD dwParam2) - { --#if defined(linux) || defined(__FreeBSD__) -+#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) - switch(wMsg) { - case DRV_LOAD: return 1; - case DRV_FREE: return 1; diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag deleted file mode 100644 index d34c1ed1c28..00000000000 --- a/emulators/wine/patches/patch-ag +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ag,v 1.2 1998/08/07 10:40:36 agc Exp $ - ---- multimedia/mmaux.c.orig Sun May 31 18:14:58 1998 -+++ multimedia/mmaux.c Wed Jun 17 00:56:12 1998 -@@ -16,11 +16,15 @@ - #include "mmsystem.h" - #include "debug.h" - -+#ifdef __NetBSD__ -+#include -+#else - #ifdef HAVE_SYS_SOUNDCARD_H - # include - #endif - #ifdef HAVE_MACHINE_SOUNDCARD_H - # include -+#endif - #endif - - #define MIXER_DEV "/dev/mixer" diff --git a/emulators/wine/patches/patch-ah b/emulators/wine/patches/patch-ah deleted file mode 100644 index 6d415c6e911..00000000000 --- a/emulators/wine/patches/patch-ah +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-ah,v 1.3 1998/12/14 02:17:11 tv Exp $ - ---- console/xterm.c.orig Sun Dec 13 08:49:50 1998 -+++ console/xterm.c Sun Dec 13 08:50:33 1998 -@@ -116,9 +116,9 @@ - *slave = fds; - - if (term != NULL) -- tcsetattr((*slave)->_fileno, TCSANOW, term); -+ tcsetattr(fileno(*slave), TCSANOW, term); - if (winsize != NULL) -- ioctl((*slave)->_fileno, TIOCSWINSZ, winsize); -+ ioctl(fileno(*slave), TIOCSWINSZ, winsize); - - if (name != NULL) - strcpy(name, pts_name); -@@ -143,8 +143,8 @@ - return FALSE; - - if ((*pid=fork()) == 0) { -- tcsetattr((*slave)->_fileno, TCSADRAIN, &term); -- sprintf(buf, "-Sxx%d", (*master)->_fileno); -+ tcsetattr(fileno(*slave), TCSADRAIN, &term); -+ sprintf(buf, "-Sxx%d", fileno(*master)); - execlp("xterm", "xterm", buf, NULL); - ERR(console, "error creating AllocConsole xterm\n"); - exit(1); -@@ -168,7 +168,7 @@ - } - } - term.c_lflag |= ECHO; -- tcsetattr((*master)->_fileno, TCSADRAIN, &term); -+ tcsetattr(fileno(*master), TCSADRAIN, &term); - - return TRUE; - } diff --git a/emulators/wine/patches/patch-ai b/emulators/wine/patches/patch-ai deleted file mode 100644 index c7efb34f411..00000000000 --- a/emulators/wine/patches/patch-ai +++ /dev/null @@ -1,49 +0,0 @@ -$NetBSD: patch-ai,v 1.3 1998/12/14 02:17:11 tv Exp $ - ---- multimedia/mcimidi.c.orig Sun Dec 13 11:14:40 1998 -+++ multimedia/mcimidi.c Sun Dec 13 11:18:04 1998 -@@ -72,6 +72,7 @@ - * MCI MIDI implemantation * - *======================================================================*/ - -+#ifndef __NetBSD__ - /************************************************************************** - * MIDI_mciGetOpenDev [internal] - */ -@@ -1461,6 +1462,7 @@ - } - return ret; - } -+#endif - - /*======================================================================* - * MIDI entry points * -@@ -1483,6 +1485,20 @@ - case DRV_CONFIGURE: MessageBox16(0, "Sample Midi Linux Driver !", "MMLinux Driver", MB_OK); return 1; - case DRV_INSTALL: return DRVCNF_RESTART; - case DRV_REMOVE: return DRVCNF_RESTART; -+#ifdef __NetBSD__ -+ case MCI_OPEN_DRIVER: -+ case MCI_CLOSE_DRIVER: -+ case MCI_PLAY: -+ case MCI_RECORD: -+ case MCI_STOP: -+ case MCI_SET: -+ case MCI_PAUSE: -+ case MCI_RESUME: -+ case MCI_STATUS: -+ case MCI_GETDEVCAPS: -+ case MCI_INFO: -+ case MCI_SEEK: -+#else - case MCI_OPEN_DRIVER: return MIDI_mciOpen (dwDevID, dwParam1, (LPMCI_OPEN_PARMS32A) dwParam2); - case MCI_CLOSE_DRIVER: return MIDI_mciClose (dwDevID, dwParam1, (LPMCI_GENERIC_PARMS) dwParam2); - case MCI_PLAY: return MIDI_mciPlay (dwDevID, dwParam1, (LPMCI_PLAY_PARMS) dwParam2); -@@ -1495,6 +1511,7 @@ - case MCI_GETDEVCAPS: return MIDI_mciGetDevCaps(dwDevID, dwParam1, (LPMCI_GETDEVCAPS_PARMS)dwParam2); - case MCI_INFO: return MIDI_mciInfo (dwDevID, dwParam1, (LPMCI_INFO_PARMS32A) dwParam2); - case MCI_SEEK: return MIDI_mciSeek (dwDevID, dwParam1, (LPMCI_SEEK_PARMS) dwParam2); -+#endif - case MCI_LOAD: - case MCI_SAVE: - case MCI_FREEZE: diff --git a/emulators/wine/patches/patch-aj b/emulators/wine/patches/patch-aj deleted file mode 100644 index 1ebede928da..00000000000 --- a/emulators/wine/patches/patch-aj +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-aj,v 1.3 1998/12/14 02:17:11 tv Exp $ - ---- multimedia/midi.c.orig Sun Dec 13 11:27:17 1998 -+++ multimedia/midi.c Sun Dec 13 11:31:30 1998 -@@ -108,7 +108,7 @@ - /*======================================================================* - * Low level MIDI implemantation * - *======================================================================*/ -- -+#ifndef __NetBSD__ - /************************************************************************** - * MIDI_NotifyClient [internal] - */ -@@ -1482,6 +1482,7 @@ - */ - return MMSYSERR_NOTENABLED; - } -+#endif - - /*======================================================================* - * MIDI entry points * -@@ -1497,6 +1498,7 @@ - wDevID, wMsg, dwUser, dwParam1, dwParam2); - - switch (wMsg) { -+#ifndef __NetBSD__ - case MODM_OPEN: - return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); - case MODM_CLOSE: -@@ -1519,6 +1521,7 @@ - return 0; - case MODM_RESET: - return modReset(wDevID); -+#endif - default: - TRACE(midi, "Unsupported message\n"); - } diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak deleted file mode 100644 index 260d0ca1083..00000000000 --- a/emulators/wine/patches/patch-ak +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ak,v 1.2 1998/08/07 10:40:36 agc Exp $ - ---- wine.ini.orig Sat May 30 17:29:40 1998 -+++ wine.ini Thu Jun 18 00:58:54 1998 -@@ -55,13 +55,13 @@ - Default = -adobe-times- - - [serialports] --Com1=/dev/cua0 --Com2=/dev/cua1 --Com3=/dev/modem,38400 --Com4=/dev/modem -+Com1=/dev/tty00 -+Com2=/dev/tty01 -+Com3=/dev/tty02 -+Com4=/dev/tty03 - - [parallelports] --Lpt1=/dev/lp0 -+Lpt1=/dev/lpt0 - - [spooler] - LPT1:=|lpr diff --git a/emulators/wine/patches/patch-al b/emulators/wine/patches/patch-al deleted file mode 100644 index 456dca7f251..00000000000 --- a/emulators/wine/patches/patch-al +++ /dev/null @@ -1,74 +0,0 @@ -$NetBSD: patch-al,v 1.3 1999/11/27 21:24:47 rh Exp $ - ---- configure.in.orig Fri Dec 11 14:26:26 1998 -+++ configure.in Sat Nov 27 22:21:24 1999 -@@ -83,6 +83,8 @@ - - dnl Check for -li386 for NetBSD and OpenBSD - AC_CHECK_LIB(i386,i386_set_ldt) -+dnl Check for -lossaudio for NetBSD -+AC_CHECK_LIB(ossaudio,main) - dnl Check for -lw for Solaris - AC_CHECK_LIB(w,iswalnum) - dnl Check for -lnsl for Solaris -@@ -132,7 +134,13 @@ - #if !defined(SNDCTL_DSP_STEREO) - #error No open sound system - #endif --],ac_cv_c_opensoundsystem="yes",ac_cv_c_opensoundsystem="no")) -+],ac_cv_c_opensoundsystem="yes", -+ AC_TRY_COMPILE([#include ],[ -+/* check for one of the Open Sound System specific SNDCTL_ defines */ -+#if !defined(SNDCTL_DSP_STEREO) -+#error No open sound system -+#endif -+],ac_cv_c_opensoundsystem="yes",ac_cv_c_opensoundsystem="no"))) - - if test "$ac_cv_c_opensoundsystem" = "yes" - then -@@ -214,23 +222,40 @@ - dnl **** Check for working dll **** - - DLLFLAGS="" -+LDSHARE="" - if test "$LIB_TARGET" = "libwine.so.1.0" - then -- AC_CACHE_CHECK("whether we can build a dll", -- ac_cv_c_dll, -+ AC_CACHE_CHECK("whether we can build a Linux dll", -+ ac_cv_c_dll_linux, - [saved_cflags=$CFLAGS - CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0" -- AC_TRY_LINK(,[return 1],ac_cv_c_dll="yes",ac_cv_c_dll="no") -+ AC_TRY_LINK(,[return 1],ac_cv_c_dll_linux="yes",ac_cv_c_dll_linux="no") -+ CFLAGS=$saved_cflags -+ ]) -+ if test "$ac_cv_c_dll_linux" = "yes" -+ then -+ DLLFLAGS="-fPIC" -+ LDSHARE="$$(CC) -shared -Wl,-soname,libwine.so" -+ fi -+ AC_CACHE_CHECK("whether we can build a NetBSD dll", -+ ac_cv_c_dll_netbsd, -+ [saved_cflags=$CFLAGS -+ CFLAGS="$CFLAGS -fPIC -Bshareable -Bforcearchive" -+ AC_TRY_LINK(,[return 1],ac_cv_c_dll_netbsd="yes",ac_cv_c_dll_netbsd="no") - CFLAGS=$saved_cflags - ]) -- if test "$ac_cv_c_dll" = "yes" -+ if test "$ac_cv_c_dll_netbsd" = "yes" - then - DLLFLAGS="-fPIC" -- else -+ LDSHARE="ld -Bshareable -Bforcearchive" -+ fi -+ if test "$ac_cv_c_dll_linux" = "no" -a "$ac_cv_c_dll_netbsd" = "no" -+ then - LIB_TARGET="libwine.a" - fi - fi - AC_SUBST(DLLFLAGS) -+AC_SUBST(LDSHARE) - - dnl **** Check for reentrant libc **** - dnl diff --git a/emulators/wine/patches/patch-am b/emulators/wine/patches/patch-am deleted file mode 100644 index 8a4ef07fc78..00000000000 --- a/emulators/wine/patches/patch-am +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-am,v 1.3 1998/12/14 02:17:11 tv Exp $ - ---- multimedia/init.c.orig Sun Oct 11 10:15:36 1998 -+++ multimedia/init.c Sun Dec 13 01:14:24 1998 -@@ -36,6 +36,7 @@ - #ifdef HAVE_OSS - int unixToWindowsDeviceType(int type) - { -+#ifndef __NetBSD__ - /* MOD_MIDIPORT output port - * MOD_SYNTH generic internal synth - * MOD_SQSYNTH square wave internal synth -@@ -55,6 +56,9 @@ - "Assuming FM Synth\n"); - return MOD_FMSYNTH; - } -+#else -+ return MOD_FMSYNTH; -+#endif - } - #endif - -@@ -66,7 +70,7 @@ - */ - BOOL32 MULTIMEDIA_MidiInit(void) - { --#ifdef HAVE_OSS -+#if defined(HAVE_OSS) && !defined(__NetBSD__) - int i, status, numsynthdevs = 255, nummididevs = 255; - struct synth_info sinfo; - struct midi_info minfo; diff --git a/emulators/wine/patches/patch-an b/emulators/wine/patches/patch-an deleted file mode 100644 index f74d9b8b80f..00000000000 --- a/emulators/wine/patches/patch-an +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-an,v 1.2 1998/08/07 10:40:37 agc Exp $ - ---- multimedia/mixer.c.orig Sun May 31 18:14:57 1998 -+++ multimedia/mixer.c Fri Jun 19 00:36:57 1998 -@@ -14,11 +14,15 @@ - #include "mmsystem.h" - #include "debug.h" - -+#ifdef __NetBSD__ -+#include -+#else - #ifdef HAVE_SYS_SOUNDCARD_H - # include - #endif - #ifdef HAVE_MACHINE_SOUNDCARD_H - # include -+#endif - #endif - - #define MIXER_DEV "/dev/mixer" diff --git a/emulators/wine/patches/patch-ao b/emulators/wine/patches/patch-ao deleted file mode 100644 index a4768ccd152..00000000000 --- a/emulators/wine/patches/patch-ao +++ /dev/null @@ -1,162 +0,0 @@ -$NetBSD: patch-ao,v 1.1 1998/12/14 02:17:11 tv Exp $ - ---- ole/variant.c.orig Sun Dec 13 12:04:14 1998 -+++ ole/variant.c Sun Dec 13 12:11:16 1998 -@@ -32,6 +32,8 @@ - #include - - -+#undef CHAR_MAX -+#undef CHAR_MIN - static const char CHAR_MAX = 127; - static const char CHAR_MIN = -128; - static const BYTE UI1_MAX = 255; -@@ -40,10 +42,10 @@ - static const unsigned short UI2_MIN = 0; - static const short I2_MAX = 32767; - static const short I2_MIN = -32768; --static const unsigned long UI4_MAX = 4294967295; -+static const unsigned long UI4_MAX = 4294967295UL; - static const unsigned long UI4_MIN = 0; - static const long I4_MAX = 2147483647; --static const long I4_MIN = -2147483648; -+static const long I4_MIN = -(2147483648UL); - static const DATE DATE_MIN = -657434; - static const DATE DATE_MAX = 2958465; - -@@ -1768,7 +1770,7 @@ - * Convert currency to unsigned char - */ - HRESULT WINAPI VarUI1FromCy32(CY cyIn, BYTE* pbOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > UI1_MAX || t < UI1_MIN) return DISP_E_OVERFLOW; - -@@ -1974,7 +1976,7 @@ - * Convert currency to signed short - */ - HRESULT WINAPI VarI2FromCy32(CY cyIn, short* psOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > I2_MAX || t < I2_MIN) return DISP_E_OVERFLOW; - -@@ -2167,7 +2169,7 @@ - * Convert currency to signed long - */ - HRESULT WINAPI VarI4FromCy32(CY cyIn, LONG* plOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > I4_MAX || t < I4_MIN) return DISP_E_OVERFLOW; - -@@ -2341,7 +2343,7 @@ - * Convert currency to float - */ - HRESULT WINAPI VarR4FromCy32(CY cyIn, FLOAT* pfltOut) { -- *pfltOut = (FLOAT)((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ *pfltOut = (FLOAT)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - return S_OK; - } -@@ -2491,7 +2493,7 @@ - * Convert currency to double - */ - HRESULT WINAPI VarR8FromCy32(CY cyIn, double* pdblOut) { -- *pdblOut = (double)((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ *pdblOut = (double)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - return S_OK; - } -@@ -2674,7 +2676,7 @@ - * Convert currency to date - */ - HRESULT WINAPI VarDateFromCy32(CY cyIn, DATE* pdateOut) { -- *pdateOut = (DATE)((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ *pdateOut = (DATE)((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (*pdateOut > DATE_MAX || *pdateOut < DATE_MIN) return DISP_E_TYPEMISMATCH; - return S_OK; -@@ -3384,7 +3386,7 @@ - * Convert currency to signed char - */ - HRESULT WINAPI VarI1FromCy32(CY cyIn, CHAR* pcOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > CHAR_MAX || t < CHAR_MIN) return DISP_E_OVERFLOW; - -@@ -3618,7 +3620,7 @@ - * Convert currency to unsigned short - */ - HRESULT WINAPI VarUI2FromCy32(CY cyIn, USHORT* pusOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > UI2_MAX || t < UI2_MIN) return DISP_E_OVERFLOW; - -@@ -3766,7 +3768,7 @@ - * Convert currency to unsigned long - */ - HRESULT WINAPI VarUI4FromCy32(CY cyIn, ULONG* pulOut) { -- double t = round((((double)cyIn.u.Hi * 4294967296) + (double)cyIn.u.Lo) / 10000); -+ double t = round((((double)cyIn.u.Hi * 4294967296.0) + (double)cyIn.u.Lo) / 10000); - - if (t > UI4_MAX || t < UI4_MIN) return DISP_E_OVERFLOW; - -@@ -3804,8 +3806,8 @@ - */ - HRESULT WINAPI VarCyFromI432(LONG lIn, CY* pcyOut) { - double t = (double)lIn * (double)10000; -- pcyOut->u.Hi = (LONG)(t / (double)4294967296); -- pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296); -+ pcyOut->u.Hi = (LONG)(t / (double)4294967296.0); -+ pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0); - if (lIn < 0) pcyOut->u.Hi--; - - return S_OK; -@@ -3817,8 +3819,8 @@ - */ - HRESULT WINAPI VarCyFromR432(FLOAT fltIn, CY* pcyOut) { - double t = round((double)fltIn * (double)10000); -- pcyOut->u.Hi = (LONG)(t / (double)4294967296); -- pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296); -+ pcyOut->u.Hi = (LONG)(t / (double)4294967296.0); -+ pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0); - if (fltIn < 0) pcyOut->u.Hi--; - - return S_OK; -@@ -3830,8 +3832,8 @@ - */ - HRESULT WINAPI VarCyFromR832(double dblIn, CY* pcyOut) { - double t = round(dblIn * (double)10000); -- pcyOut->u.Hi = (LONG)(t / (double)4294967296); -- pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296); -+ pcyOut->u.Hi = (LONG)(t / (double)4294967296.0); -+ pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0); - if (dblIn < 0) pcyOut->u.Hi--; - - return S_OK; -@@ -3843,8 +3845,8 @@ - */ - HRESULT WINAPI VarCyFromDate32(DATE dateIn, CY* pcyOut) { - double t = round((double)dateIn * (double)10000); -- pcyOut->u.Hi = (LONG)(t / (double)4294967296); -- pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296); -+ pcyOut->u.Hi = (LONG)(t / (double)4294967296.0); -+ pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0); - if (dateIn < 0) pcyOut->u.Hi--; - - return S_OK; -@@ -3891,8 +3893,8 @@ - */ - HRESULT WINAPI VarCyFromUI432(ULONG ulIn, CY* pcyOut) { - double t = (double)ulIn * (double)10000; -- pcyOut->u.Hi = (LONG)(t / (double)4294967296); -- pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296); -+ pcyOut->u.Hi = (LONG)(t / (double)4294967296.0); -+ pcyOut->u.Lo = (ULONG)fmod(t, (double)4294967296.0); - - return S_OK; - } diff --git a/emulators/wine/patches/patch-ap b/emulators/wine/patches/patch-ap deleted file mode 100644 index 54377cbe587..00000000000 --- a/emulators/wine/patches/patch-ap +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ap,v 1.1 1998/12/14 02:17:12 tv Exp $ - ---- graphics/psdrv/Makefile.in.orig Sun Dec 13 17:23:30 1998 -+++ graphics/psdrv/Makefile.in Sun Dec 13 17:23:46 1998 -@@ -1,4 +1,4 @@ --DEFS = -D__WINE__ -+DEFS = @DLLFLAGS@ -D__WINE__ - TOPSRCDIR = @top_srcdir@ - TOPOBJDIR = ../.. - SRCDIR = @srcdir@ diff --git a/emulators/wine/patches/patch-aq b/emulators/wine/patches/patch-aq deleted file mode 100644 index 109a6b7134e..00000000000 --- a/emulators/wine/patches/patch-aq +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aq,v 1.1 1998/12/14 02:17:12 tv Exp $ - ---- tools/wrc/writeres.c.orig Sun Dec 13 18:00:43 1998 -+++ tools/wrc/writeres.c Sun Dec 13 18:01:11 1998 -@@ -43,8 +43,7 @@ - #endif - "\taddl\t$4,%%esp\n" - "\tret\n\n" -- "\t.section .ctors,\"aw\"\n" -- "\t.long\t.LAuto_Register\n\n" -+ ".stabs \"___CTOR_LIST__\",22,0,0,.LAuto_Register\n\n" - ; - - char h_file_head_str[] = -- cgit v1.2.3