summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-11-02 21:54:04 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-11-02 21:54:04 +0000
commit552ea42833eb66e286c8cf4f0dde9c041f8c7264 (patch)
tree2453887adb0296ab29537697966ce377f1ce9f92 /games
parentFix build on FreeBSD 4.x. (diff)
- Respect X11BASE
PR: ports/88206 Submitted by: Li-Lun Wang (Leland Wang) <llwang@infor.org> (maintainer)
Notes
Notes: svn path=/head/; revision=147055
Diffstat (limited to 'games')
-rw-r--r--games/noegnud-littlehack/files/noegnud-littlehack.patch4
-rw-r--r--games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch4
-rw-r--r--games/noegnud-nethack/files/noegnud-nethack.patch4
-rw-r--r--games/noegnud-slashem/files/noegnud-slashem.patch33
4 files changed, 25 insertions, 20 deletions
diff --git a/games/noegnud-littlehack/files/noegnud-littlehack.patch b/games/noegnud-littlehack/files/noegnud-littlehack.patch
index e9adcf6e2df8..7cc51e5b48fe 100644
--- a/games/noegnud-littlehack/files/noegnud-littlehack.patch
+++ b/games/noegnud-littlehack/files/noegnud-littlehack.patch
@@ -64,7 +64,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
# compile normally
-COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DLITTLEHACK_0_0_1 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@ diff -urN variants/littlehack-0.0.1.orig/sys/unix/Makefile.src variants/littleha
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
index 9d2c6a36a620..6b9ea1c2a789 100644
--- a/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
+++ b/games/noegnud-nethack-deet/files/noegnud-nethack-deet.patch
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DNETHACK_3_4_2_DEET -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -82,7 +82,7 @@ diff -urN variants/nethack-3.4.2-deet.orig/sys/unix/Makefile.src variants/nethac
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-nethack/files/noegnud-nethack.patch b/games/noegnud-nethack/files/noegnud-nethack.patch
index 9009573b7934..94d7198efb1f 100644
--- a/games/noegnud-nethack/files/noegnud-nethack.patch
+++ b/games/noegnud-nethack/files/noegnud-nethack.patch
@@ -64,7 +64,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
# compile normally
-COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DNETHACK_3_4_3 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -73,7 +73,7 @@ diff -urN variants/nethack-3.4.3.orig/sys/unix/Makefile.src variants/nethack-3.4
+CFLAGS += $(STD_CFLAGS)
-LFLAGS = -L/usr/X11R6/lib
-+LFLAGS = -L/usr/X11R6/lib -lgnuregex
++LFLAGS = -L${X11BASE}/lib -lgnuregex
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
diff --git a/games/noegnud-slashem/files/noegnud-slashem.patch b/games/noegnud-slashem/files/noegnud-slashem.patch
index 591cd4a0d64e..1afe73864a6a 100644
--- a/games/noegnud-slashem/files/noegnud-slashem.patch
+++ b/games/noegnud-slashem/files/noegnud-slashem.patch
@@ -1,6 +1,6 @@
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem-0.0.6E4F8/sys/unix/Makefile.src
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src Sat Nov 20 21:53:09 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.src Sat Oct 29 18:51:48 2005
@@ -31,7 +31,7 @@
# For Systos users compiling on the ST, you'll either need a bourne shell
# clone or you'll need to do make depend, etc. by hand. In either case,
@@ -19,12 +19,12 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
#
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
#
-@@ -118,12 +118,12 @@
+@@ -118,14 +118,14 @@
# flags for Linux
# compile normally
-COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include `sdl-config --cflags`
-+COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I/usr/X11R6/include
++COMMON_CFLAGS = -DSLASHEM_0_0_6E4F8 -fomit-frame-pointer -I../include -I/usr/include/gnu `${SDL_CONFIG} --cflags` -I${X11BASE}/include
STD_CFLAGS = -O2 -ffast-math $(COMMON_CFLAGS)
DBG_CFLAGS = -g -Wall -DNOEGNUDDEBUG $(COMMON_CFLAGS)
@@ -32,8 +32,11 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
-CFLAGS = $(STD_CFLAGS)
+CFLAGS += $(STD_CFLAGS)
- LFLAGS = -L/usr/X11R6/lib
+-LFLAGS = -L/usr/X11R6/lib
++LFLAGS = -L${X11BASE}/lib
# OR compile backwards compatible a.out format
+ # CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
+ # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
@@ -176,9 +176,9 @@
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LD line here to get
@@ -59,8 +62,8 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.src variants/slashem
NOEGNUD = ../win/noegnud/noegnud
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top variants/slashem-0.0.6E4F8/sys/unix/Makefile.top
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top Sat Nov 20 21:53:30 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.top Sat Oct 29 18:46:03 2005
@@ -14,7 +14,7 @@
# MAKE = make
@@ -80,8 +83,8 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.top variants/slashem
FILE_AREA_VAR = $(VARDIR)
FILE_AREA_SAVE = $(VARDIR)/save
diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl
---- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl Sat Nov 20 21:50:19 2004
-+++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl Sat Nov 20 21:54:19 2004
+--- variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl Sat Oct 29 18:45:35 2005
++++ variants/slashem-0.0.6E4F8/sys/unix/Makefile.utl Sat Oct 29 18:51:52 2005
@@ -15,7 +15,7 @@
# if you are using gcc as your compiler,
@@ -91,18 +94,20 @@ diff -urN variants/slashem-0.0.6E4F8.orig/sys/unix/Makefile.utl variants/slashem
#
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
#
-@@ -72,7 +72,7 @@
+@@ -72,8 +72,8 @@
# flags for Linux
# compile normally
-CFLAGS = -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
-+CFLAGS += -O2 -fomit-frame-pointer -I../include -I/usr/X11R6/include
- LFLAGS = -L/usr/X11R6/lib
+-LFLAGS = -L/usr/X11R6/lib
++CFLAGS += -O2 -fomit-frame-pointer -I../include -I${X11BASE}/include
++LFLAGS = -L${X11BASE}/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include -I/usr/X11/include
+ # LFLAGS = -b i486-linuxaout -L/usr/X11/lib
diff -urN variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c variants/slashem-0.0.6E4F8/win/tty/termcap.c
---- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c Sat Nov 20 23:11:00 2004
-+++ variants/slashem-0.0.6E4F8/win/tty/termcap.c Sat Nov 20 23:11:19 2004
+--- variants/slashem-0.0.6E4F8.orig/win/tty/termcap.c Sun Mar 31 16:06:19 2002
++++ variants/slashem-0.0.6E4F8/win/tty/termcap.c Sat Oct 29 18:46:03 2005
@@ -835,7 +835,7 @@
#include <curses.h>