Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fltk/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- Makefile	9 Feb 2010 15:13:28 -0000	1.52
+++ Makefile	9 Mar 2010 14:41:33 -0000
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION=	1.1.9
-PORTREVISION=	2
+PORTVERSION=	1.1.10
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
 MASTER_SITE_SUBDIR=	fltk/${PORTVERSION}
-.ifdef WITH_THREADS
-PKGNAMESUFFIX=	-threads
-.endif
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	gahr@FreeBSD.org
@@ -22,51 +18,26 @@
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 
-.if defined(WITH_THREADS)
-CONFIGURE_ARGS+=--enable-threads
-CPPFLAGS+=	"${PTHREAD_CFLAGS}"
-LDFLAGS+=	"${PTHREAD_LIBS}"
-CONFLICTS=	fltk-1*
-.else
-CONFLICTS=	fltk-threads-1*
-.endif
-
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	xft
+USE_GL=		gl glu
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-shared --enable-xft
+CONFIGURE_ARGS+=--enable-threads \
+		--enable-shared \
+		--enable-xft
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-# configure ignores ${CXX} and keeps on linking C++ code with ${CC}
-CONFIGURE_ENV+=	CC="${CXX}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USE_GL=		gl glu
-
-MAN1=		fluid.1 fltk-config.1
-MAN3=		fltk.3
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
 
-.include <bsd.port.pre.mk>
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-pre-everything::
-.if !defined(WITH_THREADS)
-	@${ECHO_MSG} "===>  You can enable threads support by defining WITH_THREADS"
-	@${ECHO_MSG} "===>"
-.endif
+MAN1=	fltk-config.1 fluid.1
+MAN3=	fltk.3
 
-post-patch:
-	${REINPLACE_CMD} -e 's|.$${FL_MINOR_VERSION}||; \
-	    s|CAT1EXT=0|CAT1EXT=1|g; s|CAT3EXT=0|CAT3EXT=3|g' \
-	    ${WRKSRC}/configure ${WRKSRC}/configure.in
-	${REINPLACE_CMD} -e 's|.1.1|.1|g' ${WRKSRC}/src/Makefile
-	${REINPLACE_CMD} -e 's|LINKSHARED)|LINKSHARED) ../src/fl_gtk.o|' \
-	    ${WRKSRC}/fluid/Makefile
-	${REINPLACE_CMD} -e 's|cat1|man1|g;s|cat3|man3|g' ${WRKSRC}/documentation/Makefile
-post-configure:
-	${REINPLACE_CMD} -e '78s|=|= -L../src|' ${WRKSRC}/makeinclude
-.if defined(NOPORTDOCS)
-	${REINPLACE_CMD} -e 's|test ||' ${WRKSRC}/Makefile
-	${REINPLACE_CMD} -e '234,238d' ${WRKSRC}/documentation/Makefile
+post-install:
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} \* ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fltk/distinfo,v
retrieving revision 1.16
diff -u -r1.16 distinfo
--- distinfo	28 Aug 2008 06:52:25 -0000	1.16
+++ distinfo	7 Jan 2010 09:52:12 -0000
@@ -1,3 +1,3 @@
-MD5 (fltk-1.1.9-source.tar.bz2) = e146fd264e1001b1313acfd41ef75552
-SHA256 (fltk-1.1.9-source.tar.bz2) = facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
-SIZE (fltk-1.1.9-source.tar.bz2) = 2206178
+MD5 (fltk-1.1.10-source.tar.bz2) = a1765594bc427ff892e36089fe1fa672
+SHA256 (fltk-1.1.10-source.tar.bz2) = 37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
+SIZE (fltk-1.1.10-source.tar.bz2) = 2214382
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fltk/pkg-plist,v
retrieving revision 1.11
diff -u -r1.11 pkg-plist
--- pkg-plist	28 Aug 2008 06:52:25 -0000	1.11
+++ pkg-plist	9 Mar 2010 14:47:34 -0000
@@ -1,5 +1,5 @@
-bin/fluid
 bin/fltk-config
+bin/fluid
 include/FL/Enumerations.H
 include/FL/Enumerations.h
 include/FL/Fl.H
@@ -136,14 +136,14 @@
 include/FL/Fl_Preferences.h
 include/FL/Fl_Progress.H
 include/FL/Fl_Progress.h
