Date: 22 May 2000 00:36:35 -0000 From: lioux@uol.com.br To: FreeBSD-gnats-submit@freebsd.org Subject: ports/18734: Update port emulators/truereality Message-ID: <20000522003635.26375.qmail@Fedaykin.here>
next in thread | raw e-mail | index | archive | help
>Number: 18734
>Category: ports
>Synopsis: Update port emulators/truereality
>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: Sun May 21 19:30:04 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: Mario Sergio Fujikawa Ferreira
>Release: FreeBSD 4.0-STABLE i386
>Organization:
>Environment:
FreeBSD Here.here 4.0-STABLE FreeBSD 4.0-STABLE #16: Fri May 12 22:39:32 EST 2000 lioux@Here.here:/usr/src/sys/compile/LIOUX i386
>Description:
Updated port to version 1999121400. Besides, added port compability
for alpha ARCH.
Added files:
files/patch-alpha
patches/patch-ad
ps: I am the maintainer :)
>How-To-Repeat:
n/a
>Fix:
diff -ruN ./Makefile /home/lioux/bin/ports/truereality/Makefile
--- ./Makefile Wed Apr 12 13:45:49 2000
+++ /home/lioux/bin/ports/truereality/Makefile Sun May 21 21:32:54 2000
@@ -6,23 +6,25 @@
#
PORTNAME= truereality
-PORTVERSION= 1999062900
+PORTVERSION= ${DATE}
CATEGORIES= emulators devel
MASTER_SITES= http://www.emuhq.com/emulators/
DISTNAME= TrueReality-${PORTVERSION}
-EXTRACT_SUFX= .tgz
MAINTAINER= lioux@linf.unb.br
-LIB_DEPENDS= GL.14:${PORTSDIR}/graphics/Mesa3 \
- GLU.14:${PORTSDIR}/graphics/Mesa3 \
- X11.6:${PORTSDIR}/x11/XFree86 \
- Xext.6:${PORTSDIR}/x11/XFree86
-
USE_GMAKE= yes
USE_XLIB= yes
+MAKE_ARGS= X11BASE=${X11BASE}
+
WRKSRC= ${WRKDIR}/TrueReality/Source
+
+DATE= 1999121400
+
+post-patch:
+ @[ "${ARCH}" = "alpha" ] && cd ${WRKSRC} && \
+ ${PATCH} < ${FILESDIR}/patch-alpha || ${ECHO}
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/TrueReality ${PREFIX}/bin
diff -ruN ./files/md5 /home/lioux/bin/ports/truereality/files/md5
--- ./files/md5 Sat Dec 25 13:50:03 1999
+++ /home/lioux/bin/ports/truereality/files/md5 Sat May 20 13:08:18 2000
@@ -1 +1 @@
-MD5 (TrueReality-1999062900.tgz) = 59ba6cb9c4cc709a6361363fe234a103
+MD5 (TrueReality-1999121400.tar.gz) = ae7a1d245cec5bcbc94485aa18695fc2
diff -ruN ./files/patch-alpha /home/lioux/bin/ports/truereality/files/patch-alpha
--- ./files/patch-alpha Wed Dec 31 21:00:00 1969
+++ /home/lioux/bin/ports/truereality/files/patch-alpha Sun May 21 21:24:54 2000
@@ -0,0 +1,23 @@
+--- Makefile.config.ORIG Sun May 21 21:24:16 2000
++++ Makefile.config Sun May 21 21:24:45 2000
+@@ -168,7 +168,7 @@
+ #CFLAGS := $(CFLAGS) -malign-loops=3
+
+ # for alpha
+-#CFLAGS := $(CFLAGS) -mcpu=ev4
++CFLAGS := $(CFLAGS) -mcpu=ev4
+ #CFLAGS := $(CFLAGS) -mcpu=ev5
+ #CFLAGS := $(CFLAGS) -mcpu=ev6
+ #CFLAGS := $(CFLAGS) -mcpu=ev7
+@@ -203,9 +203,9 @@
+ #ASM := $(ASM) CPU
+ #ASM := $(ASM) MEMORY
+
+-#CPU = alpha
++CPU = alpha
+ #CPU = arm
+-CPU = i386
++#CPU = i386
+ #CPU = m68k
+ #CPU = mips
+ #CPU = ppc
diff -ruN ./patches/patch-aa /home/lioux/bin/ports/truereality/patches/patch-aa
--- ./patches/patch-aa Sat Dec 25 13:50:04 1999
+++ /home/lioux/bin/ports/truereality/patches/patch-aa Sat May 20 15:17:03 2000
@@ -1,34 +1,101 @@
---- Makefile.tmpl.ORIG Sat Nov 27 22:21:16 1999
-+++ Makefile.tmpl Sun Nov 28 15:40:17 1999
-@@ -39,8 +39,8 @@
+--- Makefile.config.orig Sat Dec 11 11:25:44 1999
++++ Makefile.config Sat May 20 15:16:47 2000
+@@ -46,8 +46,8 @@
###############################################################################
# it might be that you need gmake (in my distribution make is a link to gmake)
--MAKE = make
--#MAKE = gmake
-+#MAKE = make
-+MAKE = gmake
- #MAKE = /usr/local/bin/gmake
-
-
-@@ -60,7 +60,8 @@
- HOSTCFLAGS =
- #HOSTCFLAGS = -ansi -pedantic
-
--HOSTCPP = $(HOSTCC) -E
-+HOSTCPP = $(CXX)
-+#HOSTCPP = $(HOSTCC) -E
- #HOSTCPP = cpp
-
- #HOSTLD = ld
-@@ -188,8 +189,8 @@
+-MAKE = make
+-#MAKE = gmake
++#MAKE = make
++MAKE = gmake
+ #MAKE = /usr/local/bin/gmake
+
+
+@@ -60,8 +60,8 @@
+
+
+ # various prgs
+-INSTALL = cp
+-#INSTALL = install
++#INSTALL = cp
++INSTALL = install
+ #INSTALL = copy
+
+ RM = rm -f
+@@ -83,17 +83,17 @@
+ #TR_HOME = c:/truereality/source
+
+ CINCL := $(CINCL) -I$(TR_HOME)
+-CINCL := $(CINCL) -I/usr/local/X11R6/default/include
++#CINCL := $(CINCL) -I/usr/local/X11R6/default/include
+ #CINCL := $(CINCL) -I/usr/local/mesa/default/include
+ #CINCL := $(CINCL) -I/usr/X11/include
+-#CINCL := $(CINCL) -I/usr/X11R6/include
++CINCL := $(CINCL) -I$(X11BASE)/include
+ #CINCL := $(CINCL) -I/usr/openwin/include
+ #CINCL := $(CINCL) -I GG:pcc-amigaos/os-include
+
+-LDLIBS := $(LDLIBS) -L/usr/local/X11R6/default/lib
++#LDLIBS := $(LDLIBS) -L/usr/local/X11R6/default/lib
+ #LDLIBS := $(LDLIBS) -L/usr/local/mesa/default/lib
+ #LDLIBS := $(LDLIBS) -L/usr/X11/lib
+-#LDLIBS := $(LDLIBS) -L/usr/X11R6/lib
++LDLIBS := $(LDLIBS) -L$(X11BASE)/lib
+ #LDLIBS := $(LDLIBS) -L/usr/openwin/lib
+
+
+@@ -148,7 +148,10 @@
+ #CFLAGS := $(CFLAGS) -funroll-loops
+ #CFLAGS := $(CFLAGS) -g3
+ #CFLAGS := $(CFLAGS) -ggdb3
+-CFLAGS := $(CFLAGS) -ansi -pedantic
++#CFLAGS := $(CFLAGS) -ansi -pedantic
++CFLAGS := $(CFLAGS) -g
++CFLAGS := $(CFLAGS) $(CINCL)
++
+
+
+ # for amiga
+@@ -165,7 +168,7 @@
+ #CFLAGS := $(CFLAGS) -malign-loops=3
+
+ # for alpha
+-CFLAGS := $(CFLAGS) -mcpu=ev4
++#CFLAGS := $(CFLAGS) -mcpu=ev4
+ #CFLAGS := $(CFLAGS) -mcpu=ev5
+ #CFLAGS := $(CFLAGS) -mcpu=ev6
+ #CFLAGS := $(CFLAGS) -mcpu=ev7
+@@ -200,9 +203,9 @@
+ #ASM := $(ASM) CPU
+ #ASM := $(ASM) MEMORY
+
+-CPU = alpha
++#CPU = alpha
+ #CPU = arm
+-#CPU = i386
++CPU = i386
+ #CPU = m68k
+ #CPU = mips
+ #CPU = ppc
+@@ -228,10 +231,10 @@
# #
###############################################################################
--ARCH = linux
--#ARCH = bsd
-+#ARCH = linux
-+ARCH = bsd
- #ARCH = sunos
- #ARCH = solaris
- #ARCH = aix
+-#ARCHITECTURE = bsd
++ARCHITECTURE = bsd
+ #ARCHITECTURE = hpux
+ #ARCHITECTURE = irix
+-ARCHITECTURE = linux
++#ARCHITECTURE = linux
+ #ARCHITECTURE = osf
+ #ARCHITECTURE = qnx
+ #ARCHITECTURE = sunos
+@@ -556,7 +559,7 @@
+ #ZLIB = -DWITH_ZLIB
+
+ # dynamic #
+-#ZLIB_DYN = -L/usr/local/zlib/1.1.2/lib -lz
++ZLIB_DYN = -L/usr/local/lib -lz
+
+ # static #
+ #ZLIB_STAT = /usr/local/zlib/1.1.2/lib/libz.a
diff -ruN ./patches/patch-ab /home/lioux/bin/ports/truereality/patches/patch-ab
--- ./patches/patch-ab Sat Dec 25 13:50:04 1999
+++ /home/lioux/bin/ports/truereality/patches/patch-ab Sat May 20 13:56:56 2000
@@ -1,12 +1,12 @@
---- Makefile.ORIG Sat Nov 27 23:06:31 1999
-+++ Makefile Sun Nov 28 15:18:03 1999
-@@ -354,6 +354,9 @@
- ifeq ($(ARCH),os2)
- LDLIBS := $(LDLIBS) -lMesaGL -lMesaGLU -lglut
+--- Makefile.vars.ORIG Sat May 20 13:55:28 2000
++++ Makefile.vars Sat May 20 13:56:19 2000
+@@ -217,6 +217,9 @@
endif
+
+ ifeq "$(findstring OPENGL,$(EXPERIMENTAL))" "OPENGL"
+ifeq ($(ARCH),bsd)
-+LDLIBS := $(LDLIBS) -lMesaGL -lMesaGLU
++LDLIBS := $(LDLIBS) -lGL -lGLU -lglut
+endif
- ifeq ($(ARCH),linux)
+ ifeq ($(ARCH),os2)
LDLIBS := $(LDLIBS) -lMesaGL -lMesaGLU -lglut
endif
diff -ruN ./patches/patch-ac /home/lioux/bin/ports/truereality/patches/patch-ac
--- ./patches/patch-ac Sat Dec 25 13:50:04 1999
+++ /home/lioux/bin/ports/truereality/patches/patch-ac Sat May 20 15:21:07 2000
@@ -1,6 +1,6 @@
---- N64/memory.c.ORIG Sun Nov 28 14:21:18 1999
-+++ N64/memory.c Sun Nov 28 14:23:34 1999
-@@ -346,7 +346,8 @@
+--- N64/memory.c.orig Sat May 20 15:18:49 2000
++++ N64/memory.c Sat May 20 15:20:56 2000
+@@ -312,7 +312,8 @@
mem_shminfo[i].shmid = shmget(IPC_PRIVATE, mem_size[i], IPC_CREAT | 0777);
if(mem_shminfo[i].shmid < 0)
{
diff -ruN ./patches/patch-ad /home/lioux/bin/ports/truereality/patches/patch-ad
--- ./patches/patch-ad Wed Dec 31 21:00:00 1969
+++ /home/lioux/bin/ports/truereality/patches/patch-ad Sat May 20 13:38:38 2000
@@ -0,0 +1,108 @@
+--- os/bsd/signal.c.orig Tue Nov 16 15:02:45 1999
++++ os/bsd/signal.c Sat May 20 13:36:15 2000
+@@ -39,51 +39,37 @@
+
+ #include <signal.h>
+
+-#include <dispatch.h>
++#include "../../main.h"
++#include "../../N64/registers.h"
+ #include <parser_extern.h>
+
+-#include "../os.h"
+-#include "signal.h"
++static void signal_handler(int signum);
+
+
+
+
+
+-void CatchSignals()
+-{
+- signal(SIGINT, stop_signal); /* CTRL+C pressed -> cpu halt -> debugger */
+- signal(SIGQUIT, shutdown_signal);
+- signal(SIGTERM, shutdown_signal);
+-#if DISPLAY_SUPPORT
+- signal(SIGHUP, visualkilled_signal); /* should be sent if display killed */
+- signal(SIGPIPE, shutdown_signal); /* when pipe is broken */
+-#endif
+-
+-} /* void CatchSignals() */
+
+
+
+
+
+-void shutdown_signal()
+-{
+- dispatch(SHUTDOWN, 0);
+-
+-} /* void shutdown_signal() */
+
+
+
+
+
+-void stop_signal()
++void tr_signals_catch()
+ {
+- signal(SIGINT, SIG_IGN);
+-
+- dispatch(CPU_STOP, 0);
++ signal(SIGINT, signal_handler); /* CTRL+C pressed -> cpu halt ->
++debugger */
++ signal(SIGQUIT, signal_handler);
++ signal(SIGTERM, signal_handler);
++#ifdef TR_DISPLAY
++ signal(SIGPIPE, signal_handler); /* when pipe is broken */
++#endif
+
+- signal(SIGINT, stop_signal); /* CTRL+C pressed -> cpu halt -> debugger */
+-
+-} /* void shutdown_signal() */
++} /* void tr_signals_catch() */
+
+
+
+@@ -91,15 +77,36 @@
+
+
+
+-#if DISPLAY_SUPPORT
+-void visualkilled_signal()
++static void signal_handler(int signum)
+ {
+- prefs.display = NO_DISPLAY;
+-
+-} /* void visualkilled_signal() */
++ signal(signum, SIG_IGN);
++ switch(signum)
++ {
++#ifdef TR_DEBUG
++ case SIGINT:
++ case SIGQUIT:
++ reg.halt = 1; /* stop cpu */
++ break;
++#else
++ case SIGINT:
++ case SIGQUIT:
+ #endif
++ case SIGTERM:
++ /* ask for shutting down the emulation */
++ tr_shutdown();
++ break;
++
++#ifdef TR_DISPLAY
++ case SIGPIPE:
++ prefs.display = NO_DISPLAY;
++ break;
++#endif
++
++ } /* switch(signum) */
+
++ signal(signum, signal_handler);
+
++} /* static void signal_handler(int signum) */
+
+
+
>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?20000522003635.26375.qmail>