From owner-freebsd-ports Mon Jan 6 7:30:10 2003 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76CF137B405 for ; Mon, 6 Jan 2003 07:30:04 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 275CB43ED8 for ; Mon, 6 Jan 2003 07:30:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h06FU3NS095545 for ; Mon, 6 Jan 2003 07:30:03 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h06FU2XN095544; Mon, 6 Jan 2003 07:30:03 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5F20937B401; Mon, 6 Jan 2003 07:25:39 -0800 (PST) Received: from christine.energyhq.tk (213-97-200-73.uc.nombres.ttd.es [213.97.200.73]) by mx1.FreeBSD.org (Postfix) with ESMTP id 19D7543EC2; Mon, 6 Jan 2003 07:25:38 -0800 (PST) (envelope-from flynn@christine.energyhq.tk) Received: from christine.energyhq.tk (localhost.energyhq.tk [127.0.0.1]) by christine.energyhq.tk (8.12.6/8.12.6) with ESMTP id h06FPP8U062388; Mon, 6 Jan 2003 16:25:25 +0100 (CET) (envelope-from flynn@christine.energyhq.tk) Received: (from flynn@localhost) by christine.energyhq.tk (8.12.6/8.12.6/Submit) id h06FPPUW062387; Mon, 6 Jan 2003 16:25:25 +0100 (CET) Message-Id: <200301061525.h06FPPUW062387@christine.energyhq.tk> Date: Mon, 6 Jan 2003 16:25:25 +0100 (CET) From: Miguel Mendez Reply-To: Miguel Mendez To: FreeBSD-gnats-submit@FreeBSD.org Cc: sobomax@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/46803: Unbreak emulators/basiliskII on 5.0 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46803 >Category: ports >Synopsis: Unbreak emulators/basiliskII on 5.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jan 06 07:30:02 PST 2003 >Closed-Date: >Last-Modified: >Originator: Miguel Mendez >Release: FreeBSD 5.0-RC i386 >Organization: >Environment: System: FreeBSD christine.energyhq.tk 5.0-RC FreeBSD 5.0-RC #0: Tue Dec 31 14:56:19 CET 2002 root@christine.energyhq.tk:/usr/obj/usr/src/sys/CHRISTINE i386 >Description: This port is currently broken on 5.0, fix included. >How-To-Repeat: >Fix: --- basiliskII.diff begins here --- diff -ruN basiliskII.old/Makefile basiliskII/Makefile --- basiliskII.old/Makefile Fri Aug 30 15:41:05 2002 +++ basiliskII/Makefile Mon Jan 6 16:04:06 2003 @@ -14,7 +14,7 @@ MAINTAINER= sobomax@FreeBSD.org -LIB_DEPENDS= lthread.2:${PORTSDIR}/devel/linuxthreads +LIB_DEPENDS= lthread.3:${PORTSDIR}/devel/linuxthreads WRKSRC= ${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix diff -ruN basiliskII.old/files/patch-ab basiliskII/files/patch-ab --- basiliskII.old/files/patch-ab Thu Jan 1 01:00:00 1970 +++ basiliskII/files/patch-ab Mon Jan 6 16:05:46 2003 @@ -0,0 +1,11 @@ +--- audio_oss_esd.cpp.orig Mon Jan 6 16:02:10 2003 ++++ audio_oss_esd.cpp Mon Jan 6 16:02:27 2003 +@@ -31,7 +31,7 @@ + #endif + + #ifdef __FreeBSD__ +-#include ++#include + #endif + + #include "cpu_emulation.h" diff -ruN basiliskII.old/files/patch-ac basiliskII/files/patch-ac --- basiliskII.old/files/patch-ac Thu Jan 1 01:00:00 1970 +++ basiliskII/files/patch-ac Mon Jan 6 16:11:35 2003 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Mon Jan 6 16:11:17 2003 ++++ Makefile.in Mon Jan 6 16:11:07 2003 +@@ -107,7 +107,7 @@ + $(OBJ_DIR)/build68k: $(OBJ_DIR)/build68k.o + $(CC) $(LDFLAGS) -o $(OBJ_DIR)/build68k $(OBJ_DIR)/build68k.o + $(OBJ_DIR)/gencpu: $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o +- $(CC) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o ++ $(CXX) $(LDFLAGS) -o $(OBJ_DIR)/gencpu $(OBJ_DIR)/gencpu.o $(OBJ_DIR)/readcpu.o $(OBJ_DIR)/cpudefs.o + cpudefs.cpp: $(OBJ_DIR)/build68k ../uae_cpu/table68k + $(OBJ_DIR)/build68k <../uae_cpu/table68k >cpudefs.cpp + cpustbl.cpp: cpuemu.cpp --- basiliskII.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message