- Chase x11-toolkits/fltk update

51 files changed, 206 insertions, 132 deletions

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 6a98c77a8b88..88d10a913b63 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	csound
-PORTVERSION=	5.11.1
-PORTREVISION=	3
+PORTVERSION=	5.12.1
 CATEGORIES=	audio lang
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.11/:src \
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.12/:src \
 		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}5.10/:manual
 # Developer does not include a newer version of the manual.
 MASTER_SITE_SUBDIR=	${PORTNAME:S/$/:src/}
@@ -21,7 +20,7 @@ MAINTAINER=	chris@officialunix.com
 COMMENT=	Sound synthesizer
 
 LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
-		fltk.1:${PORTSDIR}/x11-toolkits/fltk-threads
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/
@@ -47,10 +46,6 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 DISTFILES+=	Csound5.10_manual_html.zip:manual
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to link
-.endif
-
 post-patch: apply-slist
 	@${SETENV} LOCALBASE=${LOCALBASE} ${SH} ${SCRIPTDIR}/check-fltk-threads.sh
 	@${MV} ${WRKDIR}/custom.py ${WRKSRC}
diff --git a/audio/csound/distinfo b/audio/csound/distinfo
index e56b4517324b..6aa591b59837 100644
--- a/audio/csound/distinfo
+++ b/audio/csound/distinfo
@@ -1,6 +1,6 @@
-MD5 (csound/Csound5.11.1.tar.gz) = 12d56dcead29004b4d0d052c2a1fbdb8
-SHA256 (csound/Csound5.11.1.tar.gz) = e011c47c067df6d020f7927dc1cb951e8ea4ca81a8f058fdf74e3b827ae202d8
-SIZE (csound/Csound5.11.1.tar.gz) = 6073214
+MD5 (csound/Csound5.12.1.tar.gz) = 70b0c4a159c4960a09719674657949c9
+SHA256 (csound/Csound5.12.1.tar.gz) = 89173d666df4e109e6bbbd9232e68f7710711fa0e853a29f7704aa01d502360d
+SIZE (csound/Csound5.12.1.tar.gz) = 6121581
 MD5 (csound/Csound5.10_manual_html.zip) = e1eba0da11cfc1d85ef2113a81af91eb
 SHA256 (csound/Csound5.10_manual_html.zip) = 2c544a1bda8897a8364fa806109bdfca6f9e01495bace014d207db145f8324b1
 SIZE (csound/Csound5.10_manual_html.zip) = 5381988
diff --git a/audio/raop_play/Makefile b/audio/raop_play/Makefile
index f35e1e575c38..de909fe8edbc 100644
--- a/audio/raop_play/Makefile
+++ b/audio/raop_play/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	raop_play
 PORTVERSION=	0.5.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	SF/raop-play/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -23,17 +23,11 @@ RUN_DEPENDS=	mpg321:${PORTSDIR}/audio/mpg321 \
 		flac:${PORTSDIR}/audio/flac
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="`fltk-config --ldflags`"
 USE_GMAKE=	yes
 USE_GNOME=	glib20
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 800000 && ( ${ARCH} == "amd64" || ${ARCH} == "sparc64" )
-BROKEN=		incomplete build
-.endif
-
 pre-build:
 	${CP} ${FILESDIR}/getline.c ${FILESDIR}/getline.h ${WRKSRC}/rendezvous/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/raop_play/files/getline.h b/audio/raop_play/files/getline.h
index 3bbad5698eb3..2816a0641af1 100644
--- a/audio/raop_play/files/getline.h
+++ b/audio/raop_play/files/getline.h
@@ -11,6 +11,7 @@
 
 #define GETLINE_NO_LIMIT -1
 
+#ifndef _WITH_GETLINE
 int
   getline __PROTO ((char **_lineptr, size_t *_n, FILE *_stream));
 int
@@ -19,5 +20,5 @@ int
 int
   getstr __PROTO ((char **_lineptr, size_t *_n, FILE *_stream,
 		   int _terminator, int _offset, int limit));
-
+#endif
 #endif /* _getline_h_ */
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 6e4a31c5de69..30ed9ee8fc40 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spiralloops
 PORTVERSION=	2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralLoops/dload/
 DISTNAME=	SpiralLoops-${PORTVERSION}
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index e0c42abfb88d..ab936b21a190 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spiralsynth
 PORTVERSION=	0.1.7
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://www.pawfal.org/Software/SpiralSynth/dload/
 DISTNAME=	SpiralSynth-${PORTVERSION}
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile
index fe4112d7ea38..06511d96bb0c 100644
--- a/audio/spiralsynthmodular/Makefile
+++ b/audio/spiralsynthmodular/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	spiralsynthmodular
 PORTVERSION=	0.2.2a
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	SF/spiralmodular/spiralmodular/${PORTVERSION}%20%28Latest%20Version%29
 DISTNAME=	spiralmodular-${PORTVERSION}
