- Update to 1.1.9

- Minor Makefile cleanup
- Take over maintainship [1]
- Fix PLIST [2]

Approved by:	demon@ (former maintainer) [1]
Reported by:	QA Tindie [2]

13 files changed, 74 insertions, 337 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index ef94c867e90a..75002d28705b 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -6,22 +6,20 @@
 #
 
 PORTNAME=	fltk
-PORTVERSION=	${VERSION}
-PORTREVISION=	4
+PORTVERSION=	1.1.9
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_EASYSW}
-MASTER_SITE_SUBDIR=	fltk/${VERSION}
+MASTER_SITE_SUBDIR=	fltk/${PORTVERSION}
 .ifdef WITH_THREADS
 PKGNAMESUFFIX=	-threads
 .endif
-DISTNAME=	${PORTNAME}-${VERSION}-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
-MAINTAINER?=	demon@FreeBSD.org
-COMMENT?=	C++ graphical user interface for X
+MAINTAINER=	gahr@FreeBSD.org
+COMMENT=	Cross-platform C++ graphical user interface toolkit
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 .if defined(WITH_THREADS)
 CONFIGURE_ARGS+=--enable-threads
@@ -32,16 +30,17 @@ CONFLICTS=	fltk-1*
 CONFLICTS=	fltk-threads-1*
 .endif
 
-VERSION=	1.1.7
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
+USE_XORG=	xft
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--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} -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
-WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
-USE_GL=		yes
+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
@@ -54,11 +53,19 @@ pre-everything::
 	@${ECHO_MSG} "===>"
 .endif
 
-pre-configure:
+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
 .if defined(NOPORTDOCS)
-	@${REINPLACE_CMD} -e 's|%%DOCS%%|#|' ${WRKSRC}/documentation/Makefile
+	${REINPLACE_CMD} -e 's|%%DOCS%%|#|' ${WRKSRC}/documentation/Makefile
+	${REINPLACE_CMD} -e 's|test||' ${WRKSRC}/Makefile
 .else