+include/FL/Fl_RGB_Image.H
+include/FL/Fl_RGB_Image.h
 include/FL/Fl_Radio_Button.H
 include/FL/Fl_Radio_Button.h
 include/FL/Fl_Radio_Light_Button.H
 include/FL/Fl_Radio_Light_Button.h
 include/FL/Fl_Radio_Round_Button.H
 include/FL/Fl_Radio_Round_Button.h
-include/FL/Fl_RGB_Image.H
-include/FL/Fl_RGB_Image.h
 include/FL/Fl_Repeat_Button.H
 include/FL/Fl_Repeat_Button.h
 include/FL/Fl_Return_Button.H
@@ -247,18 +247,23 @@
 include/FL/win32.h
 include/FL/x.H
 include/FL/x.h
+include/Fl
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1
+lib/libfltk.so.1.1
+lib/libfltk_forms.a
+lib/libfltk_forms.so
+lib/libfltk_forms.so.1
+lib/libfltk_forms.so.1.1
 lib/libfltk_gl.a
 lib/libfltk_gl.so
 lib/libfltk_gl.so.1
+lib/libfltk_gl.so.1.1
 lib/libfltk_images.a
 lib/libfltk_images.so
 lib/libfltk_images.so.1
-lib/libfltk_forms.a
-lib/libfltk_forms.so
-lib/libfltk_forms.so.1
+lib/libfltk_images.so.1.1
 %%PORTDOCS%%%%DOCSDIR%%/FL.gif
 %%PORTDOCS%%%%DOCSDIR%%/Fl.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Adjuster.html
@@ -358,12 +363,18 @@
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Wizard.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_XBM_Image.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_XPM_Image.html
+%%PORTDOCS%%%%DOCSDIR%%/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/adjuster1.gif
 %%PORTDOCS%%%%DOCSDIR%%/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/basics.html
+%%PORTDOCS%%%%DOCSDIR%%/blocks.0
+%%PORTDOCS%%%%DOCSDIR%%/blocks.man
 %%PORTDOCS%%%%DOCSDIR%%/boxtypes.gif
 %%PORTDOCS%%%%DOCSDIR%%/buttons.gif
 %%PORTDOCS%%%%DOCSDIR%%/charts.gif
+%%PORTDOCS%%%%DOCSDIR%%/checkers.0
+%%PORTDOCS%%%%DOCSDIR%%/checkers.man
 %%PORTDOCS%%%%DOCSDIR%%/choice.gif
 %%PORTDOCS%%%%DOCSDIR%%/clock.gif
 %%PORTDOCS%%%%DOCSDIR%%/common.html
@@ -520,10 +531,17 @@
 %%PORTDOCS%%%%DOCSDIR%%/fl_message.gif
 %%PORTDOCS%%%%DOCSDIR%%/fl_password.gif
 %%PORTDOCS%%%%DOCSDIR%%/fl_show_colormap.gif
+%%PORTDOCS%%%%DOCSDIR%%/fltk-config.0
+%%PORTDOCS%%%%DOCSDIR%%/fltk-config.man
+%%PORTDOCS%%%%DOCSDIR%%/fltk.0
+%%PORTDOCS%%%%DOCSDIR%%/fltk.book
+%%PORTDOCS%%%%DOCSDIR%%/fltk.man
 %%PORTDOCS%%%%DOCSDIR%%/fluid-catgets.gif
 %%PORTDOCS%%%%DOCSDIR%%/fluid-gettext.gif
 %%PORTDOCS%%%%DOCSDIR%%/fluid-org.gif
+%%PORTDOCS%%%%DOCSDIR%%/fluid.0
 %%PORTDOCS%%%%DOCSDIR%%/fluid.html
+%%PORTDOCS%%%%DOCSDIR%%/fluid.man
 %%PORTDOCS%%%%DOCSDIR%%/fluid1.gif
 %%PORTDOCS%%%%DOCSDIR%%/fluid2.gif
 %%PORTDOCS%%%%DOCSDIR%%/fluid3-cxx.gif
@@ -556,14 +574,15 @@
 %%PORTDOCS%%%%DOCSDIR%%/scrollbar.gif
 %%PORTDOCS%%%%DOCSDIR%%/slider.gif
 %%PORTDOCS%%%%DOCSDIR%%/subclassing.html