diff --git a/audio/zynaddsubfx/Makefile b/audio/zynaddsubfx/Makefile
index e02c82f4491f..fc798d54f843 100644
--- a/audio/zynaddsubfx/Makefile
+++ b/audio/zynaddsubfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	zynaddsubfx
 PORTVERSION=	2.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	SF
 DISTNAME=	ZynAddSubFX-${PORTVERSION}
diff --git a/biology/seaview/Makefile b/biology/seaview/Makefile
index fc1c4a9fce4f..f5abbf2b6c8b 100644
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	seaview
 PORTVERSION=	2006.02.13
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
diff --git a/biology/seaview/files/patch-Makefile b/biology/seaview/files/patch-Makefile
index 78eec35f57fb..230b42d736bf 100644
--- a/biology/seaview/files/patch-Makefile
+++ b/biology/seaview/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Apr  3 16:30:03 2006
-+++ Makefile	Mon Apr  3 16:35:59 2006
+--- Makefile.orig	2010-01-08 13:42:25.000000000 +0100
++++ Makefile	2010-01-08 13:42:24.000000000 +0100
 @@ -1,18 +1,15 @@
 -FLTK = ../fltk
 -PDF = ../PDFlib-Lite-6.0.1/libs/pdflib
@@ -7,7 +7,7 @@
  CXX = g++
  
 -CFLAGS  = -Dunix  -U__APPLE__  -c $(OPT) -I$(FLTK) -I$(PDF) -I$(X11)/include 
-+CFLAGS+= -Dunix -U__APPLE__ -c $(OPT) -I$(LOCALBASE)/include
++CFLAGS+= -Dunix -U__APPLE__ -c $(OPT) `fltk-config --cflags`
  
  
  OBJECTS = seaview.o pdf.o custom.o use_mase_files.o regions.o load_seq.o align.o xfmatpt.o comlines.o chooser_plus.o resource.o nexus.o
@@ -17,7 +17,7 @@
 -	$(CXX) -o $@ $(OBJECTS) -L$(FLTK)/lib -lfltk \
 -             -Xlinker -Bstatic -L$(PDF)/.libs -lpdf -Xlinker -Bdynamic \
 -             -L$(X11)/lib -lX11 -lm 
-+	$(CXX) -o $@ $(OBJECTS) -L$(LOCALBASE)/lib -lfltk \
++	$(CXX) -o $@ $(OBJECTS) `fltk-config --ldflags` \
 +             -Xlinker -Bstatic -lpdf -Xlinker -Bdynamic \
 +             -L$(LOCALBASE)/lib -lX11 -lm 
  	strip $@
diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 9fccc2b51171..81ca4dae02c0 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmsh
 PORTVERSION=	2.4.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -34,7 +34,9 @@ ALL_TARGET=	all
 
 MAN1=		gmsh.1
 
-CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=YES
+CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=YES \
+    		-DCMAKE_VERBOSE_MAKEFILE:BOOL=YES \
+		-DCMAKE_USE_PTHREADS:BOOL=YES
 
 .if !defined(WITHOUT_STATIC_LIB)
 ALL_TARGET+=	lib
diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile
index ce3e1f034ab7..4c02799592be 100644
--- a/cad/opencascade/Makefile
+++ b/cad/opencascade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		opencascade
 PORTVERSION=		6.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=		cad science
 MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
diff --git a/comms/fldigi/Makefile b/comms/fldigi/Makefile
index 71c7173867a2..c3561e167577 100644
--- a/comms/fldigi/Makefile
+++ b/comms/fldigi/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fldigi
 PORTVERSION=	3.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/fldigi-distro/ \
 		${MASTER_SITE_LOCAL}
@@ -16,12 +16,13 @@ MASTER_SITE_SUBDIR=	db
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Digital decoder for psk, cw, psk31, olivia
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2 \
-		fltk-threads>=0:${PORTSDIR}/x11-toolkits/fltk-threads
+BUILD_DEPENDS=	${LOCALBASE}/lib/portaudio2/libportaudio.so:${PORTSDIR}/audio/portaudio2
 LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
 		sndfile:${PORTSDIR}/audio/libsndfile \
 		boost_wave:${PORTSDIR}/devel/boost-libs \
