aboutsummaryrefslogtreecommitdiffstats
path: root/games/glbsp/files
diff options
context:
space:
mode:
authorpav <pav@FreeBSD.org>2004-12-19 02:33:12 +0800
committerpav <pav@FreeBSD.org>2004-12-19 02:33:12 +0800
commitab99919ffe75650c9aaf84ef853febd77d7ff9c9 (patch)
tree8c19f94f812f184c8b04c0bec2747e0a09ea648f /games/glbsp/files
parent2a3cf49f42525bb35c5b5faeb5742b5094d8902a (diff)
downloadfreebsd-ports-gnome-ab99919ffe75650c9aaf84ef853febd77d7ff9c9.tar.gz
freebsd-ports-gnome-ab99919ffe75650c9aaf84ef853febd77d7ff9c9.tar.zst
freebsd-ports-gnome-ab99919ffe75650c9aaf84ef853febd77d7ff9c9.zip
- Update to 2.10c
PR: ports/75203 Submitted by: Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)
Diffstat (limited to 'games/glbsp/files')
-rw-r--r--games/glbsp/files/patch-GUI.mak (renamed from games/glbsp/files/patch-fltk-makefile.unx)19
-rw-r--r--games/glbsp/files/patch-Makefile (renamed from games/glbsp/files/patch-cmdline-makefile.unx)9
2 files changed, 16 insertions, 12 deletions
diff --git a/games/glbsp/files/patch-fltk-makefile.unx b/games/glbsp/files/patch-GUI.mak
index 1110fa178986..0ca2a31b913f 100644
--- a/games/glbsp/files/patch-fltk-makefile.unx
+++ b/games/glbsp/files/patch-GUI.mak
@@ -1,24 +1,25 @@
---- fltk/makefile.unx.orig Thu Jan 22 12:32:28 2004
-+++ fltk/makefile.unx Thu Jan 22 12:35:18 2004
+
+$FreeBSD$
+
+--- GUI.mak.orig
++++ GUI.mak
@@ -8,14 +8,14 @@
PROGNAME=glBSPX
-FLTK_CFLAGS=-I/usr/local/lib
--FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
-+FLTK_CFLAGS=`%%FLTK_CONFIG%% --cflags`
-+FLTK_LIBS=`%%FLTK_CONFIG%% --ldflags` -lfltk_images
++FLTK_CFLAGS=-I${X11BASE}/include
+ FLTK_LIBS=-lfltk_images -lfltk -lX11 -lXext -lpng -ljpeg
-CC=gcc
-CXX=g++
-CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
--CXXFLAGS=$(CFLAGS)
--LDFLAGS=-L/usr/X11R6/lib
+CC?=gcc
+CXX?=g++
+CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
-+CXXFLAGS+=$(CFLAGS)
-+LDFLAGS=-L${X11BASE}/lib
+ CXXFLAGS=$(CFLAGS)
+-LDFLAGS=-L/usr/X11R6/lib
++LDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib
LIBS=-lm $(FLTK_LIBS)
OBJS=$(SYSDIR)/main.o \
diff --git a/games/glbsp/files/patch-cmdline-makefile.unx b/games/glbsp/files/patch-Makefile
index 6e96f89e26f0..9165a5474026 100644
--- a/games/glbsp/files/patch-cmdline-makefile.unx
+++ b/games/glbsp/files/patch-Makefile
@@ -1,12 +1,15 @@
---- cmdline/makefile.unx.orig Thu Jan 22 12:16:08 2004
-+++ cmdline/makefile.unx Thu Jan 22 12:18:10 2004
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
@@ -8,8 +8,8 @@
PROGNAME=glbsp
-CC=cc
-CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
-+CC?=gcc
++CC?=cc
+CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
LIBS=-lm