View | Details | Raw Unified | Return to bug 33814
Collapse All | Expand All

(-)/usr/ports/games/heretic/Makefile (-4 / +21 lines)
Lines 20-32 Link Here
20
20
21
USE_X_PREFIX=	yes
21
USE_X_PREFIX=	yes
22
USE_GMAKE=	yes
22
USE_GMAKE=	yes
23
MAKE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS}
23
24
24
.if defined(WANT_FASTX11)
25
ALL_TARGET=	fastx11
26
BINARY=		xaheretic
27
.else
28
ALL_TARGET=	x11
25
ALL_TARGET=	x11
29
BINARY=		xheretic
26
BINARY=		xheretic
27
28
.if defined(WITH_FASTX11)
29
ALL_TARGET=	fastx11
30
BINARY=		xaheretic
31
.endif
32
33
.if defined(WITH_SDL)
34
ALL_TARGET=	sdl
35
BINARY=		sdlheretic
36
LIB_DEPENDS=	SDL-1.0.2:${PORTSDIR}/devel/sdl10
30
.endif
37
.endif
31
38
32
.if defined(WITHOUT_WAD)
39
.if defined(WITHOUT_WAD)
Lines 35-40 Link Here
35
PLIST_SUB=	WAD:=""
42
PLIST_SUB=	WAD:=""
36
.endif
43
.endif
37
44
45
pre-everything:
46
	@${ECHO} ""
47
	@${ECHO} "You may use the following build options:"
48
	@${ECHO} ""
49
	@${ECHO} "      WITH_FASTX11=yes  Use FastX11 support"
50
	@${ECHO} "      WITH_SDL=yes      Use SDL."
51
	@${ECHO} "      WITHOUT_WAD=yes   Don't install the wad file."
52
	@${ECHO} ""
53
38
post-extract:
54
post-extract:
39
.if !defined(WITHOUT_WAD)
55
.if !defined(WITHOUT_WAD)
40
	@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \
56
	@${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/heretic_share.wad.gz \
Lines 43-48 Link Here
43
59
44
do-install:
60
do-install:
45
	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic
61
	${INSTALL_PROGRAM} ${WRKSRC}/${BINARY} ${PREFIX}/bin/heretic
62
	${INSTALL_PROGRAM} ${WRKSRC}/sndserver ${PREFIX}/bin/sndserver
46
.if !defined(WITHOUT_WAD)
63
.if !defined(WITHOUT_WAD)
47
	@${MKDIR} ${PREFIX}/share/heretic
64
	@${MKDIR} ${PREFIX}/share/heretic
48
	${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic
65
	${INSTALL_DATA} ${WRKSRC}/heretic_share.wad ${PREFIX}/share/heretic
(-)/usr/ports/games/heretic/files/patch-aa (-7 / +13 lines)
Lines 1-5 Link Here
1
--- Makefile.orig	Tue May  2 10:57:07 2000
1
--- Makefile.orig	Tue May  2 03:57:07 2000
2
+++ Makefile	Wed Jan 10 04:45:14 2001
2
+++ Makefile	Thu Jan 10 19:33:45 2002
3
@@ -1,19 +1,19 @@
3
@@ -1,19 +1,19 @@
4
 # Makefile for Linux Heretic/GLHeretic
4
 # Makefile for Linux Heretic/GLHeretic
5
 
5
 
Lines 37-43 Link Here
37
 COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
37
 COPT.alpha = -O2 -D__64BIT__ -DHAVE_ALLOCA_H
38
 
38
 
39
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__
39
-COPT.FreeBSD = -m486 -O2 -malign-jumps=2 -malign-functions=2 -D__32BIT__
40
+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR="\"${PREFIX}/share/heretic\""
40
+COPT.FreeBSD = -D__32BIT__ -DHOMEDIR='"\"${PREFIX}/share/heretic\""'
41
 
41
 
42
 COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
42
 COPT.arm = -O2 -D__32BIT__ -fsigned-char -fomit-frame-pointer \
43
            -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
43
            -DHAVE_ALLOCA_H -D__PACKED__=__attribute__\ \(\(packed\)\)
Lines 53-70 Link Here
53
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
53
-CFLAGS = -Wall $(CDEFS.udp) $(COPT.arch) \
54
-	 -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
54
-	 -I. -I.. -I/usr/X11R6/include $(COPT.sound) $(COPT.opengl)
55
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \
55
+CFLAGS += $(CDEFS.udp) $(COPT.arch) \
56
+	 -I. -I.. -I${X11BASE}/include $(COPT.sound) $(COPT.opengl)
56
+	 -I. -I.. -I${X11BASE}/include -I${LOCALBASE}/include $(COPT.sound) $(COPT.opengl)
57
 
57
 
58
 # Uncomment the line below if you want to use original "[" and "]" keys
58
 # Uncomment the line below if you want to use original "[" and "]" keys
59
 # for inventory access, instead of "k" and "l".
59
 # for inventory access, instead of "k" and "l".
60
@@ -85,12 +85,12 @@
60
@@ -85,18 +85,18 @@
61
 COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
61
 COPT.sound = -D__DOSOUND__ -DSNDSERV -Isoundclient -D__DOMUSIC__ -DMUSSERV # -D_DEBUGSOUND
62
 X11LIBS = -lXext -lX11
62
 X11LIBS = -lXext -lX11
63
 
63
 
64
-MUSSERV = musserver
64
-MUSSERV = musserver
65
-SNDSERV = sndserver
66
+#MUSSERV = musserver
65
+#MUSSERV = musserver
67
+#SNDSERV = sndserver
66
 SNDSERV = sndserver
68
 
67
 
69
 endif
68
 endif
70
 
69
 
Lines 73-78 Link Here
73
 
72
 
74
 X11LIBS = -lXext -lX11
73
 X11LIBS = -lXext -lX11
75
 GLLIBS  = -lSDL -lpthread
74
 GLLIBS  = -lSDL -lpthread
75
 GGILIBS = -lggi -lm
76
 VGALIBS = -lvga
77
-SDLLIBS = -lSDL -lpthread 
78
+SDLLIBS = -L${LOCALBASE}/lib -lSDL ${PTHREAD_LIBS}
79
 
80
 OBJS =	am_map.o ct_chat.o d_main.o d_net.o f_finale.o g_game.o \
81
 	p_ceilng.o p_doors.o p_enemy.o p_floor.o p_inter.o p_lights.o \
76
@@ -104,7 +104,7 @@
82
@@ -104,7 +104,7 @@
77
 	p_spec.o p_switch.o p_telept.o  p_tick.o p_user.o r_bsp.o r_data.o \
83
 	p_spec.o p_switch.o p_telept.o  p_tick.o p_user.o r_bsp.o r_data.o \
78
 	r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
84
 	r_draw.o r_plane.o r_segs.o r_things.o r_main.o mn_menu.o sb_bar.o \
(-)/usr/ports/games/heretic/files/patch-aj (+10 lines)
Line 0 Link Here
1
--- sndserv/Makefile.orig	Sat Oct 23 11:02:21 1999
2
+++ sndserv/Makefile	Thu Jan 10 19:34:23 2002
3
@@ -1,6 +1,6 @@
4
 CC = gcc
5
 
6
-CFLAGS=	-Wall -Wstrict-prototypes $(COPT.arch)
7
+CFLAGS=	-Wall -Wstrict-prototypes $(COPT.arch) -I/usr/include/sys
8
 
9
 LIBS=	-lm
10
 
(-)/usr/ports/games/heretic/files/patch-ak (+11 lines)
Line 0 Link Here
1
--- sndserv/linux.c.orig	Thu Jan 10 19:06:58 2002
2
+++ sndserv/linux.c	Thu Jan 10 19:07:06 2002
3
@@ -32,7 +32,7 @@
4
 #include <unistd.h>
5
 #include <sys/ioctl.h>
6
 
7
-#include <linux/soundcard.h>
8
+#include <soundcard.h>
9
 
10
 #include "soundsrv.h"
11
 
(-)/usr/ports/games/heretic/pkg-plist (+1 lines)
Lines 1-4 Link Here
1
bin/heretic
1
bin/heretic
2
bin/sndserver
2
%%PORTDOCS%%share/doc/heretic/AUTHORS
3
%%PORTDOCS%%share/doc/heretic/AUTHORS
3
%%PORTDOCS%%share/doc/heretic/Changelog
4
%%PORTDOCS%%share/doc/heretic/Changelog
4
%%PORTDOCS%%share/doc/heretic/End User License Heretic Source Code.txt
5
%%PORTDOCS%%share/doc/heretic/End User License Heretic Source Code.txt

Return to bug 33814