-		pulse:${PORTSDIR}/audio/pulseaudio
+		pulse:${PORTSDIR}/audio/pulseaudio \
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	hamlib:${PORTSDIR}/comms/hamlib \
 
 USE_DOS2UNIX=	yes
 USE_GMAKE=	yes
diff --git a/comms/geoid/Makefile b/comms/geoid/Makefile
index c17e9ad50faa..d43ac2d60896 100644
--- a/comms/geoid/Makefile
+++ b/comms/geoid/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	geoid
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	.src
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://www.w1hkj.com/LinuxApps/ \
@@ -19,7 +19,7 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	db@FreeBSD.org
 COMMENT=	Geodetic computer for amateur radio use
 
-LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk-threads
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_GMAKE=	yes
 MAKEFILE=	makefile
diff --git a/comms/xmorse/Makefile b/comms/xmorse/Makefile
index 410e95c28376..6643efaac8c3 100644
--- a/comms/xmorse/Makefile
+++ b/comms/xmorse/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmorse
 PORTVERSION=	20041125
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	comms hamradio
 MASTER_SITES=	http://c2.com/morse/files/SourceCode/ \
 		http://www.525183.com/freebsd/xmorse/ \
diff --git a/finance/xtrader/Makefile b/finance/xtrader/Makefile
index bf14ac6553e9..8768c01db2ec 100644
--- a/finance/xtrader/Makefile
+++ b/finance/xtrader/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xtrader
 PORTVERSION=	0.99.9
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/OldFiles
 
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}
 
diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index bded4324f0af..d6d0dbb35455 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cinepaint
 PORTVERSION=	0.22
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/CinePaint/CinePaint-${PORTVERSION}-1
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -43,9 +43,8 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_OPENEXR)
-LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR
-BUILD_DEPENDS+=	fltk-threads>0:${PORTSDIR}/x11-toolkits/fltk-threads
-RUN_DEPENDS+=	fltk-threads>0:${PORTSDIR}/x11-toolkits/fltk-threads
+LIB_DEPENDS+=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
+    		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 CONFIGURE_ARGS+=	--with-openexr-prefix=${LOCALBASE}
 CFLAGS+=	-I${LOCALBASE}/include/openEXR
 PLIST_SUB+=	OPENEXR:=""
diff --git a/graphics/flphoto/Makefile b/graphics/flphoto/Makefile
index 8a71b03e24e9..9812008a51a8 100644
--- a/graphics/flphoto/Makefile
+++ b/graphics/flphoto/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flphoto
 PORTVERSION=	1.3.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	SF/fltk/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile
index eebc16026ea7..1ba14543b03e 100644
--- a/graphics/libgfx/Makefile
+++ b/graphics/libgfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgfx
 DISTVERSION=	1.1.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/ CENKES
 
@@ -37,6 +37,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|\.a|.so|g;/RANLIB/d;s|[(]AR[)] cru|{CC} \
 		${CFLAGS} ${LDFLAGS} -shared $${GUI_LIBS} -lgzstream -o|'\
 		${WRKSRC}/src/${MAKEFILE}
+	@${REINPLACE_CMD} -e '6115s|-lfltk|`fltk-config --ldflags`|' \
+	    ${WRKSRC}/configure
 
 do-install:
 	@cd ${WRKSRC}/include/gfx/&&${COPYTREE_SHARE} . ${PREFIX}/include/gfx/
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index ea3e174da825..fa896d8eca4d 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	2.2.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
 DISTNAME=	Pixie-src-${PORTVERSION}
diff --git a/graphics/quat-gui/Makefile b/graphics/quat-gui/Makefile
index d9aa6ca210f4..c27f1e5ae69e 100644
--- a/graphics/quat-gui/Makefile
+++ b/graphics/quat-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	quat
 PORTVERSION=	1.20
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.physcip.uni-stuttgart.de/phy11733/download/
 PKGNAMESUFFIX=	-gui
diff --git a/math/mbasecalc/Makefile b/math/mbasecalc/Makefile
index 6ceb9d309562..89e8e6502578 100644
--- a/math/mbasecalc/Makefile
+++ b/math/mbasecalc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mbasecalc
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	http://www.muquit.com/muquit/software/mbasecalc/
 DISTNAME=	${PORTNAME}