-	@${REINPLACE_CMD} -e 's|%%DOCS%%||' ${WRKSRC}/documentation/Makefile
+	${REINPLACE_CMD} -e 's|%%DOCS%%||' ${WRKSRC}/documentation/Makefile
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index b2bc5a1b01cc..b7aecd34bba2 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1,3 +1,3 @@
-MD5 (fltk-1.1.7-source.tar.bz2) = 2e29319119adc9d63b2f26b72cae0a88
-SHA256 (fltk-1.1.7-source.tar.bz2) = 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-SIZE (fltk-1.1.7-source.tar.bz2) = 2060757
+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
diff --git a/x11-toolkits/fltk/files/patch-FL-Fl_Spinner.H b/x11-toolkits/fltk/files/patch-FL-Fl_Spinner.H
deleted file mode 100644
index a03e2624fc83..000000000000
--- a/x11-toolkits/fltk/files/patch-FL-Fl_Spinner.H
+++ /dev/null
@@ -1,14 +0,0 @@
---- FL/Fl_Spinner.H.orig	Sun Jan 14 12:57:46 2007
-+++ FL/Fl_Spinner.H	Sun Jan 14 12:58:41 2007
-@@ -127,9 +127,9 @@
- 
-   const char	*format() { return (format_); }
-   void		format(const char *f) { format_ = f; update(); }
--  double	maxinum() const { return (maximum_); }
-+  double	maximum() const { return (maximum_); }
-   void		maximum(double m) { maximum_ = m; }
--  double	mininum() const { return (minimum_); }
-+  double	minimum() const { return (minimum_); }
-   void		minimum(double m) { minimum_ = m; }
-   void		range(double a, double b) { minimum_ = a; maximum_ = b; }
-   void		resize(int X, int Y, int W, int H) {
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
deleted file mode 100644
index 56bf3ab9692d..000000000000
--- a/x11-toolkits/fltk/files/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
---- configure.orig	Wed Jan 18 11:30:52 2006
-+++ configure	Mon Nov 20 23:18:10 2006
-@@ -1326,7 +1326,7 @@
- FL_MAJOR_VERSION=1
- FL_MINOR_VERSION=1
- FL_PATCH_VERSION=7
--FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
-+FL_API_VERSION=${FL_MAJOR_VERSION}
- 
- 
- 
-@@ -2227,13 +2227,13 @@
-   CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
-+#    CFLAGS="-g -O2"
-   else
-     CFLAGS="-g"
-   fi
- else
-   if test "$GCC" = yes; then
--    CFLAGS="-O2"
-+#    CFLAGS="-O2"
-   else
-     CFLAGS=
-   fi
-@@ -2734,13 +2734,13 @@
-   CXXFLAGS=$ac_save_CXXFLAGS
- elif test $ac_cv_prog_cxx_g = yes; then
-   if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
-+#    CXXFLAGS="-g -O2"
-   else
-     CXXFLAGS="-g"
-   fi
- else
-   if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
-+#    CXXFLAGS="-O2"
-   else
-     CXXFLAGS=
-   fi
diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile
deleted file mode 100644
index 6fb2ad92a129..000000000000
--- a/x11-toolkits/fltk/files/patch-documentation-Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
---- documentation/Makefile.orig	Mon Jan 16 03:36:16 2006
-+++ documentation/Makefile	Mon Nov 20 23:20:57 2006
-@@ -227,19 +227,11 @@
- depend:
- 
- install: $(MANPAGES)
--	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
--	-$(MKDIR) $(DESTDIR)$(docdir)
--	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
--	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
-+%%DOCS%%	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
-+%%DOCS%%	-$(MKDIR) $(DESTDIR)$(docdir)
-+%%DOCS%%	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
-+%%DOCS%%	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
- 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
--	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
--	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
--	$(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
--	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
--	-$(MKDIR) $(DESTDIR)$(mandir)/cat3
--	$(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
--	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
- 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
- 	$(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
- 	$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1
diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile
deleted file mode 100644
index 6bc178e804de..000000000000
--- a/x11-toolkits/fltk/files/patch-src-Makefile
+++ /dev/null
@@ -1,130 +0,0 @@
---- src/Makefile.orig	Mon Aug  8 09:54:30 2005
-+++ src/Makefile	Mon Nov 20 23:26:04 2006
-@@ -200,17 +200,17 @@
- 	$(LIBCOMMAND) $@ $(OBJECTS)
- 	$(RANLIB) $@
- 
--libfltk.so.1.1: $(OBJECTS)
-+libfltk.so.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(OBJECTS)
- 	$(RM) libfltk.so
--	$(LN) libfltk.so.1.1 libfltk.so
-+	$(LN) libfltk.so.1 libfltk.so
- 
--libfltk.sl.1.1: $(OBJECTS)
-+libfltk.sl.1: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(OBJECTS)
- 	$(RM) libfltk.sl
--	$(LN) libfltk.sl.1.1 libfltk.sl
-+	$(LN) libfltk.sl.1 libfltk.sl
- 
- libfltk.1.1.dylib: $(OBJECTS)
- 	echo $(DSOCOMMAND) $@ ...
-@@ -236,11 +236,11 @@
- 	$(LIBCOMMAND) $@ $(FLOBJECTS)
- 	$(RANLIB) $@
- 
--libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
-+libfltk_forms.so.1: $(FLOBJECTS) libfltk.so.1
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
- 	$(RM) libfltk_forms.so
--	$(LN) libfltk_forms.so.1.1 libfltk_forms.so
-+	$(LN) libfltk_forms.so.1 libfltk_forms.so
- 
- libfltk_forms.sl.1.1: $(FLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
-@@ -272,11 +272,11 @@
- 	$(LIBCOMMAND) $@ $(GLOBJECTS)
- 	$(RANLIB) $@
- 
--libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
-+libfltk_gl.so.1: $(GLOBJECTS) libfltk.so.1
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
- 	$(RM) libfltk_gl.so
--	$(LN) libfltk_gl.so.1.1 libfltk_gl.so
-+	$(LN) libfltk_gl.so.1 libfltk_gl.so
- 
- libfltk_gl.sl.1.1: $(GLOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
-@@ -308,11 +308,11 @@
- 	$(LIBCOMMAND) $@ $(IMGOBJECTS)
- 	$(RANLIB) $@
- 
--libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
-+libfltk_images.so.1: $(IMGOBJECTS) libfltk.so.1
- 	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
- 	$(RM) libfltk_images.so
--	$(LN) libfltk_images.so.1.1 libfltk_images.so
-+	$(LN) libfltk_images.so.1 libfltk_images.so
- 
- libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
- 	echo $(DSOCOMMAND) $@ ...
-@@ -477,11 +477,11 @@
- 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
- 	fi
- 	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
--	if test x$(DSONAME) = xlibfltk.so.1.1; then\
-+	if test x$(DSONAME) = xlibfltk.so.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
--		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
--		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1.1; \
--		$(LN) libfltk.so.1.1 $(DESTDIR)$(libdir)/libfltk.so;\
-+		$(CP) libfltk.so.1 $(DESTDIR)$(libdir); \
-+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.so.1; \
-+		$(LN) libfltk.so.1 $(DESTDIR)$(libdir)/libfltk.so;\
- 	fi
- 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk.sl*;\
-@@ -516,11 +516,11 @@
- 		$(CP) libfltk.dll.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk.dll.a; \
- 	fi
--	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
-+	if test x$(FLDSONAME) = xlibfltk_forms.so.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
--		$(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
--		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \
--		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
-+		$(CP) libfltk_forms.so.1 $(DESTDIR)$(libdir); \
-+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1; \
-+		$(LN) libfltk_forms.so.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
- 	fi
- 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
-@@ -555,11 +555,11 @@
- 		$(CP) libfltk_forms.dll.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.dll.a; \
- 	fi
--	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
-+	if test x$(GLDSONAME) = xlibfltk_gl.so.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
--		$(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \
--		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1.1; \
--		$(LN) libfltk_gl.so.1.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
-+		$(CP) libfltk_gl.so.1 $(DESTDIR)$(libdir); \
-+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.so.1; \
-+		$(LN) libfltk_gl.so.1 $(DESTDIR)$(libdir)/libfltk_gl.so;\
- 	fi
- 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.sl*;\
-@@ -594,11 +594,11 @@
- 		$(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
- 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \
- 	fi
--	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
-+	if test x$(IMGDSONAME) = xlibfltk_images.so.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
--		$(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \
--		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1.1; \
--		$(LN) libfltk_images.so.1.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
-+		$(CP) libfltk_images.so.1 $(DESTDIR)$(libdir); \
-+		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_images.so.1; \
-+		$(LN) libfltk_images.so.1 $(DESTDIR)$(libdir)/libfltk_images.so;\
- 	fi
- 	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
- 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.sl*;\
diff --git a/x11-toolkits/fltk/files/patch-test_cursor.cxx b/x11-toolkits/fltk/files/patch-test_cursor.cxx
deleted file mode 100644
index d0c3f51523e4..000000000000
--- a/x11-toolkits/fltk/files/patch-test_cursor.cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/cursor.cxx.orig	Fri Apr 15 20:13:17 2005
-+++ test/cursor.cxx	Thu Sep 27 12:42:14 2007
-@@ -39,7 +39,7 @@
- Fl_Hor_Value_Slider *cursor_slider;
- 
- void choice_cb(Fl_Widget *, void *v) {
--  cursor = (Fl_Cursor)(int)v;
-+  cursor = (Fl_Cursor)(long)v;
-   cursor_slider->value(cursor);
-   fl_cursor(cursor,fg,bg);
- }
diff --git a/x11-toolkits/fltk/files/patch-test_input.cxx b/x11-toolkits/fltk/files/patch-test_input.cxx
deleted file mode 100644
index 351dd04a62b8..000000000000
--- a/x11-toolkits/fltk/files/patch-test_input.cxx
+++ /dev/null
@@ -1,19 +0,0 @@
---- test/input.cxx.orig	Fri Sep 21 21:59:12 2007
-+++ test/input.cxx	Fri Sep 21 22:44:21 2007
-@@ -26,6 +26,7 @@
- //
- 
- #include <stdio.h>
-+#include <sys/types.h>
- #include <FL/Fl.H>
- #include <FL/Fl_Window.H>
- #include <FL/Fl_Input.H>
-@@ -61,7 +62,7 @@
- 
- void color_cb(Fl_Widget* button, void* v) {
-   Fl_Color c;
--  switch ((int)v) {
-+  switch ((long)v) {
-   case 0: c = FL_BACKGROUND2_COLOR; break;
-   case 1: c = FL_SELECTION_COLOR; break;
-   default: c = FL_FOREGROUND_COLOR; break;
diff --git a/x11-toolkits/fltk/files/patch-test_keyboard.cxx b/x11-toolkits/fltk/files/patch-test_keyboard.cxx
deleted file mode 100644
index 3ae207089b73..000000000000
--- a/x11-toolkits/fltk/files/patch-test_keyboard.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
---- test/keyboard.cxx.orig	Sat Sep 22 10:00:16 2007
-+++ test/keyboard.cxx	Sat Sep 22 12:05:41 2007
-@@ -105,11 +105,11 @@
-     for (int i = 0; i < window->children(); i++) {
-       Fl_Widget* b = window->child(i);
-       if (b->callback() == (Fl_Callback*)key_cb) {
--	int i = int(b->user_data());
-+	long i = long(b->user_data());
- 	if (!i) i = b->label()[0];
- 	((Fl_Button*)b)->value(Fl::event_key(i));
-       } else if (b->callback() == (Fl_Callback*)shift_cb) {
--	int i = int(b->user_data());
-+	long i = long(b->user_data());
- 	((Fl_Button*)b)->value(Fl::event_state(i));
-       }
-     }
diff --git a/x11-toolkits/fltk/files/patch-test_line_style.cxx b/x11-toolkits/fltk/files/patch-test_line_style.cxx
deleted file mode 100644
index b31f9bd9a8de..000000000000
--- a/x11-toolkits/fltk/files/patch-test_line_style.cxx
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/line_style.cxx.orig	Sat Sep 22 12:55:42 2007
-+++ test/line_style.cxx	Sat Sep 22 12:56:25 2007
-@@ -54,9 +54,9 @@
-   buf[3] = char(sliders[7]->value());
-   buf[4] = 0;
-   fl_line_style(
--    (int)(choice[0]->mvalue()->user_data()) +
--    (int)(choice[1]->mvalue()->user_data()) +
--    (int)(choice[2]->mvalue()->user_data()),
-+    (long)(choice[0]->mvalue()->user_data()) +
-+    (long)(choice[1]->mvalue()->user_data()) +
-+    (long)(choice[2]->mvalue()->user_data()),
-     (int)(sliders[3]->value()),
-     buf);
-   fl_rect(10,10,w()-20,h()-20);
diff --git a/x11-toolkits/fltk/files/patch-test_scroll.cxx b/x11-toolkits/fltk/files/patch-test_scroll.cxx
deleted file mode 100644
index 1c340c3abd4c..000000000000
--- a/x11-toolkits/fltk/files/patch-test_scroll.cxx
+++ /dev/null
@@ -1,20 +0,0 @@
---- test/scroll.cxx.orig	Sat Sep 22 13:33:34 2007
-+++ test/scroll.cxx	Sat Sep 22 13:33:53 2007
-@@ -71,7 +71,7 @@
- }
- 
- void type_cb(Fl_Widget*, void* v) {
--  thescroll->type(int(v));
-+  thescroll->type(long(v));
-   thescroll->redraw();
- }
- 
-@@ -87,7 +87,7 @@
- };
- 
- void align_cb(Fl_Widget*, void* v) {
--  thescroll->scrollbar.align(int(v));
-+  thescroll->scrollbar.align(long(v));
-   thescroll->redraw();
- }
- 
diff --git a/x11-toolkits/fltk/pkg-descr b/x11-toolkits/fltk/pkg-descr
index 35fb3318e5ff..8c29bd9022db 100644
--- a/x11-toolkits/fltk/pkg-descr
+++ b/x11-toolkits/fltk/pkg-descr
@@ -1,7 +1,6 @@
 The Fast Light ToolKit ("FLTK", pronounced "fulltick") is a LGPL'd C++
 graphical user interface for X.
+FLTK provides modern GUI functionality without the bloat and supports
+3D graphics via OpenGL and its built-in GLUT emulation.
 
 WWW: http://www.fltk.org/
-
---Dima
-dima@chg.ru
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index b9975caa7bcb..ff8429872265 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -142,6 +142,8 @@ 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
@@ -233,12 +235,14 @@ include/FL/gl.h
 include/FL/gl2opengl.h
 include/FL/gl_draw.H
 include/FL/gl_draw.h
+include/FL/glu.h
 include/FL/glut.H
 include/FL/glut.h
 include/FL/mac.H
 include/FL/mac.h
 include/FL/mac.r
 include/FL/math.h
+include/FL/names.h
 include/FL/win32.H
 include/FL/win32.h
 include/FL/x.H
@@ -270,6 +274,7 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Check_Button.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Choice.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Clock.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Clock_Output.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Color_Chooser.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Counter.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Dial.html
@@ -340,6 +345,7 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Tile.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Tiled_Image.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Timer.html
+%%PORTDOCS%%%%DOCSDIR%%/Fl_Toggle_Button.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Tooltip.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Valuator.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_Value_Input.gif
@@ -353,6 +359,7 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/Fl_XBM_Image.html
 %%PORTDOCS%%%%DOCSDIR%%/Fl_XPM_Image.html
 %%PORTDOCS%%%%DOCSDIR%%/adjuster1.gif
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
 %%PORTDOCS%%%%DOCSDIR%%/basics.html
 %%PORTDOCS%%%%DOCSDIR%%/boxtypes.gif
 %%PORTDOCS%%%%DOCSDIR%%/buttons.gif
@@ -369,6 +376,7 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/editor.html
 %%PORTDOCS%%%%DOCSDIR%%/enumerations.html
 %%PORTDOCS%%%%DOCSDIR%%/events.html
+%%PORTDOCS%%%%DOCSDIR%%/examples.html
 %%PORTDOCS%%%%DOCSDIR%%/examples/CubeMain.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/CubeView.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/CubeView.h
@@ -379,14 +387,7 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/examples/arc.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/ask.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/bitmap.cxx
-%%PORTDOCS%%%%DOCSDIR%%/examples/black_1.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/black_2.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/black_3.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/black_4.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/blackking_1.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/blackking_2.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/blackking_3.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/blackking_4.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/blocks.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/boxtype.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/browser.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/button.cxx
@@ -447,8 +448,42 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/examples/pack.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/pixmap.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/pixmap_browser.cxx
-%%PORTDOCS%%%%DOCSDIR%%/examples/porsche.xpm
-%%PORTDOCS%%%%DOCSDIR%%/examples/porsche1.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/black_1.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/black_2.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/black_3.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/black_4.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blackking_1.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blackking_2.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blackking_3.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blackking_4.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blast.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blue.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/blue_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/cyan.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/cyan_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/gray.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/gray_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/green.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/green_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/magenta.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/magenta_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/porsche.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/porsche1.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/red.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/red_bomb.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/srs.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/sudoku.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/tile.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/white_1.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/white_2.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/white_3.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/white_4.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/whiteking_1.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/whiteking_2.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/whiteking_3.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/whiteking_4.xbm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/yellow.xpm
+%%PORTDOCS%%%%DOCSDIR%%/examples/pixmaps/yellow_bomb.xpm
 %%PORTDOCS%%%%DOCSDIR%%/examples/preferences.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/preferences.fl
 %%PORTDOCS%%%%DOCSDIR%%/examples/preferences.h
@@ -461,10 +496,8 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/examples/resizebox.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/scroll.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/shape.cxx
-%%PORTDOCS%%%%DOCSDIR%%/examples/srs.xbm
 %%PORTDOCS%%%%DOCSDIR%%/examples/subwindow.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/sudoku.cxx
-%%PORTDOCS%%%%DOCSDIR%%/examples/sudoku.xbm
 %%PORTDOCS%%%%DOCSDIR%%/examples/sudokurc.h
 %%PORTDOCS%%%%DOCSDIR%%/examples/symbols.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/tabs.cxx
@@ -473,21 +506,12 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/examples/threads.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/threads.h
 %%PORTDOCS%%%%DOCSDIR%%/examples/tile.cxx
-%%PORTDOCS%%%%DOCSDIR%%/examples/tile.xpm
 %%PORTDOCS%%%%DOCSDIR%%/examples/tiled_image.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/trackball.h
 %%PORTDOCS%%%%DOCSDIR%%/examples/unittests.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/valuators.cxx
 %%PORTDOCS%%%%DOCSDIR%%/examples/valuators.fl
 %%PORTDOCS%%%%DOCSDIR%%/examples/valuators.h
-%%PORTDOCS%%%%DOCSDIR%%/examples/white_1.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/white_2.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/white_3.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/white_4.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/whiteking_1.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/whiteking_2.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/whiteking_3.xbm
-%%PORTDOCS%%%%DOCSDIR%%/examples/whiteking_4.xbm
 %%PORTDOCS%%%%DOCSDIR%%/fl_alert.gif
 %%PORTDOCS%%%%DOCSDIR%%/fl_ask.gif
 %%PORTDOCS%%%%DOCSDIR%%/fl_choice.gif
@@ -540,5 +564,6 @@ lib/libfltk_forms.so.1
 %%PORTDOCS%%%%DOCSDIR%%/widgets.html
 @dirrm include/FL
 include/Fl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/pixmaps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%