- Chase x11-toolkits/fltk update

9 files changed, 30 insertions, 22 deletions

diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile
index d7918edb2586..89d22da1c198 100644
--- a/games/burrtools/Makefile
+++ b/games/burrtools/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	burrtools
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
@@ -23,8 +23,8 @@ USE_XORG=	x11 xt xext xmu xi
 USE_GL=		glu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="`fltk-config --cxxflags`" \
+		LDFLAGS="`fltk-config --ldflags`"
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
diff --git a/games/edge/Makefile b/games/edge/Makefile
index d02f9cccf5f7..9f4d65c02b5d 100644
--- a/games/edge/Makefile
+++ b/games/edge/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	edge
 PORTVERSION=	1.29
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/EDGE%20Source%20Code/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -28,6 +28,7 @@ SCONS_ARGS=	release=true
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DMDIR%%|${DMDIR}|;' ${WRKSRC}/src/e_main.cc
+	@${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|;' ${WRKSRC}/SConstruct
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gledge32 ${PREFIX}/bin/${PORTNAME}
diff --git a/games/edge/files/patch-SConstruct b/games/edge/files/patch-SConstruct
index 4bcf4a4e8498..d30a717887aa 100644
--- a/games/edge/files/patch-SConstruct
+++ b/games/edge/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- ./SConstruct.orig	Wed Jun  6 10:07:47 2007
-+++ ./SConstruct	Wed Dec  5 23:19:09 2007
+--- SConstruct.orig	2007-06-06 15:07:47.000000000 +0200
++++ SConstruct	2010-03-12 11:00:55.000000000 +0100
 @@ -27,6 +27,14 @@
  if build_info['cross']:
    base_env.Tool('crossmingw', toolpath=['build'])
@@ -15,3 +15,11 @@
  # warnings
  base_env.Append(CCFLAGS = ['-Wall'])
  
+@@ -100,6 +108,7 @@
+     env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags')
+     env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib'])
+     env.Append(LIBS = ['fltk', 'fltk_images'])
++    env.Append(LINKFLAGS = ['%%PTHREAD_LIBS%%'])
+ 
+ # HawkNL
+ if 0:
diff --git a/games/fgrun/Makefile b/games/fgrun/Makefile
index 18a40497e850..1c1fa08e3adc 100644
--- a/games/fgrun/Makefile
+++ b/games/fgrun/Makefile
@@ -13,11 +13,10 @@ MASTER_SITES=	SF
 MAINTAINER=	buganini@gmail.com
 COMMENT=	A graphical frontend to run FlightGear Flight Simulator
 
-BUILD_DEPENDS=	fltk-threads>=1.1.9:${PORTSDIR}/x11-toolkits/fltk-threads \
-		SimGear>=2.0.0:${PORTSDIR}/devel/simgear \
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
+BUILD_DEPENDS=	SimGear>=2.0.0:${PORTSDIR}/devel/simgear \
 		plib>=1.8.5:${PORTSDIR}/x11-toolkits/plib
-RUN_DEPENDS=	fltk-threads>=1.1.9:${PORTSDIR}/x11-toolkits/fltk-threads \
-		SimGear>=2.0.0:${PORTSDIR}/devel/simgear \
+RUN_DEPENDS=	SimGear>=2.0.0:${PORTSDIR}/devel/simgear \
 		fgfs:${PORTSDIR}/games/flightgear \
 		plib>=1.8.5:${PORTSDIR}/x11-toolkits/plib
 
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     \
diff --git a/games/palomino/Makefile b/games/palomino/Makefile
index 9506edfb56a7..71aa2100da3b 100644
--- a/games/palomino/Makefile
+++ b/games/palomino/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	palomino
 PORTVERSION=	20090615
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-sim/release_src/${PORTVERSION} \
 		ftp://ftp.palomino3d.org/sim/
diff --git a/games/toycars/Makefile b/games/toycars/Makefile
index c2048f0f233a..f758e83d4957 100644
--- a/games/toycars/Makefile
+++ b/games/toycars/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	toycars
 PORTVERSION=	0.3.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF
 
diff --git a/games/tuxpaint-config/Makefile b/games/tuxpaint-config/Makefile
index 067c6ce82d10..d39ee3670b58 100644
--- a/games/tuxpaint-config/Makefile
+++ b/games/tuxpaint-config/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuxpaint-config
 PORTVERSION=	0.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/tuxpaint/${PORTNAME}/${PORTVERSION}