@@ -17,8 +17,8 @@ COMMENT=	Simple calculator program inspired by basecalc
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-MAKE_ARGS=	INCLUDES="-I${LOCALBASE}/include -I." \
-		LIBS="-L${LOCALBASE}/lib -lfltk -lX11"
+MAKE_ARGS=	INCLUDES="`fltk-config --cflags` -I." \
+		LIBS="`fltk-config --ldflags`"
 
 PLIST_FILES=	bin/mbasecalc
 
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 2b193a266f28..95e3728a54a0 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	octave
 PORTVERSION=	3.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.octave.org/pub/octave/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/numanal/Octave/bleeding-edge/
@@ -31,7 +31,7 @@ LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
 		fftw3f:${PORTSDIR}/math/fftw3-float \
 		fftw3:${PORTSDIR}/math/fftw3 \
 		ftgl:${PORTSDIR}/graphics/ftgl \
-		fltk:${PORTSDIR}/x11-toolkits/fltk \
+		fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 		GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
 
 USE_BZIP2=	yes
diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile
index 6c9dd8df251a..ba7026ad7b58 100644
--- a/multimedia/openmovieeditor/Makefile
+++ b/multimedia/openmovieeditor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openmovieeditor
 PORTVERSION=	0.0.20090105
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -33,7 +33,7 @@ USE_GMAKE=	yes
 USE_GL=		yes
 USE_GNOME=	glib20
 CONFIGURE_ARGS=	CPPFLAGS="-I${WRKSRC}/src/tinyxml -I${LOCALBASE}/include/portaudio2 -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib/portaudio2 -L${LOCALBASE}/lib `fltk-config --ldflags`"
 
 PORTDOCS=	*
 
diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index 89471e6f2d37..679342652579 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pose
 PORTVERSION=	3.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	palm emulators
 MASTER_SITES=	http://www.palmos.com/dev/tools/emulator/sources/ \
 		http://www.palmos.com/dev/tools/emulator/:skins
diff --git a/print/cupsddk/Makefile b/print/cupsddk/Makefile
index 9817c88685b2..211d6c1e730a 100644
--- a/print/cupsddk/Makefile
+++ b/print/cupsddk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cupsddk
 PORTVERSION=	1.2.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print devel
 MASTER_SITES=	EASYSW
 MASTER_SITE_SUBDIR=	${PORTNAME}/${DISTVERSION}
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 00abb9ba578a..f58d13734f7b 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xpp
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	SF/cups/${PORTNAME}/${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}
diff --git a/science/flounder/Makefile b/science/flounder/Makefile
index a5162810c2e6..800df2362791 100644
--- a/science/flounder/Makefile
+++ b/science/flounder/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	flounder
 PORTVERSION=	0.40
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	science
 MASTER_SITES=	http://www2.enel.ucalgary.ca/~vigmond/flounder/
 EXTRACT_SUFX=	.tgz
@@ -16,7 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A quick way to visualize regularly spaced 4D data
 
-LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk \
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 		ungif:${PORTSDIR}/graphics/libungif \
 		png:${PORTSDIR}/graphics/png
 
diff --git a/science/peekabot/Makefile b/science/peekabot/Makefile
index 6c99d2edf195..5be899d56bc0 100644
--- a/science/peekabot/Makefile
+++ b/science/peekabot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	peekabot
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.7.x/ \
 		http://distfiles.officialunix.com/
@@ -20,17 +20,11 @@ LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
-		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="`fltk-config --ldflags`" \
+		CPPFLAGS="`fltk-config --cflags`"
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GCC=	4.2+
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/vmd/Makefile b/science/vmd/Makefile
index b556b54e819a..7c1fa2080fe3 100644
--- a/science/vmd/Makefile
+++ b/science/vmd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		vmd
 PORTVERSION=		1.8.7
+PORTREVISION=		1
 CATEGORIES=		science graphics python tcl tk
 MASTER_SITES=		http://jedi.ks.uiuc.edu/~johns/raytracer/files/0.98.7/:tachyon \
 			http://www.ks.uiuc.edu/Research/vmd/extsrcs/:stride
@@ -21,7 +22,7 @@ BUILD_DEPENDS=		makedepend:${PORTSDIR}/devel/makedepend \
 			${PYNUMERIC}
 LIB_DEPENDS=		tcl85:${PORTSDIR}/lang/tcl85 \
 			tk85:${PORTSDIR}/x11-toolkits/tk85 \
