From ab99919ffe75650c9aaf84ef853febd77d7ff9c9 Mon Sep 17 00:00:00 2001
From: pav <pav@FreeBSD.org>
Date: Sat, 18 Dec 2004 18:33:12 +0000
Subject: - Update to 2.10c

PR:		ports/75203
Submitted by:	Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)
---
 games/glbsp/files/patch-GUI.mak              | 25 +++++++++++++++++++++++++
 games/glbsp/files/patch-Makefile             | 16 ++++++++++++++++
 games/glbsp/files/patch-cmdline-makefile.unx | 13 -------------
 games/glbsp/files/patch-fltk-makefile.unx    | 24 ------------------------
 4 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100644 games/glbsp/files/patch-GUI.mak
 create mode 100644 games/glbsp/files/patch-Makefile
 delete mode 100644 games/glbsp/files/patch-cmdline-makefile.unx
 delete mode 100644 games/glbsp/files/patch-fltk-makefile.unx

(limited to 'games/glbsp/files')

diff --git a/games/glbsp/files/patch-GUI.mak b/games/glbsp/files/patch-GUI.mak
new file mode 100644
index 000000000000..0ca2a31b913f
--- /dev/null
+++ b/games/glbsp/files/patch-GUI.mak
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- GUI.mak.orig
++++ GUI.mak
+@@ -8,14 +8,14 @@
+ 
+ PROGNAME=glBSPX
+ 
+-FLTK_CFLAGS=-I/usr/local/lib
++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)
++CC?=gcc
++CXX?=g++
++CFLAGS+=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
+ 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-Makefile b/games/glbsp/files/patch-Makefile
new file mode 100644
index 000000000000..9165a5474026
--- /dev/null
+++ b/games/glbsp/files/patch-Makefile
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
+@@ -8,8 +8,8 @@
+ 
+ PROGNAME=glbsp
+ 
+-CC=cc
+-CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
++CC?=cc
++CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
+ LIBS=-lm
+ 
+ OBJS=$(SYSDIR)/main.o     \
diff --git a/games/glbsp/files/patch-cmdline-makefile.unx b/games/glbsp/files/patch-cmdline-makefile.unx
deleted file mode 100644
index 6e96f89e26f0..000000000000
--- a/games/glbsp/files/patch-cmdline-makefile.unx
+++ /dev/null
@@ -1,13 +0,0 @@
---- cmdline/makefile.unx.orig	Thu Jan 22 12:16:08 2004
-+++ cmdline/makefile.unx	Thu Jan 22 12:18:10 2004
-@@ -8,8 +8,8 @@
- 
- PROGNAME=glbsp
- 
--CC=cc
--CFLAGS=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
-+CC?=gcc
-+CFLAGS+=-O3 -Wall -DGLBSP_TEXT -DUNIX -DINLINE_G=inline
- LIBS=-lm
- 
- OBJS=$(SYSDIR)/main.o     \
diff --git a/games/glbsp/files/patch-fltk-makefile.unx b/games/glbsp/files/patch-fltk-makefile.unx
deleted file mode 100644
index 1110fa178986..000000000000
--- a/games/glbsp/files/patch-fltk-makefile.unx
+++ /dev/null
@@ -1,24 +0,0 @@
---- fltk/makefile.unx.orig	Thu Jan 22 12:32:28 2004
-+++ fltk/makefile.unx	Thu Jan 22 12:35:18 2004
-@@ -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
- 
--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
- LIBS=-lm $(FLTK_LIBS)
- 
- OBJS=$(SYSDIR)/main.o     \
-- 
cgit