head 1.30; access; symbols pkgsrc-2013Q2:1.30.0.8 pkgsrc-2013Q2-base:1.30 pkgsrc-2012Q4:1.30.0.6 pkgsrc-2012Q4-base:1.30 pkgsrc-2011Q4:1.30.0.4 pkgsrc-2011Q4-base:1.30 pkgsrc-2011Q2:1.30.0.2 pkgsrc-2011Q2-base:1.30 pkgsrc-2011Q1:1.29.0.28 pkgsrc-2011Q1-base:1.29 pkgsrc-2010Q4:1.29.0.26 pkgsrc-2010Q4-base:1.29 pkgsrc-2010Q3:1.29.0.24 pkgsrc-2010Q3-base:1.29 pkgsrc-2010Q2:1.29.0.22 pkgsrc-2010Q2-base:1.29 pkgsrc-2010Q1:1.29.0.20 pkgsrc-2010Q1-base:1.29 pkgsrc-2009Q4:1.29.0.18 pkgsrc-2009Q4-base:1.29 pkgsrc-2009Q3:1.29.0.16 pkgsrc-2009Q3-base:1.29 pkgsrc-2009Q2:1.29.0.14 pkgsrc-2009Q2-base:1.29 pkgsrc-2009Q1:1.29.0.12 pkgsrc-2009Q1-base:1.29 pkgsrc-2008Q4:1.29.0.10 pkgsrc-2008Q4-base:1.29 pkgsrc-2008Q3:1.29.0.8 pkgsrc-2008Q3-base:1.29 cube-native-xorg:1.29.0.6 cube-native-xorg-base:1.29 pkgsrc-2008Q2:1.29.0.4 pkgsrc-2008Q2-base:1.29 cwrapper:1.29.0.2 pkgsrc-2008Q1:1.28.0.6 pkgsrc-2008Q1-base:1.28 pkgsrc-2007Q4:1.28.0.4 pkgsrc-2007Q4-base:1.28 pkgsrc-2007Q3:1.28.0.2 pkgsrc-2007Q3-base:1.28 pkgsrc-2007Q2:1.27.0.4 pkgsrc-2007Q2-base:1.27 pkgsrc-2007Q1:1.27.0.2 pkgsrc-2007Q1-base:1.27 pkgsrc-2006Q4:1.24.0.2 pkgsrc-2006Q4-base:1.24 pkgsrc-2006Q3:1.22.0.2 pkgsrc-2006Q3-base:1.22 pkgsrc-2006Q2:1.21.0.2 pkgsrc-2006Q2-base:1.21 pkgsrc-2006Q1:1.20.0.2 pkgsrc-2006Q1-base:1.20 pkgsrc-2005Q4:1.18.0.2 pkgsrc-2005Q4-base:1.18 pkgsrc-2005Q3:1.17.0.2 pkgsrc-2005Q3-base:1.17 pkgsrc-2005Q2:1.15.0.2 pkgsrc-2005Q2-base:1.15 pkgsrc-2005Q1:1.14.0.2 pkgsrc-2005Q1-base:1.14 pkgsrc-2004Q4:1.13.0.6 pkgsrc-2004Q4-base:1.13 pkgsrc-2004Q3:1.13.0.4 pkgsrc-2004Q3-base:1.13 pkgsrc-2004Q2:1.13.0.2 pkgsrc-2004Q2-base:1.13 pkgsrc-2004Q1:1.12.0.2 pkgsrc-2004Q1-base:1.12 pkgsrc-2003Q4:1.10.0.2 pkgsrc-2003Q4-base:1.10 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-PATCH001:1.5 netbsd-1-5-RELEASE:1.5 netbsd-1-4-PATCH003:1.5 netbsd-1-4-PATCH002:1.5 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.4 netbsd-1-3-PATCH002:1.2; locks; strict; comment @# @; 1.30 date 2011.05.04.20.31.40; author adam; state dead; branches; next 1.29; 1.29 date 2008.06.22.23.38.18; author dholland; state Exp; branches; next 1.28; 1.28 date 2007.07.01.10.04.26; author adam; state Exp; branches; next 1.27; 1.27 date 2007.03.17.23.07.58; author adam; state Exp; branches; next 1.26; 1.26 date 2007.02.17.10.19.38; author adam; state Exp; branches; next 1.25; 1.25 date 2007.01.10.09.09.49; author adam; state Exp; branches; next 1.24; 1.24 date 2006.10.29.20.03.58; author adam; state Exp; branches; next 1.23; 1.23 date 2006.10.18.20.37.21; author adam; state Exp; branches; next 1.22; 1.22 date 2006.07.28.13.04.35; author adam; state Exp; branches; next 1.21; 1.21 date 2006.06.12.09.07.22; author adam; state Exp; branches; next 1.20; 1.20 date 2006.03.06.13.46.01; author adam; state Exp; branches; next 1.19; 1.19 date 2006.01.20.14.58.18; author adam; state Exp; branches; next 1.18; 1.18 date 2005.10.10.08.32.23; author adam; state Exp; branches; next 1.17; 1.17 date 2005.09.07.14.28.38; author adam; state Exp; branches; next 1.16; 1.16 date 2005.07.26.13.24.36; author adam; state Exp; branches; next 1.15; 1.15 date 2005.05.25.08.23.43; author adam; state Exp; branches; next 1.14; 1.14 date 2005.01.14.13.00.05; author adam; state Exp; branches; next 1.13; 1.13 date 2004.04.09.12.44.22; author adam; state Exp; branches; next 1.12; 1.12 date 2004.03.12.11.13.48; author adam; state Exp; branches; next 1.11; 1.11 date 2004.02.16.14.06.58; author adam; state Exp; branches; next 1.10; 1.10 date 2003.10.17.13.54.18; author adam; state Exp; branches; next 1.9; 1.9 date 2003.09.15.10.51.38; author adam; state Exp; branches; next 1.8; 1.8 date 2003.06.23.08.12.59; author adam; state Exp; branches; next 1.7; 1.7 date 2002.10.10.10.48.21; author junyoung; state Exp; branches; next 1.6; 1.6 date 2002.03.15.04.10.20; author junyoung; state Exp; branches; next 1.5; 1.5 date 99.11.27.21.24.47; author rh; state Exp; branches; next 1.4; 1.4 date 98.08.07.10.40.35; author agc; state Exp; branches; next 1.3; 1.3 date 98.06.18.23.48.53; author tron; state Exp; branches; next 1.2; 1.2 date 98.03.16.04.53.22; author mycroft; state Exp; branches; next 1.1; 1.1 date 98.03.16.03.30.46; author mycroft; state Exp; branches; next ; desc @@ 1.30 log @Changes 1.2.3: * Translation updates * Various bug fixes @ text @$NetBSD: patch-aa,v 1.29 2008/06/22 23:38:18 dholland Exp $ --- Make.rules.in.orig 2008-06-17 10:07:31.000000000 -0400 +++ Make.rules.in 2008-06-22 12:22:40.000000000 -0400 @@@@ -120,7 +120,7 @@@@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc) -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS) +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) RCOBJS = $(RC_SRCS:.rc=.res.o) LINTS = $(C_SRCS:.c=.ln) @ 1.29 log @Update emulators/wine to 1.0, as requested in PR pkg/38985. Add missing dep on libxml2. Also merge some stuff from wip/wine: - more options (esound, ldap, dbus, ssl, x11) - split PLIST to accomodate extra files on Linux and FreeBSD (PR pkg/36320) This also fixes the broken build against current openldap. (PR pkg/38025) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.28 2007/07/01 10:04:26 adam Exp $ @ 1.28 log @Changes 0.9.40: - Many MSHTML improvements - A few more sound fixes - Many Direct3D fixes - Lots of bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 5 --- Make.rules.in.orig 2007-06-29 19:36:20.000000000 +0200 +++ Make.rules.in @@@@ -119,7 +119,7 @@@@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_ $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) \ $(MC_SRCS:.mc=.mc.rc) $(RC_SRCS:.rc=.res) $(RC_SRCS16:.rc=.res) @ 1.27 log @Changes 0.9.33: - Many Direct3D fixes and performance improvements. - More comctl32 tests and some bug fixes. - Compatibility improvements in cmd.exe. - Still more fixes to builtin OLE. - Support for process control on Solaris. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2007-03-16 17:40:46.000000000 +0100 d5 1 a5 1 @@@@ -118,7 +118,7 @@@@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_ @ 1.26 log @Changes 0.9.31: - Many Direct3D fixes and performance improvements. - Several new comctl32 test cases. - IDL compiler improvements. - More OLE32 marshalling fixes. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2007-02-16 15:48:13.000000000 +0100 d5 1 a5 1 @@@@ -119,7 +119,7 @@@@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_ @ 1.25 log @Changes 0.9.29: - More work on the new Direct3D state management. - Debugger support for Mac OS. - Many OLE fixes and improvements. - Audio input support on Mac OS. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2007-01-09 16:42:47.000000000 +0100 d5 1 a5 1 @@@@ -117,7 +117,7 @@@@ CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_ @ 1.24 log @Changes 0.9.24: - Support for multiple monitors using Xinerama. - Various MSI fixes and improvements. - A ton of memory leaks fixed. - Many common controls fixes. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2006-10-27 17:20:13.000000000 +0200 d5 3 a7 2 @@@@ -112,7 +112,7 @@@@ CLEAN_FILES = *.o *.a *.so *.ln *.$( *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core a8 1 IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) @ 1.23 log @Changes 0.9.23: - Massive update of printf formats for Win64 compatibility. - Dynamic drive support on MacOSX. - Still more MSI fixes and improvements. - Lots of bug fixes. Changes 0.9.22: - The usual assortment of MSI improvements. - Several bug fixes to the various common controls. - Pixel shaders enabled by default in D3D. - Various improvements to the build process. - Many translation updates. - Lots of bug fixes. Changes 0.9.20: - XEmbed system tray support. - Many improvements to NTLM support. - Many messages made localizable instead of hardcoded to English. - Improved support for various OpenGL platforms. - More improvements to the IDL compiler. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2006-09-13 21:10:25.000000000 +0200 d5 1 a5 2 @@@@ -111,7 +111,7 @@@@ conf_manext = 5 CLEAN_FILES = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \ d8 3 a10 2 -OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS) +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) @ 1.22 log @Changes 0.9.18: - Still more work on Direct3D. - A lot of MSI bug fixes and improvements. - More compatible memory management. - Several fixes for Win64 support. - Some performance improvements. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2006-07-27 16:55:50.000000000 +0200 d5 1 a5 1 @@@@ -110,7 +110,7 @@@@ conf_manext = 5 d7 1 a7 1 *.flc *.tab.c *.tab.h @@LEX_OUTPUT_ROOT@@.c core d9 2 a10 2 -OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS) +OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) @ 1.21 log @Changes 0.9.15: - More MS/RPC improvements. - Core Audio driver for Mac OS X. - More complete DNSAPI dll. - Improvements to Web browser support. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2006-06-08 17:06:37.000000000 +0200 d5 1 a5 1 @@@@ -111,7 +111,7 @@@@ conf_manext = 5 @ 1.20 log @Changes 0.9.9: - Many new features and improvements in Richedit. - More Web browser support. - Recursive directory change notifications. - Wine installation is now fully relocatable. - Direct3D 8 and 9 now use the same code. - Many debugger improvements. - Systray is now handled by the explorer process. - Lots of bug fixes @ text @d3 1 a3 1 --- Make.rules.in.orig 2006-03-02 18:16:51.000000000 +0100 d5 1 a5 1 @@@@ -110,7 +110,7 @@@@ conf_manext = 5 @ 1.19 log @Changes 0.9.6: - A bunch of OLE fixes and improvements. - DirectSound improvements, including full duplex support. - Fix for the Windows metafile vulnerability. - Many static control improvements. - Some fixes for copy protection support. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2005-10-06 18:06:04.000000000 +0200 d5 1 a5 1 @@@@ -109,7 +109,7 @@@@ conf_manext = 5 @ 1.18 log @Changes 20050930: - Joystick force feedback support. - Beginnings of Win64 support. - Many MSI fixes and cleanups. - Font linking support. - Several OLE fixes. - Some fixes for MacOS/x86. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2005-09-28 18:34:01.000000000 +0000 @ 1.17 log @Changes 20050830: - A lot more theming support. - Many improvements to the various crypto dlls. - More LDAP support. - Beginnings of an MSXML implementation. - Better MSHTML support. - Emulated version now set to Windows 2000 by default. - Direct3D fixes and improvements. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2005-08-11 17:12:19.000000000 +0000 d7 1 a7 1 *.flc *.spec.c *.dbg.c *.tab.c *.tab.h @@LEX_OUTPUT_ROOT@@.c core @ 1.16 log @Changes 20050725: * Beginnings of theme support in common controls. * Many MSHTML improvements. * A bunch of OLE fixes for InstallShield installers. * Many Direct3D fixes and improvements. * Beginnings of LDAP support. * Various cleanups after removal of the config file. * Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2005-07-20 17:48:26.000000000 +0000 d5 1 a5 1 @@@@ -107,7 +107,7 @@@@ conf_manext = 5 @ 1.15 log @Changes 20050419: - Mailslot support. - Support for side mouse buttons (X buttons). - More Richedit improvements. - Loading of Windows registry files disabled for now. - Many code cleanups. - Lots of bug fixes. Changes 20050524: - Many MSI improvements. - More features in the file manager. - Better compatibility for Winelib import libraries. - SGML documentation moved out of the source tree. - Header files cleanups. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2005-05-07 12:39:58.000000000 +0000 @ 1.14 log @Changes 20050111: - Many OLE bug fixes and improvements. - A lot more work on the MSI dll. - Update regions now handled in the Wine server. - Beginnings of typelib generation in the IDL compiler. - Many janitorial cleanups. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2004-09-13 18:14:55.000000000 +0000 d5 1 a5 1 @@@@ -106,7 +106,7 @@@@ conf_manext = 5 d7 1 a7 1 *.flc *.spec.c *.spec.def *.dbg.c *.tab.c *.tab.h @@LEX_OUTPUT_ROOT@@.c core @ 1.13 log @Changes 20040408: * DOS devices and drives are now configured through symlinks. * Many shell32 improvements. * New task manager merged from ReactOS. * First version of wineprefixcreate tool for initial setup. * Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2004-03-24 03:34:01.000000000 +0000 d5 1 a5 1 @@@@ -103,7 +103,7 @@@@ conf_manext = 5 @ 1.12 log @Changes 20040309: * Much improved winegcc tool, now used to build Wine itself. * VxDs are now separate libraries for better modularity. * Improvements and simplifications to the drive configuration. * New setupapi INF script to create the initial registry. * Many improvements to the various multimedia dlls. * Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2004-03-03 20:30:46.000000000 +0000 d5 1 a5 1 @@@@ -105,7 +105,7 @@@@ conf_manext = 5 d7 1 a7 1 *.flc *.spec.c *.spec.def *.dbg.c y.tab.c y.tab.h @@LEX_OUTPUT_ROOT@@.c core @ 1.11 log @Changes 20040213: - Improved support for screen resolution changes. - More shell32 improvements. - Several Winelib compatibility fixes. - Beginnings of support for typelib creation. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2004-01-27 00:11:18.000000000 +0000 d5 1 a5 1 @@@@ -104,7 +104,7 @@@@ conf_manext = 5 @ 1.10 log @WHAT'S NEW with Wine-20031016: (see ChangeLog for details) - Support for the Xrandr extension. - Dll separation of kernel and ntdll is finished. - Many enhanced metafile improvements. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2003-10-11 03:05:18.000000000 +0200 d5 1 a5 1 @@@@ -105,7 +105,7 @@@@ conf_manext = 5 @ 1.9 log @Changes 20030911: - Many improvements to the winecfg configuration tool. - Massive header files cleanup for better source compatibility. - Some more progress on the kernel/ntdll separation. - Lots of bug fixes. Changes 20030813: - Partial implementation of the Microsoft Installer (msi.dll). - GUI for regedit (from ReactOS). - DirectMusic dlls reorganization. - Many Wininet improvements. - Lots of bug fixes. @ text @d3 1 a3 1 --- Make.rules.in.orig 2003-08-23 02:45:21.000000000 +0200 d5 1 a5 1 @@@@ -102,7 +102,7 @@@@ conf_manext = 5 @ 1.8 log @Updated to wine-20030618 @ text @d3 3 a5 3 --- Make.rules.in.orig 2003-06-14 01:26:02.000000000 +0200 +++ Make.rules.in 2003-06-19 11:33:36.000000000 +0200 @@@@ -102,7 +102,7 @@@@ d7 1 a7 1 *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @@LEX_OUTPUT_ROOT@@.c core @ 1.7 log @Update to 20021007 snapshot. Changes include: WHAT'S NEW with Wine-20021007: (see ChangeLog for details) - Massive listview rewrite. - New MS RLE codec. - winemaker should be working again. - Beginnings of Direct3D 8 support. - Lots of bug fixes. WHAT'S NEW with Wine-20020904: (see ChangeLog for details) - Much improved PowerPC support. - More correct locale definitions. - Progress on the conversion of handle types to pointers. - Many Visio and Quicken fixes merged from Crossover. - Lots of bug fixes. @ text @d3 3 a5 12 --- Make.rules.in.orig Wed Oct 2 11:34:09 2002 +++ Make.rules.in Thu Oct 10 19:01:06 2002 @@@@ -26,7 +26,7 @@@@ CPP = @@CPP@@ CFLAGS = @@CFLAGS@@ $(EXTRACFLAGS) OPTIONS = @@OPTIONS@@ -D_REENTRANT -LIBS = @@LIBS@@ +LIBS = @@LIBS@@ -lc YACC = @@YACC@@ LEX = @@LEX@@ LEXLIB = @@LEXLIB@@ @@@@ -98,7 +98,7 @@@@ @ 1.6 log @Update Wine to 20020228 snapshot. @ text @d3 6 a8 6 --- 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@@ d14 9 @ 1.5 log @defuzz @ text @d3 11 a13 10 --- 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 @ 1.4 log @Add NetBSD RCS Ids. @ text @d3 2 a4 2 --- Make.rules.in.orig Sun Jan 18 12:50:38 1998 +++ Make.rules.in Sun Mar 15 23:30:47 1998 d12 1 a12 1 MKDIR = mkdir @ 1.3 log @Update Wine to 14-Jun-98 snapshot. XXX Audio support is probably broken due to massive use of unsupported XXX Linux stuff in the OSS interface which I commented out. However XXX I don't have an application to test it. @ text @d1 2 @ 1.2 log @Build libwine shared. Port some of the audio stuff. @ text @a10 1389 --- Makefile.in.orig Sun Feb 15 14:20:52 1998 +++ Makefile.in Sun Mar 15 23:37:10 1998 @@@@ -108,7 +108,7 @@@@ lib: $(LIBSUBDIRS) $(LIB_TARGET) wine wine.sym: $(LIBSUBDIRS) $(LIB_TARGET) $(EMUSUBDIRS) dummy - $(CC) -o wine $(EMUOBJS) $(LIB_TARGET) $(LDOPTIONS) $(X_LIBS) $(XPM_LIB) $(XLIB) $(LIBS) + $(CC) -o wine $(EMUOBJS) -L. -lwine $(LDOPTIONS) $(X_LIBS) $(XPM_LIB) $(XLIB) $(LIBS) nm -n wine | grep -v _compiled >wine.sym libwine.a: $(LIBOBJS) @@@@ -117,7 +117,7 @@@@ $(RANLIB) $@@ libwine.so.1.0: $(LIBOBJS) - $(CC) -shared -Wl,-soname,libwine.so -o$@@ $(LIBOBJS) $(LDOPTIONS) $(X_LIBS) $(XPM_LIB) $(XLIB) $(LIBS) + ${LDSHARE} -o$@@ $(LIBOBJS) $(LDOPTIONS) install_emu: install_lib $(INSTALL_PROGRAM) wine $(bindir)/wine --- configure.orig Sun Feb 1 13:17:43 1998 +++ configure Sun Mar 15 23:30:55 1998 @@@@ -1936,8 +1936,51 @@@@ echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 +echo "configure:1941: 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:1941: checking for iswalnum in -lw" >&5 +echo "configure:1984: 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 @@@@ -1945,7 +1988,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -1984,7 +2027,7 @@@@ fi echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 -echo "configure:1988: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 +echo "configure:2031: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@@@ -1992,7 +2035,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@@@ -2029,12 +2072,12 @@@@ echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 -echo "configure:2033: checking "for Open Sound System"" >&5 +echo "configure:2076: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@@@ -2046,7 +2089,27 @@@@ ; return 0; } EOF -if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2093: \"$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:2113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" else @@@@ -2057,6 +2120,8 @@@@ fi rm -f conftest* fi +rm -f conftest* +fi echo "$ac_t""$ac_cv_c_opensoundsystem" 1>&6 @@@@ -2070,12 +2135,12 @@@@ echo $ac_n "checking "for union semun"""... $ac_c" 1>&6 -echo "configure:2074: checking "for union semun"" >&5 +echo "configure:2139: checking "for union semun"" >&5 if eval "test \"`echo '$''{'ac_cv_c_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2083,7 +2148,7 @@@@ union semun foo ; return 0; } EOF -if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2152: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_union_semun="yes" else @@@@ -2111,7 +2176,7 @@@@ then CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 -echo "configure:2115: checking "for gcc strength-reduce bug"" >&5 +echo "configure:2180: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -2119,7 +2184,7 @@@@ ac_cv_c_gcc_strength_bug="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" else @@@@ -2153,7 +2218,7 @@@@ echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 -echo "configure:2157: checking "whether external symbols need an underscore prefix"" >&5 +echo "configure:2222: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -2165,14 +2230,14 @@@@ .long 0 EOF cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_extern_prefix="yes" else @@@@ -2196,7 +2261,7 @@@@ echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 -echo "configure:2200: checking "whether assembler accepts .string"" >&5 +echo "configure:2265: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@@@ -2206,14 +2271,14 @@@@ .string "test" EOF cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_asm_string="yes" else @@@@ -2237,57 +2302,97 @@@@ 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:2244: 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:2310: 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:2324: \"$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:2345: 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 + for ac_func in clone memmove strerror tcgetattr usleep wait4 waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2286: checking for $ac_func" >&5 +echo "configure:2391: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@@@ -2338,17 +2443,17 @@@@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2342: checking for $ac_hdr" >&5 +echo "configure:2447: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2457: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2375,12 +2480,12 @@@@ done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:2379: checking whether stat file-mode macros are broken" >&5 +echo "configure:2484: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2431,12 +2536,12 @@@@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2435: checking for working const" >&5 +echo "configure:2540: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2594: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@@@ -2506,12 +2611,12 @@@@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2510: checking for ANSI C header files" >&5 +echo "configure:2615: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -2519,7 +2624,7 @@@@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@@@ -2536,7 +2641,7 @@@@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -2554,7 +2659,7 @@@@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -2575,7 +2680,7 @@@@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@@@ -2586,7 +2691,7 @@@@ exit (0); } EOF -if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@@@ -2610,12 +2715,12 @@@@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2614: checking for size_t" >&5 +echo "configure:2719: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@@@ -2832,6 +2937,7 @@@@ s%@@INSTALL_DATA@@%$INSTALL_DATA%g s%@@LN_S@@%$LN_S%g s%@@DLLFLAGS@@%$DLLFLAGS%g +s%@@LDSHARE@@%$LDSHARE%g /@@MAKE_RULES@@/r $MAKE_RULES s%@@MAKE_RULES@@%%g --- configure.in.orig Sun Feb 1 13:17:43 1998 +++ configure.in Sun Mar 15 23:29:53 1998 @@@@ -48,6 +48,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 XFree86 DGA extension @@@@ -62,7 +64,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 @@@@ -144,23 +152,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 functions and header files **** --- multimedia/audio.c.orig Sun Jan 18 12:50:41 1998 +++ multimedia/audio.c Sun Mar 15 22:28:20 1998 @@@@ -28,7 +28,11 @@@@ #include "debug.h" #ifdef HAVE_OSS +#ifdef __NetBSD__ +#include +#else #include +#endif #define SOUND_DEV "/dev/dsp" #define MIXER_DEV "/dev/mixer" --- multimedia/dsound.c.orig Sun Feb 15 14:20:57 1998 +++ multimedia/dsound.c Sun Mar 15 22:47:16 1998 @@@@ -47,7 +47,11 @@@@ #ifdef HAVE_OSS #include +#ifdef __NetBSD__ +#include +#else #include +#endif static int audiofd = -1; static int current_buffered_frags = 4; --- multimedia/mcianim.c.orig Sun Dec 21 14:14:43 1997 +++ multimedia/mcianim.c Sun Mar 15 22:57:13 1998 @@@@ -23,7 +23,7 @@@@ #define ANIMFRAMES_PERMIN 1800 #define SECONDS_PERMIN 60 -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) typedef struct { int nUseCount; /* Incremented for each shared open */ BOOL16 fShareable; /* TRUE if first open was shareable */ @@@@ -51,7 +51,7 @@@@ */ static DWORD ANIM_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS16 lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) LPSTR lpstrElementName; char str[128]; @@@@ -114,7 +114,7 @@@@ */ static DWORD ANIM_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciClose(%u, %08lX, %p);\n", wDevID, dwParam, lpParms); if (AnimDev[wDevID].lpdwTrackLen != NULL) free(AnimDev[wDevID].lpdwTrackLen); @@@@ -129,7 +129,7 @@@@ static DWORD ANIM_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciGetDevCaps(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -185,7 +185,7 @@@@ static DWORD ANIM_CalcTime(UINT16 wDevID, DWORD dwFormatType, DWORD dwFrame) { DWORD dwTime = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) UINT16 wTrack; UINT16 wMinutes; UINT16 wSeconds; @@@@ -239,7 +239,7 @@@@ static DWORD ANIM_CalcFrame(UINT16 wDevID, DWORD dwFormatType, DWORD dwTime) { DWORD dwFrame = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) UINT16 wTrack; dprintf_mcianim(stddeb,"ANIM_CalcFrame(%u, %08lX, %lu);\n", wDevID, dwFormatType, dwTime); @@@@ -287,7 +287,7 @@@@ */ static DWORD ANIM_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciInfo(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -321,7 +321,7 @@@@ */ static DWORD ANIM_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciStatus(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -410,7 +410,7 @@@@ */ static DWORD ANIM_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) int start, end; dprintf_mcianim(stddeb,"ANIM_mciPlay(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); @@@@ -449,7 +449,7 @@@@ */ static DWORD ANIM_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciStop(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -472,7 +472,7 @@@@ */ static DWORD ANIM_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciPause(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -495,7 +495,7 @@@@ */ static DWORD ANIM_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciResume(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -518,7 +518,7 @@@@ */ static DWORD ANIM_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) DWORD dwRet; MCI_PLAY_PARMS PlayParms; dprintf_mcianim(stddeb,"ANIM_mciSeek(%u, %08lX, %p);\n", @@@@ -558,7 +558,7 @@@@ */ static DWORD ANIM_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_mcianim(stddeb,"ANIM_mciSet(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -607,7 +607,7 @@@@ LONG ANIM_DriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) switch(wMsg) { case DRV_LOAD: return 1; --- multimedia/mcicda.c.orig Sun Dec 21 14:14:43 1997 +++ multimedia/mcicda.c Sun Mar 15 23:09:35 1998 @@@@ -17,19 +17,24 @@@@ #include "stddebug.h" #include "debug.h" -#ifdef linux +#if defined(linux) #include #include -#elif __FreeBSD__ +#elif defined(__NetBSD__) +#include +#include +#elif defined(__FreeBSD__) #include #include #endif #define SOUND_DEV "/dev/dsp" -#ifdef __FreeBSD__ -#define CDAUDIO_DEV "/dev/rcd0c" -#else +#if defined(linux) #define CDAUDIO_DEV "/dev/cdrom" +#elif defined(__NetBSD__) +#define CDAUDIO_DEV "/dev/rcd0d" +#elif defined(__FreeBSD__) +#define CDAUDIO_DEV "/dev/rcd0c" #endif #ifdef SOUND_VERSION @@@@ -45,7 +50,7 @@@@ #define CDFRAMES_PERMIN 4500 #define SECONDS_PERMIN 60 -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) typedef struct { int nUseCount; /* Incremented for each shared open */ BOOL16 fShareable; /* TRUE if first open was shareable */ @@@@ -56,7 +61,7 @@@@ int unixdev; #ifdef linux struct cdrom_subchnl sc; -#elif __FreeBSD__ +#else struct cd_sub_channel_info sc; #endif int mode; @@@@ -81,21 +86,19 @@@@ */ static UINT16 CDAUDIO_GetNumberOfTracks(UINT16 wDevID) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) #ifdef linux struct cdrom_tochdr hdr; -#elif __FreeBSD__ +#else struct ioc_toc_header hdr; #endif if (CDADev[wDevID].nTracks == 0) { - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMREADTOCHDR -#elif __FreeBSD__ - CDIOREADTOCHEADER + if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCHDR, &hdr)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOREADTOCHEADER, &hdr)) { #endif - , &hdr)) { dprintf_cdaudio(stddeb, "GetNumberOfTracks(%04X) // Error occured !\n", wDevID); @@@@ -103,7 +106,7 @@@@ } #ifdef linux CDADev[wDevID].nTracks = hdr.cdth_trk1; -#elif __FreeBSD__ +#else CDADev[wDevID].nTracks = hdr.ending_track - hdr.starting_track + 1; #endif } @@@@ -119,13 +122,13 @@@@ */ static BOOL32 CDAUDIO_GetTracksInfo(UINT16 wDevID) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) int i, length; int start, last_start = 0; int total_length = 0; #ifdef linux struct cdrom_tocentry entry; -#elif __FreeBSD__ +#else struct ioc_read_toc_entry entry; struct cd_toc_entry toc_buffer; #endif @@@@ -157,31 +160,29 @@@@ if (i == CDADev[wDevID].nTracks) #ifdef linux entry.cdte_track = CDROM_LEADOUT; -#elif __FreeBSD__ +#else #define LEADOUT 0xaa entry.starting_track = LEADOUT; /* XXX */ #endif else #ifdef linux entry.cdte_track = i + 1; -#elif __FreeBSD__ +#else entry.starting_track = i + 1; #endif #ifdef linux entry.cdte_format = CDROM_MSF; -#elif __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(CDADev[wDevID].unixdev, #ifdef linux - CDROMREADTOCENTRY -#elif __FreeBSD__ - CDIOREADTOCENTRYS + if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCENTRY, &entry)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOREADTOCENTRYS, &entry)) { #endif - , &entry)) { dprintf_cdaudio(stddeb, "CDAUDIO_GetTracksInfo // error read entry\n"); return FALSE; @@@@ -190,7 +191,7 @@@@ start = CDFRAMES_PERSEC * (SECONDS_PERMIN * entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) + entry.cdte_addr.msf.frame; -#elif __FreeBSD__ +#else start = CDFRAMES_PERSEC * (SECONDS_PERMIN * toc_buffer.addr.msf.minute + toc_buffer.addr.msf.second) + toc_buffer.addr.msf.frame; @@@@ -229,7 +230,7 @@@@ */ static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS16 lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciOpen(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -293,7 +294,7 @@@@ */ static DWORD CDAUDIO_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciClose(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); if (CDADev[wDevID].lpdwTrackLen != NULL) free(CDADev[wDevID].lpdwTrackLen); @@@@ -309,7 +310,7 @@@@ static DWORD CDAUDIO_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciGetDevCaps(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -363,7 +364,7 @@@@ */ static DWORD CDAUDIO_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciInfo(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -392,7 +393,7 @@@@ static DWORD CDAUDIO_CalcFrame(UINT16 wDevID, DWORD dwFormatType, DWORD dwTime) { DWORD dwFrame = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) UINT16 wTrack; dprintf_cdaudio(stddeb,"CDAUDIO_CalcFrame(%04X, %08lX, %lu);\n", @@@@ -442,9 +443,11 @@@@ */ static BOOL32 CDAUDIO_GetCDStatus(UINT16 wDevID) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) int oldmode = CDADev[wDevID].mode; -#ifdef __FreeBSD__ +#ifdef linux + CDADev[wDevID].sc.cdsc_format = CDROM_MSF; +#else struct ioc_read_subchannel read_sc; read_sc.address_format = CD_MSF_FORMAT; @@@@ -452,16 +455,12 @@@@ read_sc.track = 0; read_sc.data_len = sizeof(CDADev[wDevID].sc); read_sc.data = (struct cd_sub_channel_info *)&CDADev[wDevID].sc; -#elif linux - CDADev[wDevID].sc.cdsc_format = CDROM_MSF; #endif - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSUBCHNL, &CDADev[wDevID].sc -#elif __FreeBSD__ - CDIOCREADSUBCHANNEL, &read_sc + if (ioctl(CDADev[wDevID].unixdev, CDROMSUBCHNL, &CDADev[wDevID].sc)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCREADSUBCHANNEL, &read_sc)) { #endif - )) { dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // opened or no_media !\n"); CDADev[wDevID].mode = MCI_MODE_NOT_READY; return TRUE; @@@@ -469,25 +468,25 @@@@ switch ( #ifdef linux CDADev[wDevID].sc.cdsc_audiostatus -#elif __FreeBSD__ +#else CDADev[wDevID].sc.header.audio_status #endif ) { #ifdef linux case CDROM_AUDIO_INVALID: -#elif __FreeBSD__ +#else case CD_AS_AUDIO_INVALID: #endif dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // device doesn't support status, returning NOT_READY.\n"); #ifdef linux CDADev[wDevID].mode = MCI_MODE_NOT_READY; -#elif __FreeBSD__ +#else CDADev[wDevID].mode = MCI_MODE_STOP; #endif break; #ifdef linux case CDROM_AUDIO_NO_STATUS: -#elif __FreeBSD__ +#else case CD_AS_NO_STATUS: #endif CDADev[wDevID].mode = MCI_MODE_STOP; @@@@ -495,7 +494,7 @@@@ break; #ifdef linux case CDROM_AUDIO_PLAY: -#elif __FreeBSD__ +#else case CD_AS_PLAY_IN_PROGRESS: #endif CDADev[wDevID].mode = MCI_MODE_PLAY; @@@@ -503,7 +502,7 @@@@ break; #ifdef linux case CDROM_AUDIO_PAUSED: -#elif __FreeBSD__ +#else case CD_AS_PLAY_PAUSED: #endif CDADev[wDevID].mode = MCI_MODE_PAUSE; @@@@ -513,7 +512,7 @@@@ dprintf_cdaudio(stddeb,"CDAUDIO_GetCDStatus // status=%02X !\n", #ifdef linux CDADev[wDevID].sc.cdsc_audiostatus -#elif __FreeBSD__ +#else CDADev[wDevID].sc.header.audio_status #endif ); @@@@ -524,7 +523,7 @@@@ CDFRAMES_PERMIN * CDADev[wDevID].sc.cdsc_absaddr.msf.minute + CDFRAMES_PERSEC * CDADev[wDevID].sc.cdsc_absaddr.msf.second + CDADev[wDevID].sc.cdsc_absaddr.msf.frame; -#elif __FreeBSD__ +#else CDADev[wDevID].nCurTrack = CDADev[wDevID].sc.what.position.track_number; CDADev[wDevID].dwCurFrame = CDFRAMES_PERMIN * CDADev[wDevID].sc.what.position.absaddr.msf.minute + @@@@ -537,7 +536,7 @@@@ CDADev[wDevID].sc.cdsc_absaddr.msf.minute, CDADev[wDevID].sc.cdsc_absaddr.msf.second, CDADev[wDevID].sc.cdsc_absaddr.msf.frame -#elif __FreeBSD__ +#else CDADev[wDevID].sc.what.position.track_number, CDADev[wDevID].sc.what.position.absaddr.msf.minute, CDADev[wDevID].sc.what.position.absaddr.msf.second, @@@@ -563,7 +562,7 @@@@ static DWORD CDAUDIO_CalcTime(UINT16 wDevID, DWORD dwFormatType, DWORD dwFrame) { DWORD dwTime = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) UINT16 wTrack; UINT16 wMinutes; UINT16 wSeconds; @@@@ -618,7 +617,7 @@@@ */ static DWORD CDAUDIO_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciStatus(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -720,11 +719,11 @@@@ */ static DWORD CDAUDIO_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) int start, end; #ifdef linux struct cdrom_msf msf; -#elif __FreeBSD__ +#else struct ioc_play_msf msf; #endif @@@@ -756,7 +755,7 @@@@ msf.cdmsf_min1 = end / CDFRAMES_PERMIN; msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.cdmsf_frame1 = end % CDFRAMES_PERSEC; -#elif __FreeBSD__ +#else msf.start_m = start / CDFRAMES_PERMIN; msf.start_s = (start % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.start_f = start % CDFRAMES_PERSEC; @@@@ -764,23 +763,19 @@@@ msf.end_s = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.end_f = end % CDFRAMES_PERSEC; #endif - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSTART -#elif __FreeBSD__ - CDIOCSTART + if (ioctl(CDADev[wDevID].unixdev, CDROMSTART)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCSTART, 0)) { #endif - )) { dprintf_cdaudio(stddeb,"CDAUDIO_mciPlay // motor doesn't start !\n"); return MCIERR_HARDWARE; } - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMPLAYMSF -#elif __FreeBSD__ - CDIOCPLAYMSF + if (ioctl(CDADev[wDevID].unixdev, CDROMPLAYMSF, &msf)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCPLAYMSF, &msf)) { #endif - , &msf)) { dprintf_cdaudio(stddeb,"CDAUDIO_mciPlay // device doesn't play !\n"); return MCIERR_HARDWARE; } @@@@ -788,7 +783,7 @@@@ #ifdef linux msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0, msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1 -#elif __FreeBSD__ +#else msf.start_m, msf.start_s, msf.start_f, msf.end_m, msf.end_s, msf.end_f #endif @@@@ -814,17 +809,15 @@@@ */ static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciStop(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSTOP -#elif __FreeBSD__ - CDIOCSTOP + if (ioctl(CDADev[wDevID].unixdev, CDROMSTOP)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCSTOP, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_STOP; if (dwFlags & MCI_NOTIFY) { dprintf_cdaudio(stddeb, @@@@ -844,17 +837,15 @@@@ */ static DWORD CDAUDIO_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciPause(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMPAUSE -#elif __FreeBSD__ - CDIOCPAUSE + if (ioctl(CDADev[wDevID].unixdev, CDROMPAUSE)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCPAUSE, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_PAUSE; if (dwFlags & MCI_NOTIFY) { dprintf_cdaudio(stddeb, @@@@ -874,17 +865,15 @@@@ */ static DWORD CDAUDIO_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciResume(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMRESUME -#elif __FreeBSD__ - CDIOCRESUME + if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCRESUME, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_STOP; if (dwFlags & MCI_NOTIFY) { dprintf_cdaudio(stddeb, @@@@ -904,19 +893,17 @@@@ */ static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) DWORD dwRet; MCI_PLAY_PARMS PlayParms; dprintf_cdaudio(stddeb,"CDAUDIO_mciSeek(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMRESUME -#elif __FreeBSD__ - CDIOCRESUME + if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCRESUME, 0)) { #endif - )) { perror("ioctl CDROMRESUME"); return MCIERR_HARDWARE; } @@@@ -954,7 +941,7 @@@@ */ static DWORD CDAUDIO_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) dprintf_cdaudio(stddeb,"CDAUDIO_mciSet(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -983,25 +970,27 @@@@ if (dwFlags & MCI_SET_DOOR_OPEN) { dprintf_cdaudio(stddeb, "CDAUDIO_mciSet // MCI_SET_DOOR_OPEN !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[wDevID].unixdev, CDIOCEJECT, 0)) return MCIERR_HARDWARE; #endif CDADev[wDevID].nTracks = 0; } if (dwFlags & MCI_SET_DOOR_CLOSED) { dprintf_cdaudio(stddeb, "CDAUDIO_mciSet // MCI_SET_DOOR_CLOSED !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; +#else +#ifdef CDIOCCLOSE + if (ioctl(CDADev[wDevID].unixdev, CDIOCCLOSE, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[wDevID].unixdev, CDIOCPREVENT, 0)) return MCIERR_HARDWARE; /* XXX should it be ",1" ??? */ +#else + return MCIERR_HARDWARE; +#endif #endif CDADev[wDevID].nTracks = 0; } @@@@ -1028,7 +1017,7 @@@@ LONG CDAUDIO_DriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg, DWORD dwParam1, DWORD dwParam2) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) switch(wMsg) { case DRV_LOAD: return 1; @@@@ -1086,23 +1075,25 @@@@ case MCI_SET_DOOR_OPEN: dprintf_cdaudio(stddeb, "CDAUDIO_DriverProc // MCI_SET_DOOR_OPEN !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[dwDevID].unixdev, CDIOCEJECT, 0)) return MCIERR_HARDWARE; #endif CDADev[dwDevID].nTracks = 0; return 0; case MCI_SET_DOOR_CLOSED: dprintf_cdaudio(stddeb,"CDAUDIO_DriverProc // MCI_SET_DOOR_CLOSED !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT, 1)) return MCIERR_HARDWARE; +#else +#ifdef CDIOCCLOSE + if (ioctl(CDADev[dwDevID].unixdev, CDIOCCLOSE, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT, 0)) return MCIERR_HARDWARE; +#else + return MCIERR_HARDWARE; +#endif #endif CDADev[dwDevID].nTracks = 0; return 0; --- multimedia/midi.c.orig Sun Dec 21 14:14:43 1997 +++ multimedia/midi.c Sun Mar 15 23:10:07 1998 @@@@ -22,9 +22,12 @@@@ #include "stddebug.h" #include "debug.h" -#ifdef linux +#if defined(linux) #include -#elif __FreeBSD__ +#elif defined(__NetBSD__) +#include +#include +#elif defined(__FreeBSD__) #include #include #endif --- multimedia/mixer.c.orig Sun Dec 21 14:14:43 1997 +++ multimedia/mixer.c Sun Mar 15 22:55:34 1998 @@@@ -14,9 +14,11 @@@@ #include "driver.h" #include "mmsystem.h" -#ifdef linux +#if defined(linux) #include -#elif __FreeBSD__ +#elif defined(__NetBSD__) +#include +#elif defined(__FreeBSD__) #include #endif --- multimedia/mmaux.c.orig Sat Nov 1 14:06:35 1997 +++ multimedia/mmaux.c Sun Mar 15 22:55:59 1998 @@@@ -16,9 +16,11 @@@@ #include "driver.h" #include "mmsystem.h" -#ifdef linux +#if defined(linux) #include -#elif __FreeBSD__ +#elif defined(__NetBSD__) +#include +#elif defined(__FreeBSD__) #include #endif @ 1.1 log @WINE, the Windows emulator @ text @d1 1399 a1399 617 *** configure.orig Sun Feb 1 13:17:43 1998 --- configure Fri Mar 6 18:04:57 1998 *************** *** 1937,1942 **** fi echo $ac_n "checking for iswalnum in -lw""... $ac_c" 1>&6 ! echo "configure:1941: 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 --- 1937,1985 ---- fi + echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 + echo "configure:1941: 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:1984: 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 *************** *** 1946,1950 **** LIBS="-lw $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2000,2004 ---- ; return 0; } EOF ! if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 1985,1989 **** echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 ! echo "configure:1988: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then --- 2028,2032 ---- echo $ac_n "checking for XF86DGAQueryExtension in -lXxf86dga""... $ac_c" 1>&6 ! echo "configure:2031: checking for XF86DGAQueryExtension in -lXxf86dga" >&5 ac_lib_var=`echo Xxf86dga'_'XF86DGAQueryExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then *************** *** 1993,1997 **** LIBS="-lXxf86dga $X_LIBS -lXext -lX11 $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" --- 2047,2051 ---- ; return 0; } EOF ! if { (eval echo configure:2050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" *************** *** 2030,2039 **** echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 ! echo "configure:2033: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2073,2082 ---- echo $ac_n "checking "for Open Sound System"""... $ac_c" 1>&6 ! echo "configure:2076: checking "for Open Sound System"" >&5 if eval "test \"`echo '$''{'ac_cv_c_opensoundsystem'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2047,2051 **** ; return 0; } EOF ! if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" --- 2090,2094 ---- ; return 0; } EOF ! if { (eval echo configure:2093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_opensoundsystem="yes" *************** *** 2071,2080 **** echo $ac_n "checking "for union semun"""... $ac_c" 1>&6 ! echo "configure:2074: checking "for union semun"" >&5 if eval "test \"`echo '$''{'ac_cv_c_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2114,2123 ---- echo $ac_n "checking "for union semun"""... $ac_c" 1>&6 ! echo "configure:2117: checking "for union semun"" >&5 if eval "test \"`echo '$''{'ac_cv_c_union_semun'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2084,2088 **** ; return 0; } EOF ! if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_union_semun="yes" --- 2127,2131 ---- ; return 0; } EOF ! if { (eval echo configure:2130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_union_semun="yes" *************** *** 2112,2116 **** CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 ! echo "configure:2115: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2155,2159 ---- CFLAGS="$CFLAGS -Wall" echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6 ! echo "configure:2158: checking "for gcc strength-reduce bug"" >&5 if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2120,2124 **** else cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" --- 2174,2178 ---- } EOF ! if { (eval echo configure:2177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_gcc_strength_bug="no" *************** *** 2154,2158 **** echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 ! echo "configure:2157: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2197,2201 ---- echo $ac_n "checking "whether external symbols need an underscore prefix"""... $ac_c" 1>&6 ! echo "configure:2200: checking "whether external symbols need an underscore prefix"" >&5 if eval "test \"`echo '$''{'ac_cv_c_extern_prefix'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2166,2170 **** EOF cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_extern_prefix="yes" --- 2216,2220 ---- ; return 0; } EOF ! if { (eval echo configure:2219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_extern_prefix="yes" *************** *** 2197,2201 **** echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 ! echo "configure:2200: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2240,2244 ---- echo $ac_n "checking "whether assembler accepts .string"""... $ac_c" 1>&6 ! echo "configure:2243: checking "whether assembler accepts .string"" >&5 if eval "test \"`echo '$''{'ac_cv_c_asm_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2207,2211 **** EOF cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_asm_string="yes" --- 2257,2261 ---- ; return 0; } EOF ! if { (eval echo configure:2260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_asm_string="yes" *************** *** 2241,2245 **** then echo $ac_n "checking "whether we can build a dll"""... $ac_c" 1>&6 ! echo "configure:2244: checking "whether we can build a dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- 2284,2288 ---- then echo $ac_n "checking "whether we can build a dll"""... $ac_c" 1>&6 ! echo "configure:2287: checking "whether we can build a dll"" >&5 if eval "test \"`echo '$''{'ac_cv_c_dll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 *************** *** 2248,2252 **** CFLAGS="$CFLAGS -fPIC -shared -Wl,-soname,conftest.so.1.0" cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_dll="yes" --- 2298,2302 ---- ; return 0; } EOF ! if { (eval echo configure:2301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_c_dll="yes" *************** *** 2283,2292 **** do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ! echo "configure:2286: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2329: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" --- 2354,2358 ---- ; return 0; } EOF ! if { (eval echo configure:2357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" *************** *** 2339,2353 **** ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2342: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then --- 2382,2396 ---- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ! echo "configure:2385: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then *************** *** 2376,2385 **** echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 ! echo "configure:2379: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2419,2428 ---- echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 ! echo "configure:2422: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2432,2441 **** echo $ac_n "checking for working const""... $ac_c" 1>&6 ! echo "configure:2435: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 ! echo "configure:2478: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes --- 2529,2533 ---- ; return 0; } EOF ! if { (eval echo configure:2532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes *************** *** 2507,2516 **** echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:2510: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2550,2559 ---- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ! echo "configure:2553: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *************** *** 2520,2524 **** EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2523: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then --- 2563,2567 ---- EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ! { (eval echo configure:2566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then *************** *** 2537,2541 **** # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < --- 2580,2584 ---- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < *************** *** 2555,2559 **** # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < --- 2598,2602 ---- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < *************** *** 2576,2580 **** else cat > conftest.$ac_ext < --- 2619,2623 ---- else cat > conftest.$ac_ext < *************** *** 2587,2591 **** EOF ! if { (eval echo configure:2590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : --- 2630,2634 ---- EOF ! if { (eval echo configure:2633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : *************** *** 2611,2620 **** echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:2614: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < --- 2654,2663 ---- echo $ac_n "checking for size_t""... $ac_c" 1>&6 ! echo "configure:2657: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < *** configure.in.orig Sun Feb 1 13:17:43 1998 --- configure.in Fri Mar 6 18:04:52 1998 *************** *** 49,52 **** --- 49,54 ---- 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) *** multimedia/audio.c.orig Sun Jan 18 12:50:41 1998 --- multimedia/audio.c Fri Mar 6 17:55:41 1998 *************** *** 29,33 **** --- 29,37 ---- #ifdef HAVE_OSS + #ifdef __NetBSD__ + #include + #else #include + #endif #define SOUND_DEV "/dev/dsp" @