-			fltk:${PORTSDIR}/x11-toolkits/fltk \
+			fltk.1:${PORTSDIR}/x11-toolkits/fltk \
 			netcdf:${PORTSDIR}/science/netcdf
 RUN_DEPENDS=		${PYNUMERIC}
 
diff --git a/textproc/fldiff/Makefile b/textproc/fldiff/Makefile
index 806d2b402d15..6fea3f0e0b6e 100644
--- a/textproc/fldiff/Makefile
+++ b/textproc/fldiff/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fldiff
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.easysw.com/~mike/fldiff/ \
 		CRITICAL
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index ac1133a93a34..c477caa80b56 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xdiskusage
 PORTVERSION=	1.48
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://xdiskusage.sourceforge.net/
 EXTRACT_SUFX=	.tgz
@@ -17,32 +17,19 @@ COMMENT=	Show where disk space is taken up
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-MAN1=		xdiskusage.1
 USE_GMAKE=	yes
-OPTIONS=	THREADS	"Threads support, necessary with threaded fltk" off
 
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/xdiskusage
+MAN1=		xdiskusage.1
 
-.if defined(WITH_THREADS)
-CXXFLAGS+=	${PTHREAD_CFLAGS}
-LDFLAGS+=	${PTHREAD_LIBS}
-.endif
+post-patch:
+	${REINPLACE_CMD} -e '22,24d' ${WRKSRC}/Makefile
 
 do-build:
-.for i in panels xdiskusage
-	${CXX} ${CXXFLAGS} -I${LOCALBASE}/include -c \
-		${WRKSRC}/${i}.C -o ${WRKSRC}/${i}.o
-.endfor
-	${CXX} ${CXXFLAGS} -L${LOCALBASE}/lib -o \
-		${WRKSRC}/xdiskusage ${WRKSRC}/panels.o \
-		${WRKSRC}/xdiskusage.o -lfltk -lm -lXext -lX11 ${LDFLAGS}
+	cd ${WRKSRC} && ${GMAKE} CXXFLAGS="`fltk-config --cxxflags`" LDFLAGS="`fltk-config --ldflags`"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xdiskusage ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xdiskusage.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-fm/xdiskusage/pkg-plist b/x11-fm/xdiskusage/pkg-plist
deleted file mode 100644
index bda9f0e6bcb6..000000000000
--- a/x11-fm/xdiskusage/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/xdiskusage
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/x11-toolkits/fl_editor/Makefile b/x11-toolkits/fl_editor/Makefile
index 92c98e1dd713..af0f9ce9abfe 100644
--- a/x11-toolkits/fl_editor/Makefile
+++ b/x11-toolkits/fl_editor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fl_editor
 PORTVERSION=	0.4.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://robertk.com/source/fl_editor/
 EXTRACT_SUFX=	.tgz
diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index 233ec597bc53..59686b013e83 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flu
 PORTVERSION=	2.14
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.osc.edu/archive/FLU/
 DISTNAME=	FLU_${PORTVERSION}
@@ -15,7 +15,7 @@ DISTNAME=	FLU_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library containing extra widgets for FLTK
 
-LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk
+LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 USE_GL=		gl
 USE_LDCONFIG=	yes
