This updates the Wine port to 2001.03.05 and removes an obsolete

patch to the FreeBSD kernel from the port.

PR:		25825
Submitted by:	pfeifer@dbai.tuwien.ac.at

5 files changed, 3 insertions, 58 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 9c0c96b6c722..3c54da1f7e10 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2001.02.16
+PORTVERSION=	2001.03.05
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
@@ -88,10 +88,6 @@ do-install:
 		${WRKSRC}/programs/regapi/regFixer.pl \
 		${WRKSRC}/programs/regapi/regRestorer.pl \
 		${PREFIX}/lib/wine/reg
-	${INSTALL_DATA} ${FILESDIR}/README.patch \
-		${PREFIX}/lib/wine
-	${INSTALL_DATA} ${FILESDIR}/install-patch-3.3-sys-sigtrap \
-		${PREFIX}/lib/wine/patch-3.3-sys-sigtrap
 	${INSTALL_DATA} ${WRKSRC}/winedefault.reg ${PREFIX}/lib/wine
 	${ECHO}
 	@${SED} s+%%PREFIX%%+${PREFIX}+g <${PKGMESSAGE}
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index ac0197f966b1..cb773dc30c77 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20010216.tar.gz) = f83b355e02abdc2de3cfd385079a30b7
+MD5 (Wine-20010305.tar.gz) = 84e52b1219978be76b7d1095c3b89b63
diff --git a/emulators/wine/files/README.patch b/emulators/wine/files/README.patch
deleted file mode 100644
index bfa3c615057e..000000000000
--- a/emulators/wine/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/files/install-patch-3.3-sys-sigtrap b/emulators/wine/files/install-patch-3.3-sys-sigtrap
deleted file mode 100644
index e3004884fd29..000000000000
--- a/emulators/wine/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/pkg-plist b/emulators/wine/pkg-plist
index 2683802bf320..414afaa73cc4 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -23,6 +23,7 @@ include/wine/comcat.h
 include/wine/commctrl.h
 include/wine/commdlg.h
 include/wine/compobj.h
+include/wine/cpl.h
 include/wine/d3d.h
 include/wine/d3dcaps.h
 include/wine/d3dtypes.h
@@ -161,8 +162,6 @@ include/wine/wine/obj_shelllink.h
 include/wine/wine/obj_shellview.h
 include/wine/wine/obj_storage.h
 include/wine/wine/unicode.h
-lib/wine/README.patch
-lib/wine/patch-3.3-sys-sigtrap
 lib/wine/winedefault.reg
 lib/wine/bug_report.pl
 lib/wine/reg/regFixer.pl