This commit was manufactured by cvs2svn to create tag 'RELEASE_4_2_0'.release/4.2.0

8 files changed, 0 insertions, 155 deletions

diff --git a/emulators/wine-devel/files/README.patch b/emulators/wine-devel/files/README.patch
deleted file mode 100644
index bfa3c615057e..000000000000
--- a/emulators/wine-devel/files/README.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Here are some patches for FreeBSD's kernel that are necessary for Wine
-(Well not strictly _necessary_ but without them parts of it won't work).
-They unfortunately didn't make it into the base distribution in time
-for the 3.3 release code freeze...
-
-patch-3.3-sys-sigtrap:
-stop wine's SIGTRAP handler from being called in the sigreturn syscall,
-causing problems for wine's internal debugger.  (It would still
-correctly show a crash backtrace but all commands that use single-
-stepping failed.)
-
-Apply as follows:
-
-	(cd /usr/src/sys && patch ) <patch-3.3-sys-sigtrap
-
-and build a new kernel. (Don't forget to include the options USER_LDT,
-SYSVSHM, SYSVSEM, and SYSVMSG which are required by Wine.)
-
-4.x users: The sigtrap patch looks like it could also apply to 4.x but I
-haven't tried.
diff --git a/emulators/wine-devel/files/install-patch-3.3-sys-sigtrap b/emulators/wine-devel/files/install-patch-3.3-sys-sigtrap
deleted file mode 100644
index e3004884fd29..000000000000
--- a/emulators/wine-devel/files/install-patch-3.3-sys-sigtrap
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: i386/i386/trap.c
-===================================================================
-RCS file: /home/cvs/cvs/src/sys/i386/i386/trap.c,v
-retrieving revision 1.133.2.1
-diff -u -u -r1.133.2.1 trap.c
---- trap.c	1999/08/29 16:05:56	1.133.2.1
-+++ trap.c	1999/09/10 14:42:21
-@@ -1041,6 +1084,7 @@
- 	int error;
- 	int args[8];
- 	u_int code;
-+	int tracedsyscall = ((frame.tf_eflags & PSL_T) && !(frame.tf_eflags & PSL_VM));
- 
- #ifdef DIAGNOSTIC
- 	if (ISPL(frame.tf_cs) != SEL_UPL)
-@@ -1135,10 +1179,12 @@
- 		break;
- 	}
- 
--	if ((frame.tf_eflags & PSL_T) && !(frame.tf_eflags & PSL_VM)) {
-+	if (tracedsyscall) {
- 		/* Traced syscall. */
- 		frame.tf_eflags &= ~PSL_T;
--		trapsignal(p, SIGTRAP, 0);
-+		/* tell the signal handler this is a trace trap */
-+		frame.tf_trapno = T_TRCTRAP;
-+		trapsignal(p, SIGTRAP, T_TRCTRAP);
- 	}
- 
- 	userret(p, &frame, sticks);
diff --git a/emulators/wine-devel/files/patch-ad b/emulators/wine-devel/files/patch-ad
deleted file mode 100644
index d309001ef307..000000000000
--- a/emulators/wine-devel/files/patch-ad
+++ /dev/null
@@ -1,27 +0,0 @@
-*** wine.ini.orig	Sun Oct 31 03:23:49 1999
---- wine.ini	Sat Nov 13 13:36:18 1999
-***************
-*** 107,117 ****
-  
-  [serialports]
-! Com1=/dev/ttyS0
-! Com2=/dev/ttyS1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lp0
-  
-  [spooler]
---- 107,117 ----
-  
-  [serialports]
-! Com1=/dev/ttyd0
-! Com2=/dev/ttyd1
-  Com3=/dev/modem,38400
-  Com4=/dev/modem
-  
-  [parallelports]
-! Lpt1=/dev/lpt0
-  
-  [spooler]
diff --git a/emulators/wine-devel/files/patch-ar b/emulators/wine-devel/files/patch-ar
deleted file mode 100644
index 715b693ba449..000000000000
--- a/emulators/wine-devel/files/patch-ar
+++ /dev/null
@@ -1,11 +0,0 @@
-*** configure~	Mon Apr 26 16:58:58 1999
---- configure	Mon May  3 22:05:42 1999
-***************
-*** 9,12 ****
---- 9,14 ----
-  # gives unlimited permission to copy, distribute and modify it.
-  
-+ exec < /dev/null
-+ 
-  # Defaults:
-  ac_help=
diff --git a/emulators/wine-devel/files/patch-ba b/emulators/wine-devel/files/patch-ba
deleted file mode 100644
index 664cf844b121..000000000000
--- a/emulators/wine-devel/files/patch-ba
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: Make.rules.in
-===================================================================
-RCS file: /home/wine/wine/Make.rules.in,v
-retrieving revision 1.17
-diff -u -u -r1.17 Make.rules.in
---- Make.rules.in	1999/08/15 12:45:53	1.17
-+++ Make.rules.in	1999/09/24 23:39:10
-@@ -21,7 +21,7 @@
- CC        = @CC@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@
--OPTIONS   = @OPTIONS@ -D_REENTRANT
-+OPTIONS   = @OPTIONS@ -D_REENTRANT -D_THREAD_SAFE
- X_CFLAGS  = @X_CFLAGS@
- X_LIBS    = @X_LIBS@
- XLIB      = @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
-@@ -69,7 +69,7 @@
- prefix          = @prefix@
- exec_prefix     = @exec_prefix@
- bindir          = @bindir@
--libdir          = @libdir@
-+libdir          = @libdir@/wine
- infodir         = @infodir@
- mandir          = @mandir@
- prog_manext     = 1
diff --git a/emulators/wine-devel/files/patch-gb b/emulators/wine-devel/files/patch-gb
deleted file mode 100644
index f4f61092aa7d..000000000000
--- a/emulators/wine-devel/files/patch-gb
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.old	Tue Jul 18 18:36:26 2000
-+++ Makefile.in	Tue Jul 18 18:36:36 2000
-@@ -147,7 +147,6 @@
- 	[ -d $(bindir) ] || $(MKDIR) $(bindir)
- 	$(INSTALL_PROGRAM) wine $(bindir)/wine
- 	$(INSTALL_PROGRAM) loader/dos/dosmod $(bindir)/dosmod
--	-$(LDCONFIG)
- 
- uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
- 	cd $(libdir) && $(RM) libwine.a libwine.so libwine.so.$(SOVERSION)
diff --git a/emulators/wine-devel/files/patch-gd b/emulators/wine-devel/files/patch-gd
deleted file mode 100644
index fcba3c077b49..000000000000
--- a/emulators/wine-devel/files/patch-gd
+++ /dev/null
@@ -1,8 +0,0 @@
---- console/ncurses.c~	Sat Jun 17 01:39:59 2000
-+++ console/ncurses.c	Sat Jun 17 01:34:56 2000
-@@ -30,4 +30,5 @@
- #ifdef HAVE_NCURSES_H
- # include <ncurses.h>
-+# undef trace
- #else
- # ifdef HAVE_CURSES_H
diff --git a/emulators/wine-devel/files/patch-ge b/emulators/wine-devel/files/patch-ge
deleted file mode 100644
index b40f48d4d9d7..000000000000
--- a/emulators/wine-devel/files/patch-ge
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dlls/Makedll.rules.in
-===================================================================
-RCS file: /home/wine/wine/dlls/Makedll.rules.in,v
-retrieving revision 1.6
-diff -c -3 -p -r1.6 Makedll.rules.in
-*** Makedll.rules.in	2000/08/03 00:04:24	1.6
---- Makedll.rules.in	2000/10/13 18:30:44
-*************** all: lib$(MODULE).$(LIBEXT) $(ALTNAMES:%
-*** 25,31 ****
-  # Rules for .so files
-  
-  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS)
-  
-  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
-  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@
---- 25,31 ----
-  # Rules for .so files
-  
-  lib$(MODULE).so.$(SOVERSION): $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
-! 	$(LDSHARED) $(OBJS) -o $@ -L$(DLLDIR) $(IMPORTS:%=-l%) $(EXTRALIBS) -lgcc_pic
-  
-  $(ALLNAMES): lib$(MODULE).so.$(SOVERSION)
-  	$(RM) $@ && $(LN_S) lib$(MODULE).so.$(SOVERSION) $@