From b962685c91c3eafb81fe6a50e765e1e2eae1b811 Mon Sep 17 00:00:00 2001 From: Will Andrews Date: Mon, 22 May 2000 07:18:04 +0000 Subject: Update to 1999121400 version, and add Alpha support. I modified the patch Mario created for the Makefile so it would use proper Makefile logic. PR: 18734 Submitted by: MAINTAINER --- emulators/truereality/Makefile | 21 +++-- emulators/truereality/distinfo | 2 +- emulators/truereality/files/extra-patch-alpha | 23 ++++++ emulators/truereality/files/patch-aa | 115 ++++++++++++++++++++------ emulators/truereality/files/patch-ab | 14 ++-- emulators/truereality/files/patch-ac | 6 +- 6 files changed, 138 insertions(+), 43 deletions(-) create mode 100644 emulators/truereality/files/extra-patch-alpha (limited to 'emulators') diff --git a/emulators/truereality/Makefile b/emulators/truereality/Makefile index ac4cfd2b73b9..0d29d0f9130f 100644 --- a/emulators/truereality/Makefile +++ b/emulators/truereality/Makefile @@ -6,26 +6,31 @@ # 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 + +.include + +post-patch: +.if ${ARCH} == "alpha" + @(cd ${WRKSRC} && ${PATCH} < ${FILESDIR}/patch-alpha || ${ECHO}) +.endif + do-install: @${INSTALL_PROGRAM} ${WRKSRC}/TrueReality ${PREFIX}/bin @${LN} -sf ${PREFIX}/bin/TrueReality ${PREFIX}/bin/truereality -.include +.include diff --git a/emulators/truereality/distinfo b/emulators/truereality/distinfo index dad047f83a1d..e9e207b60470 100644 --- a/emulators/truereality/distinfo +++ b/emulators/truereality/distinfo @@ -1 +1 @@ -MD5 (TrueReality-1999062900.tgz) = 59ba6cb9c4cc709a6361363fe234a103 +MD5 (TrueReality-1999121400.tar.gz) = ae7a1d245cec5bcbc94485aa18695fc2 diff --git a/emulators/truereality/files/extra-patch-alpha b/emulators/truereality/files/extra-patch-alpha new file mode 100644 index 000000000000..1474b902a0ab --- /dev/null +++ b/emulators/truereality/files/extra-patch-alpha @@ -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 --git a/emulators/truereality/files/patch-aa b/emulators/truereality/files/patch-aa index 57f632d0fa15..0f02e130d6c5 100644 --- a/emulators/truereality/files/patch-aa +++ b/emulators/truereality/files/patch-aa @@ -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 +-MAKE = make +-#MAKE = gmake ++#MAKE = make ++MAKE = gmake + #MAKE = /usr/local/bin/gmake -@@ -60,7 +60,8 @@ - HOSTCFLAGS = - #HOSTCFLAGS = -ansi -pedantic +@@ -60,8 +60,8 @@ --HOSTCPP = $(HOSTCC) -E -+HOSTCPP = $(CXX) -+#HOSTCPP = $(HOSTCC) -E - #HOSTCPP = cpp - #HOSTLD = ld -@@ -188,8 +189,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 --git a/emulators/truereality/files/patch-ab b/emulators/truereality/files/patch-ab index 1f77a9c30238..7e2c2741ae8d 100644 --- a/emulators/truereality/files/patch-ab +++ b/emulators/truereality/files/patch-ab @@ -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 --git a/emulators/truereality/files/patch-ac b/emulators/truereality/files/patch-ac index f839c9c9e30c..7e5069cf9a79 100644 --- a/emulators/truereality/files/patch-ac +++ b/emulators/truereality/files/patch-ac @@ -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) { -- cgit v1.2.3