+%%PORTDOCS%%%%DOCSDIR%%/sudoku.0
+%%PORTDOCS%%%%DOCSDIR%%/sudoku.man
 %%PORTDOCS%%%%DOCSDIR%%/symbols.gif
 %%PORTDOCS%%%%DOCSDIR%%/tabs.gif
 %%PORTDOCS%%%%DOCSDIR%%/text.gif
 %%PORTDOCS%%%%DOCSDIR%%/valuators.gif
 %%PORTDOCS%%%%DOCSDIR%%/value_slider.gif
 %%PORTDOCS%%%%DOCSDIR%%/widgets.html
-@dirrm include/FL
-include/Fl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/FL
Index: files/patch-documentation_Makefile
===================================================================
RCS file: files/patch-documentation_Makefile
diff -N files/patch-documentation_Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-documentation_Makefile	9 Mar 2010 14:47:08 -0000
@@ -0,0 +1,14 @@
+--- documentation/Makefile.orig	2010-03-09 15:46:16.000000000 +0100
++++ documentation/Makefile	2010-03-09 15:46:58.000000000 +0100
+@@ -237,11 +237,6 @@
+ 		$(INSTALL_DATA) $$file $(DESTDIR)$(docdir); \
+ 	done
+ 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	$(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+-	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+-	$(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ 	$(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
Index: files/patch-src_Makefile
===================================================================
RCS file: files/patch-src_Makefile
diff -N files/patch-src_Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src_Makefile	9 Mar 2010 14:45:42 -0000
@@ -0,0 +1,34 @@
+--- src/Makefile.orig	2010-03-09 15:43:18.000000000 +0100
++++ src/Makefile	2010-03-09 15:45:30.000000000 +0100
+@@ -508,6 +508,7 @@
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ 		$(INSTALL_LIB) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\
++		$(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so.1;\
+ 	fi
+ 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
+@@ -539,6 +540,7 @@
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+ 		$(INSTALL_LIB) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
++		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so.1;\
+ 	fi
+ 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+@@ -570,6 +572,7 @@
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+ 		$(INSTALL_LIB) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
++		$(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so.1;\
+ 	fi
+ 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
+@@ -601,6 +604,7 @@
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+ 		$(INSTALL_LIB) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \
+ 		$(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
++		$(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so.1;\
+ 	fi
+ 	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
Index: files/patch-src_filename_list.cxx
===================================================================
RCS file: /home/pcvs/ports/x11-toolkits/fltk/files/patch-src_filename_list.cxx,v
retrieving revision 1.6
diff -u -r1.6 patch-src_filename_list.cxx
--- files/patch-src_filename_list.cxx	5 Mar 2010 16:09:04 -0000	1.6
+++ files/patch-src_filename_list.cxx	9 Mar 2010 07:55:12 -0000
@@ -1,5 +1,5 @@
---- src/filename_list.cxx.orig	2006-06-09 18:16:34.000000000 +0200
-+++ src/filename_list.cxx	2010-02-15 14:57:40.000000000 +0100
+--- src/filename_list.cxx.orig	2010-03-09 08:52:26.000000000 +0100
++++ src/filename_list.cxx	2010-03-09 08:54:53.000000000 +0100
 @@ -30,7 +30,7 @@
  #include <FL/filename.H>
  #include "flstring.h"
@@ -13,8 +13,8 @@
                       Fl_File_Sort_F *sort) {
  #ifndef HAVE_SCANDIR
    int n = scandir(d, list, 0, sort);
--#elif defined(__hpux) || defined(__CYGWIN__)
-+#elif defined(__hpux) || defined(__CYGWIN__) || (defined(__FreeBSD__)  && (__FreeBSD_version >= 900006 || (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || (__FreeBSD_version >= 730000 && __FreeBSD_version < 800000)))
-   // HP-UX, Cygwin define the comparison function like this:
+-#elif defined(HAVE_SCANDIR_POSIX)
++#elif defined(HAVE_SCANDIR_POSIX) || (defined(__FreeBSD__)  && (__FreeBSD_version >= 900006 || (__FreeBSD_version >= 800501 && __FreeBSD_version < 900000) || (__FreeBSD_version >= 730000 && __FreeBSD_version < 800000)))
+   // POSIX (2008) defines the comparison function like this:
    int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort);
  #elif defined(__osf__)