Date: Tue, 16 Nov 1999 16:52:28 -0500 (EST) From: Mikhail Teterin <mi@misha.cisco.com> To: FreeBSD-gnats-submit@freebsd.org Cc: se@freebsd.org Subject: ports/14927: the newer wine again :) Message-ID: <199911162152.QAA68224@misha.cisco.com>
next in thread | raw e-mail | index | archive | help
>Number: 14927
>Category: ports
>Synopsis: the newer wine again :)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 16 14:00:02 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Mikhail Teterin
>Release: FreeBSD 3.3-STABLE i386
>Organization:
Virtual Estates, Inc.
>Environment:
>Description:
The new wine was "released" on Nov 14, '99. The
cliboard-patch is no longer needed, but two files now
include <sys/ptrace.h> without including <sys/types.h>.
Also corrected a minor bug in the port's Makefile and
made building the wine for debugging an optional affair
(.if-ed by WANT_DEBUG).
>How-To-Repeat:
>Fix:
diff -U1 -N -p -r /lan/bummer/home/mi/ports/emulators/wine/Makefile ./Makefile
--- /lan/bummer/home/mi/ports/emulators/wine/Makefile Mon Nov 15 03:12:09 1999
+++ ./Makefile Tue Nov 16 16:41:10 1999
@@ -8,5 +8,4 @@
-DATE= 991031
DISTNAME= Wine-${DATE}
-PKGNAME= wine-99.10.31
+PKGNAME= wine-99.11.14
CATEGORIES= emulators
@@ -19,2 +18,3 @@ LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/
+DATE= 991114
WRKSRC= ${WRKDIR}/wine-${DATE}
@@ -22,7 +22,9 @@ GNU_CONFIGURE= yes
MAN1= wine.1
-MAN1= wine.conf.5
+MAN5= wine.conf.5
ONLY_FOR_ARCHS= i386
+.if defined(WANT_DEBUG)
STRIP=
CFLAGS+= -g
+.endif
diff -U1 -N -p -r /lan/bummer/home/mi/ports/emulators/wine/files/md5 ./files/md5
--- /lan/bummer/home/mi/ports/emulators/wine/files/md5 Mon Nov 15 03:12:09 1999
+++ ./files/md5 Tue Nov 16 16:40:48 1999
@@ -1 +1 @@
-MD5 (Wine-991031.tar.gz) = 80904e8933ac1a72fdf4c0a05f36d6be
+MD5 (Wine-991114.tar.gz) = 51df1d91f266b3e72c4e17093670da35
diff -U1 -N -p -r /lan/bummer/home/mi/ports/emulators/wine/patches/patch-bb ./patches/patch-bb
--- /lan/bummer/home/mi/ports/emulators/wine/patches/patch-bb Sun Nov 14 15:49:32 1999
+++ ./patches/patch-bb Wed Dec 31 19:00:00 1969
@@ -1,40 +0,0 @@
-Index: windows/x11drv/clipboard.c
-@@ -53,6 +53,7 @@
- #include <X11/Xatom.h>
- #include <string.h>
- #include <unistd.h>
-+#include <fcntl.h>
-
- #include "ts_xlib.h"
-
-@@ -240,6 +241,13 @@
-
- int dbgClasses = 0;
- char selMask[8], dbgClassMask[8], clearSelection[8];
-+ int i;
-+
-+ /* Don't inherit wine's X sockets to the wineclipsrv, otherwise
-+ * windows stay around when you have to kill a hanging wine...
-+ */
-+ for (i = 3; i < 256; ++i)
-+ fcntl(i, F_SETFD, 1);
-
- sprintf(selMask, "%d", selectionAcquired);
-
-@@ -255,12 +263,12 @@
- /* Get the clear selection preference */
- sprintf(clearSelection, "%d",
- PROFILE_GetWineIniInt("Clipboard", "ClearAllSelections", 0));
--
-+
- /* Exec the clipboard server passing it the selection and debug class masks */
-- execl( BINDIR "/wineclipsvr", "wineclipsvr",
-+ execl( BINDIR "/wineclipsrv", "wineclipsrv",
- selMask, dbgClassMask, clearSelection, NULL );
-- execlp( "wineclipsvr", "wineclipsvr", selMask, dbgClassMask, clearSelection, NULL );
-- execl( "./windows/x11drv/wineclipsvr", "wineclipsvr",
-+ execlp( "wineclipsrv", "wineclipsrv", selMask, dbgClassMask, clearSelection, NULL );
-+ execl( "./windows/x11drv/wineclipsrv", "wineclipsrv",
- selMask, dbgClassMask, clearSelection, NULL );
-
- /* Exec Failed! */
diff -U1 -N -p -r /lan/bummer/home/mi/ports/emulators/wine/patches/patch-da ./patches/patch-da
--- /lan/bummer/home/mi/ports/emulators/wine/patches/patch-da Wed Dec 31 19:00:00 1969
+++ ./patches/patch-da Tue Nov 16 15:58:00 1999
@@ -0,0 +1,11 @@
+--- server/ptrace.c.orig Sun Nov 14 16:23:21 1999
++++ server/ptrace.c Tue Nov 16 15:57:08 1999
+@@ -12,2 +12,3 @@
+ #include <signal.h>
++#include <sys/types.h>
+ #include <sys/ptrace.h>
+@@ -144,3 +145,3 @@
+ {
+- if (((*data = ptrace( PTRACE_PEEKDATA, thread->unix_pid, addr )) == -1) && errno)
++ if (((*data = ptrace( PTRACE_PEEKDATA, thread->unix_pid, addr, *data )) == -1) && errno)
+ {
diff -U1 -N -p -r /lan/bummer/home/mi/ports/emulators/wine/patches/patch-db ./patches/patch-db
--- /lan/bummer/home/mi/ports/emulators/wine/patches/patch-db Wed Dec 31 19:00:00 1969
+++ ./patches/patch-db Tue Nov 16 15:58:22 1999
@@ -0,0 +1,6 @@
+--- server/process.c.orig Sun Nov 14 16:23:21 1999
++++ server/process.c Tue Nov 16 15:51:55 1999
+@@ -13,2 +13,3 @@
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <sys/ptrace.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199911162152.QAA68224>