From owner-freebsd-ports Thu May 18 3:20:12 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id 10D0837BC74 for ; Thu, 18 May 2000 03:20:04 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id DAA21349; Thu, 18 May 2000 03:20:03 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from vexpert.dbai.tuwien.ac.at (vexpert.dbai.tuwien.ac.at [128.130.111.12]) by hub.freebsd.org (Postfix) with ESMTP id B2B8337BDC5 for ; Thu, 18 May 2000 03:10:49 -0700 (PDT) (envelope-from pfeifer@dbai.tuwien.ac.at) Received: from [128.130.111.10] (nunki [128.130.111.10]) by vexpert.dbai.tuwien.ac.at (8.9.3/8.9.3) with ESMTP id MAA15767 for ; Thu, 18 May 2000 12:10:43 +0200 (MET DST) Message-Id: Date: Thu, 18 May 2000 12:10:43 +0200 (MET DST) From: Gerald Pfeifer To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18648: Update Wine port from 99.11.14 to 2000.04.30 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 18648 >Category: ports >Synopsis: Update Wine port from 99.11.14 to 2000.04.30 >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu May 18 03:20:03 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Gerald Pfeifer >Release: FreeBSD 3.4-RELEASE i386 >Organization: Vienna University of Technology >Environment: Vanilla FreeBSD 3.4-RELEASE i386 with only those kernel configs required by Wine. >Description: This updates the Wine port from 99.11.14 to 2000.04.30. (Do to a mistake I made with ports/18564 the port is currently broken, thus the high priority.) As suggested by Stefan Esser and Will Andrews, I am willing to become the new maintainer of that port and have updated Makefile accordingly. >How-To-Repeat: >Fix: Install my patches :-) and remove the following obsolete files: . patch-bd: Has already been integrated in the Wine master sources. . patch-be: Has already been integrated in the Wine master sources. . patch-eg: The code affected by this single-line patch does not exist in any way that still resembles the state back when the patch was submitted and has undergone sigificant rewriting. . patch-ei: Has already been integrated in the Wine master sources, by duplicate work, it seems. :-( . patch-bc: I submitted that to the Wine folks and the relevant part will be included in the next "release". . patch-da: Fixed in a different way in the Wine sources, and I have not received any feedback from the original author of the patch. Index: Makefile =================================================================== RCS file: /home/ncvs/ports/emulators/wine/Makefile,v retrieving revision 1.77 diff -c -3 -p -r1.77 Makefile *** Makefile 2000/04/12 04:56:09 1.77 --- Makefile 2000/05/18 09:56:46 *************** *** 6,18 **** # PORTNAME= wine ! PORTVERSION= 99.11.14 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development DISTNAME= Wine-${PORTVERSION:S/.//g} ! MAINTAINER= se@FreeBSD.org LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ GL.14:${PORTSDIR}/graphics/Mesa3 --- 6,18 ---- # PORTNAME= wine ! PORTVERSION= 2000.04.30 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= ALPHA/wine/development DISTNAME= Wine-${PORTVERSION:S/.//g} ! MAINTAINER= pfeifer@dbai.tuwien.ac.at LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ GL.14:${PORTSDIR}/graphics/Mesa3 Index: files/md5 =================================================================== RCS file: /home/ncvs/ports/emulators/wine/files/md5,v retrieving revision 1.48 diff -c -3 -p -r1.48 md5 *** md5 1999/11/21 20:02:21 1.48 --- md5 2000/05/18 09:56:46 *************** *** 1 **** ! MD5 (Wine-991114.tar.gz) = 51df1d91f266b3e72c4e17093670da35 --- 1 ---- ! MD5 (Wine-20000430.tar.gz) = 7dd29f68e26c624115e6654d619e9ab5 Index: patches/patch-ad =================================================================== RCS file: /home/ncvs/ports/emulators/wine/patches/patch-ad,v retrieving revision 1.6 diff -c -3 -p -r1.6 patch-ad *** patch-ad 1999/11/14 20:49:30 1.6 --- patch-ad 2000/05/18 09:56:46 *************** *** 1,19 **** *** wine.ini.orig Sun Oct 31 03:23:49 1999 --- wine.ini Sat Nov 13 13:36:18 1999 *************** - *** 53,57 **** - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ - ! SymbolTableFile=./wine.sym - - # - --- 53,57 ---- - Temp=e:\ - Path=c:\windows;c:\windows\system;e:\;e:\test;f:\ - ! SymbolTableFile=/usr/local/etc/wine.sym - - # - *************** *** 107,117 **** [serialports] --- 1,6 ---- Index: patches/patch-au =================================================================== RCS file: /home/ncvs/ports/emulators/wine/patches/patch-au,v retrieving revision 1.1 diff -c -3 -p -r1.1 patch-au *** patch-au 1999/12/10 17:36:19 1.1 --- patch-au 2000/05/18 09:56:46 *************** *** 1,53 **** ! Index: server/ptrace.c ! @@ -36,6 +36,11 @@ ! #ifndef PTRACE_POKEDATA ! #define PTRACE_POKEDATA PT_WRITE_D ! #endif ! +#ifdef __FreeBSD__ ! +#define PTRACE_KEEPIP 1 ! +#else ! +#define PTRACE_KEEPIP 0 ! +#endif ! ! static const int use_ptrace = 1; /* set to 0 to disable ptrace */ ! ! @@ -64,10 +69,10 @@ ! if (!thread) ! if (!(thread = get_thread_from_pid( pid ))) break; ! if (!(thread->process->suspend + thread->suspend)) ! - ptrace( PTRACE_CONT, pid, 0, sig ); ! + ptrace( PTRACE_CONT, pid, PTRACE_KEEPIP, sig ); ! break; ! default: /* ignore other signals for now */ ! - ptrace( PTRACE_CONT, pid, 0, sig ); ! + ptrace( PTRACE_CONT, pid, PTRACE_KEEPIP, sig ); ! break; ! } ! if (signal && sig != signal) goto restart; ! @@ -97,7 +102,7 @@ ! static int attach_thread( struct thread *thread ) ! { ! /* this may fail if the client is already being debugged */ ! - if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, 0, 0 ) == -1)) return 0; ! + if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, PTRACE_KEEPIP, 0 ) == -1)) return 0; ! if (debug_level) fprintf( stderr, "ptrace: attached to pid %d\n", thread->unix_pid ); ! thread->attached = 1; ! wait4_thread( thread, SIGSTOP ); ! @@ -114,7 +119,7 @@ ! { ! wait4_thread( thread, SIGTERM ); ! if (debug_level) fprintf( stderr, "ptrace: detaching from %d\n", thread->unix_pid ); ! - ptrace( PTRACE_DETACH, thread->unix_pid, 0, SIGTERM ); ! + ptrace( PTRACE_DETACH, thread->unix_pid, PTRACE_KEEPIP, SIGTERM ); ! thread->attached = 0; ! } ! } ! @@ -137,7 +142,7 @@ ! { ! if (!thread->unix_pid) return; ! if (!thread->attached) kill( thread->unix_pid, SIGCONT ); ! - else ptrace( PTRACE_CONT, thread->unix_pid, 0, SIGSTOP ); ! + else ptrace( PTRACE_CONT, thread->unix_pid, PTRACE_KEEPIP, SIGSTOP ); ! } ! ! /* read an int from a thread address space */ --- 1,33 ---- ! *** server/ptrace.c.orig Tue Apr 4 21:55:28 2000 ! --- server/ptrace.c Thu May 18 09:40:09 2000 ! *************** ! *** 36,41 **** ! --- 36,46 ---- ! #ifndef PTRACE_POKEDATA ! #define PTRACE_POKEDATA PT_WRITE_D ! #endif ! + #ifdef __FreeBSD__ ! + #define PTRACE_KEEPIP 1 ! + #else ! + #define PTRACE_KEEPIP 0 ! + #endif ! ! static const int use_ptrace = 1; /* set to 0 to disable ptrace */ ! ! *************** void wait4_thread( struct thread *thread ! *** 109,115 **** ! static int attach_thread( struct thread *thread ) ! { ! /* this may fail if the client is already being debugged */ ! ! if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, 0, 0 ) == -1)) return 0; ! if (debug_level) fprintf( stderr, "%08x: *attached*\n", (unsigned int)thread ); ! thread->attached = 1; ! wait4_thread( thread, SIGSTOP ); ! --- 114,120 ---- ! static int attach_thread( struct thread *thread ) ! { ! /* this may fail if the client is already being debugged */ ! ! if (!use_ptrace || (ptrace( PTRACE_ATTACH, thread->unix_pid, PTRACE_KEEPIP, 0 ) == -1)) return 0; ! if (debug_level) fprintf( stderr, "%08x: *attached*\n", (unsigned int)thread ); ! thread->attached = 1; ! wait4_thread( thread, SIGSTOP ); *** /dev/null Thu May 18 11:50:59 2000 --- patches/patch-ga Thu May 18 11:24:28 2000 *************** *** 0 **** --- 1,23 ---- + *** include/winsock.h.orig Thu May 18 11:21:35 2000 + --- include/winsock.h Thu May 18 11:20:29 2000 + *************** + *** 7,12 **** + --- 7,14 ---- + #ifndef _WINSOCKAPI_ + #define _WINSOCKAPI_ + + + #include + + + /* Solaris kludge */ + #undef FSHIFT + #undef PAGESIZE + *************** + *** 17,23 **** + #undef TRANSPARENT + + #include + - #include + #include + #include + #include + --- 19,24 ---- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message