@@ -39,10 +39,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h b/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h
new file mode 100644
index 000000000000..171e5c916247
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-FLU_Flu_Tree_Browser.h
@@ -0,0 +1,51 @@
+--- FLU/Flu_Tree_Browser.h.orig	2010-01-15 11:50:51.000000000 +0100
++++ FLU/Flu_Tree_Browser.h	2010-01-15 11:55:24.000000000 +0100
+@@ -346,7 +346,7 @@
+     { return rdata.insertionMode; }
+ 
+   //! \return whether the point \c (x,y) is inside the entry area (not on the scrollbars)
+-  bool Flu_Tree_Browser :: inside_entry_area( int x, int y );
++  bool inside_entry_area( int x, int y );
+ 
+   //! Set the title of the Tree (also the label for the root entry)
+   inline void label( const char *l )
+@@ -436,23 +436,23 @@
+ 
+   //! Remove the entry identified by path \b fullpath from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( const char *fullpath );
++  unsigned long remove( const char *fullpath );
+ 
+   //! Remove entry \b name in path \b path from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( const char *path, const char *name );
++  unsigned long remove( const char *path, const char *name );
+ 
+   //! Remove the entry identified by unique id \b id from the tree
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( unsigned int id );
++  unsigned long remove( unsigned int id );
+ 
+   //! Remove the entry containing the widget \b w from the tree. Note that the widget is automatically destroyed
+   /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-  unsigned int remove( Fl_Widget *w );
++  unsigned long remove( Fl_Widget *w );
+ 
+   //! Remove Node \b n from the tree
+   /*! \return the id of \b n on successful removal, or \c 0 if \b n is not in the tree */
+-  inline unsigned int remove( Node* n )
++  inline unsigned long remove( Node* n )
+     { if( !n ) return 0; else return remove( n->id() ); }
+ 
+   //! Override of Fl_Widget::resize
+@@ -1077,8 +1077,8 @@
+ 
+       //! Remove the entry identified by path \b fullpath from this node
+       /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
+-      inline unsigned int remove( const char *fullpath )
+-	{ return( (unsigned int)modify( fullpath, REMOVE, tree->rdata ) ); }
++      inline unsigned long remove( const char *fullpath )
++	{ return( (unsigned long )modify( fullpath, REMOVE, tree->rdata ) ); }
+ 
+       //! Remove the entry identified by unique id \b id from this node
+       /*! \return the unique id of the removed entry, or \c 0 if no matching entry was found */
diff --git a/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp b/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp
new file mode 100644
index 000000000000..27f24070a9dd
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-src_Flu_File_Chooser.cpp
@@ -0,0 +1,11 @@
+--- src/Flu_File_Chooser.cpp.orig	2010-01-15 11:52:23.000000000 +0100
++++ src/Flu_File_Chooser.cpp	2010-01-15 11:52:55.000000000 +0100
+@@ -2773,7 +2773,7 @@
+   const Fl_Menu_Item *selection = entryPopup.popup();
+   if( selection )
+     {
+-      int handler = (int)selection->user_data();
++      long handler = (long)selection->user_data();
+       switch( handler )
+ 	{
+ 	case ACTION_NEW_FOLDER:
diff --git a/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp b/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp
new file mode 100644
index 000000000000..1bbd5a10def0
--- /dev/null
+++ b/x11-toolkits/flu/files/patch-src_Flu_Tree_Browser.cpp
@@ -0,0 +1,36 @@
+--- src/Flu_Tree_Browser.cpp.orig	2010-01-15 11:54:00.000000000 +0100
++++ src/Flu_Tree_Browser.cpp	2010-01-15 11:57:06.000000000 +0100
+@@ -2981,12 +2981,12 @@
+   return add( path, p.c_str(), w, showLabel );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( const char *fullpath )
++unsigned long Flu_Tree_Browser :: remove( const char *fullpath )
+ {
+-  return( (unsigned int)root.modify( fullpath, Node::REMOVE, rdata ) );
++  return( (unsigned long)root.modify( fullpath, Node::REMOVE, rdata ) );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( const char *path, const char *text )
++unsigned long Flu_Tree_Browser :: remove( const char *path, const char *text )
+ {
+   // if the path does not end in '/', add it
+   FluSimpleString s = path;
+@@ -2996,7 +2996,7 @@
+   return remove( s.c_str() );
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( unsigned int id )
++unsigned long Flu_Tree_Browser :: remove( unsigned int id )
+ {
+   return root.remove( id );
+ }
+@@ -3028,7 +3028,7 @@
+   return 0;
+ }
+ 
+-unsigned int Flu_Tree_Browser :: remove( Fl_Widget *w )
++unsigned long Flu_Tree_Browser :: remove( Fl_Widget *w )
+ {
+   return root.remove( w );
+ }
diff --git a/x11-toolkits/flvw/Makefile b/x11-toolkits/flvw/Makefile
index c25fbcdbccda..e24c4dc822eb 100644
--- a/x11-toolkits/flvw/Makefile
+++ b/x11-toolkits/flvw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flvw
 PORTVERSION=	20000224
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Febrary%20beta
 EXTRACT_SUFX=	.tgz
diff --git a/x11-toolkits/py-fltk/Makefile b/x11-toolkits/py-fltk/Makefile
index 0f2a441f0bf8..a3d39ef74bff 100644
--- a/x11-toolkits/py-fltk/Makefile
+++ b/x11-toolkits/py-fltk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fltk
 PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 81b609c386c5..ac035849aba4 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flwm
 PORTVERSION=	1.02
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
@@ -25,5 +25,6 @@ PLIST_FILES=	bin/flwm
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	${REINPLACE_CMD} -e 's|^LIBS =.*|LIBS = `fltk-config --ldflags`|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 6cb07c3ef61c..9ec1dc8a19f1 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmanager
 PORTVERSION=	0.2.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig