From c6a2501ef2a438d205325e3d382a031aa8486319 Mon Sep 17 00:00:00 2001
From: Pietro Cerutti <gahr@FreeBSD.org>
Date: Tue, 23 Mar 2010 21:14:39 +0000
Subject: - Chase x11-toolkits/fltk update

---
 games/glbsp/Makefile                |  1 +
 games/glbsp/files/patch-GUI_unx.mak | 17 ++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'games/glbsp')

diff --git a/games/glbsp/Makefile b/games/glbsp/Makefile
index 2e0bff1b9505..6fd4658b6a06 100644
--- a/games/glbsp/Makefile
+++ b/games/glbsp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	glbsp
 PORTVERSION=	2.20
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_src_${PORTVERSION:S/.//}
diff --git a/games/glbsp/files/patch-GUI_unx.mak b/games/glbsp/files/patch-GUI_unx.mak
index 12d06d09d511..ff5e934fdad0 100644
--- a/games/glbsp/files/patch-GUI_unx.mak
+++ b/games/glbsp/files/patch-GUI_unx.mak
@@ -1,26 +1,25 @@
---- GUI_unx.mak.orig
-+++ GUI_unx.mak
-@@ -8,16 +8,16 @@
+--- GUI_unx.mak.orig	2005-09-16 07:29:39.000000000 +0200
++++ GUI_unx.mak	2010-01-08 15:40:37.000000000 +0100
+@@ -8,16 +8,15 @@
  
  PROGNAME=glBSPX
  
 -FLTK_PREFIX=../fltk-1.1.6
 -FLTK_CFLAGS=-I$(FLTK_PREFIX) -I$(FLTK_PREFIX)/zlib
 -FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images -lfltk_png -lfltk_z -lfltk_jpeg \
+-          -lfltk -lX11 -lXext
 +FLTK_PREFIX=${LOCALBASE}
-+FLTK_CFLAGS=-I$(FLTK_PREFIX)/include
-+FLTK_LIBS=-L$(FLTK_PREFIX)/lib -lfltk_images \
-           -lfltk -lX11 -lXext
++FLTK_CFLAGS=`fltk-config --use-images --cflags`
++FLTK_LIBS=`fltk-config --use-images --ldflags`
  
 -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)
+ CFLAGS=-O2 -Wall -DGLBSP_GUI -DUNIX -DINLINE_G=inline $(FLTK_CFLAGS)
  CXXFLAGS=$(CFLAGS)
 -LDFLAGS=-L/usr/X11R6/lib
-+LDFLAGS=-L${LOCALBASE}/lib
++LDFLAGS?=-L/usr/X11R6/lib
  LIBS=-lm $(FLTK_LIBS)
  
  OBJS=$(SYSDIR)/main.o     \
-- 
cgit v1.2.3