aboutsummaryrefslogtreecommitdiff
path: root/games/doom
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>2005-10-28 10:54:18 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>2005-10-28 10:54:18 +0000
commit410bf28c238df888a73b58fb436645cfb689b8f3 (patch)
treee77193dbd7800784c3be2b5d7b4e659dc933b54a /games/doom
parentfb9587eda2a145549424d33baa1b338fef33c9d1 (diff)
downloadports-410bf28c238df888a73b58fb436645cfb689b8f3.tar.gz
ports-410bf28c238df888a73b58fb436645cfb689b8f3.zip
Notes
Diffstat (limited to 'games/doom')
-rw-r--r--games/doom/Makefile2
-rw-r--r--games/doom/files/patch-ab22
2 files changed, 17 insertions, 7 deletions
diff --git a/games/doom/Makefile b/games/doom/Makefile
index c79e82d8b82e..0348765fa91a 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -35,7 +35,7 @@ post-extract:
@cd ${WRKDIR} && ${TAR} xzf linuxdoom-1.10.src.tgz && ${TAR} xzf sndserv.tgz
do-build:
- @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE}
+ @cd ${WRKDIR}/linuxdoom-1.10 && ${GMAKE} X11BASE=${X11BASE}
@cd ${WRKDIR}/sndserv && ${GMAKE}
do-install:
diff --git a/games/doom/files/patch-ab b/games/doom/files/patch-ab
index ae6632db024a..c5e6617c9531 100644
--- a/games/doom/files/patch-ab
+++ b/games/doom/files/patch-ab
@@ -1,16 +1,26 @@
---- linuxdoom-1.10/Makefile.orig Mon Dec 22 11:55:36 1997
-+++ linuxdoom-1.10/Makefile Sun Feb 6 16:26:51 2000
-@@ -6,9 +6,10 @@
+--- linuxdoom-1.10/Makefile.orig Mon Dec 22 20:55:36 1997
++++ linuxdoom-1.10/Makefile Fri Oct 28 12:44:09 2005
+@@ -4,11 +4,12 @@
+ #
+ # $Log:$
#
-CC= gcc # gcc or g++
+CC?= gcc # gcc or g++
-CFLAGS=-g -Wall -DNORMALUNIX -DLINUX # -DUSEASM
-+CFLAGS?= -O
-+CFLAGS+=-g -I/usr/X11R6/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM
- LDFLAGS=-L/usr/X11R6/lib
+-LDFLAGS=-L/usr/X11R6/lib
-LIBS=-lXext -lX11 -lnsl -lm
++CFLAGS?= -O
++CFLAGS+=-g -I${X11BASE}/include -Wall -DNORMALUNIX -DSNDSERV -DSNDSRV # -DUSEASM
++LDFLAGS=-L${X11BASE}/lib
+LIBS=-lXext -lX11 -lm
# subdirectory for objects
O=linux
+@@ -92,4 +93,4 @@
+
+ #############################################################
+ #
+-#############################################################
+\ No newline at end of file
++#############################################################