Date: Sat, 12 Jan 2002 16:54:41 +0100 (CET) From: Oliver Lehmann <lehmann@ans-netz.de> To: FreeBSD-gnats-submit@freebsd.org Cc: Oliver Lehmann <lehmann@ans-netz.de> Subject: ports/33814: update-port: games/heretic Message-ID: <200201121554.g0CFsf729239@phobos.raisdorf.net>
next in thread | raw e-mail | index | archive | help
>Number: 33814
>Category: ports
>Synopsis: update-port: games/heretic
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 12 08:20:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Lehmann
>Release: FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
FreeBSD sina.sesamestreet.net 4.4-STABLE FreeBSD 4.4-STABLE #0: Sat Dec 15 16:46:48 CET 2001 olivleh1@sina.sesamestreet.net:/usr/obj/i386/usr/src/sys/SINA i386
>Description:
- I request the maintainership (insteed of ports@FreeBSD.ORG)
- please close ports/33769 it's erroneous, and would not compile.
I'd forgot to add 2 patch-files. Sorry!
- enable sound (playing a Action shooter without sound hurts ;)
- enable build for SDL based version of heretic (default is X11)
>How-To-Repeat:
>Fix:
diff -ruN heretic.old/Makefile /usr/ports/games/heretic/Makefile
--- heretic.old/Makefile Mon Apr 2 10:30:46 2001
+++ /usr/ports/games/heretic/Makefile Sat Jan 12 16:21:01 2002
@@ -20,13 +20,20 @@
USE_X_PREFIX= yes
USE_GMAKE= yes
+MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS}
-.if defined(WANT_FASTX11)
-ALL_TARGET= fastx11
-BINARY= xaheretic
-.else
ALL_TARGET= x11
BINARY= xheretic
+
+.if defined(WITH_FASTX11)
+ALL_TARGET= fastx11
+BINARY= xaheretic
+.endif
+
+.if defined(WITH_SDL)
+ALL_TARGET= sdl
+BINARY= sdlheretic
+LIB_DEPENDS= SDL-1.0.2:${PORTSDIR}/devel/sdl10
.endif
.if defined(WITHOUT_WAD)
@@ -35,6 +42,15 @@
PLIST_SUB= WAD:=""
.endif
+pre-everything:
+ @${ECHO} ""
+ @${ECHO} "You may use the following build options:"
+ @${ECHO} ""
+ @${ECHO} " WITH_FASTX11=yes Use FastX11 support"
+ @${ECHO} " WITH_SDL=yes Use SDL."
+ @${ECHO} " WITHOUT_WAD=yes Don't install the wad file."
+ @${ECHO} ""
+
post-extract:
.if !defined(WITHOUT_WAD)
@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \
@@ -43,6 +59,7 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic
+ ${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${PREFIX}/bin/sndserver
.if !defined(WITHOUT_WAD)
@${MKDIR} ${PREFIX}/share/heretic
${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic
diff -ruN heretic.old/files/patch-aa /usr/ports/games/heretic/files/patch-aa
--- heretic.old/files/patch-aa Wed Jan 10 17:09:25 2001
+++ /usr/ports/games/heretic/files/patch-aa Sat Jan 12 16:26:20 2002
@@ -1,5 +1,5 @@
---- Makefile.orig Tue May 2 10:57:07 2000
-+++ Makefile Wed Jan 10 04:45:14 2001
+--- Makefile.orig Tue May 2 03:57:07 2000
++++ Makefile Thu Jan 10 19:33:45 2002
@@ -1,19 +1,19 @@
# Makefile for Linux Heretic/GLHeretic
@@ -37,7 +37,7 @@
COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__
-+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR="\"${PREFIX}/share/heretic\""
++COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""'
COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
-DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
@@ -53,18 +53,17 @@
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
- -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \
-+ -I. -I.. -I${X11BASE}/include $(COPT.sound) $(COPT.opengl)
++ -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl)
# Uncomment the line below if you want to use original "[" and "]" keys
# for inventory access, instead of "k" and "l".
-@@ -85,12 +85,12 @@
+@@ -85,18 +85,18 @@
COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
X11LIBS = -lXext -lX11
-MUSSERV = musserver
--SNDSERV = sndserver
+#MUSSERV = musserver
-+#SNDSERV = sndserver
+ SNDSERV = sndserver
endif
@@ -73,6 +72,13 @@
X11LIBS = -lXext -lX11
GLLIBS = -lSDL -lpthread
+ GGILIBS = -lggi -lm
+ VGALIBS = -lvga
+-SDLLIBS = -lSDL -lpthread
++SDLLIBS = -L${LOCALBASE}/lib -lSDL ${PTHREAD_LIBS}
+
+ OBJS = am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
+ p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
@@ -104,7 +104,7 @@
p_spec.o p_switch.o p_telept.o p_tick.o p_user.o r_bsp.o r_data.o \
r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
diff -ruN heretic.old/files/patch-aj /usr/ports/games/heretic/files/patch-aj
--- heretic.old/files/patch-aj Thu Jan 1 01:00:00 1970
+++ /usr/ports/games/heretic/files/patch-aj Sat Jan 12 16:21:01 2002
@@ -0,0 +1,10 @@
+--- sndserv/Makefile.orig Sat Oct 23 11:02:21 1999
++++ sndserv/Makefile Thu Jan 10 19:34:23 2002
+@@ -1,6 +1,6 @@
+ CC = gcc
+
+-CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch)
++CFLAGS= -Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys
+
+ LIBS= -lm
+
diff -ruN heretic.old/files/patch-ak /usr/ports/games/heretic/files/patch-ak
--- heretic.old/files/patch-ak Thu Jan 1 01:00:00 1970
+++ /usr/ports/games/heretic/files/patch-ak Sat Jan 12 16:21:01 2002
@@ -0,0 +1,11 @@
+--- sndserv/linux.c.orig Thu Jan 10 19:06:58 2002
++++ sndserv/linux.c Thu Jan 10 19:07:06 2002
+@@ -32,7 +32,7 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+
+-#include <linux/soundcard.h>
++#include <soundcard.h>
+
+ #include "soundsrv.h"
+
diff -ruN heretic.old/pkg-plist /usr/ports/games/heretic/pkg-plist
--- heretic.old/pkg-plist Mon Dec 24 03:14:49 2001
+++ /usr/ports/games/heretic/pkg-plist Sat Jan 12 16:21:01 2002
@@ -1,4 +1,5 @@
bin/heretic
+bin/sndserver
%%PORTDOCS%%share/doc/heretic/AUTHORS
%%PORTDOCS%%share/doc/heretic/Changelog
%%PORTDOCS%%share/doc/heretic/End User License Heretic Source Code.txt
>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?200201121554.g0CFsf729239>