7 files changed, 284 insertions, 54 deletions

diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile
index 24d7076d9d47..23da6a303bba 100644
--- a/x11-toolkits/fltk/Makefile
+++ b/x11-toolkits/fltk/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	fltk
 PORTVERSION?=	${_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.fltk.org/pub/fltk/${VERSION}/ \
 		ftp://ftp.chg.ru/pub/X11/fltk/${VERSION}/ \
@@ -19,6 +18,9 @@ DISTNAME=	${PORTNAME}-${VERSION}-source
 
 MAINTAINER?=	demon@FreeBSD.org
 
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
+
 .if defined(WITH_XUNICODE)
 PATCH_VERSION=	20010114
 _PORTVERSION+=	${VERSION}.${PATCH_VERSION}
@@ -37,34 +39,23 @@ CONFIGURE_ENV=	CXXFLAGS=-DUSE_XUNICODE
 _PORTVERSION+=	${VERSION}
 .endif
 
-VERSION=	1.0.10
+VERSION=	1.1.2
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ENV+=	CPPFLAGS="${PTHREAD_CFLAGS}" \
-		LDFLAGS="${PTHREAD_LIBS}"
+CONFIGURE_ENV+=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 USE_X_PREFIX=	yes
 USE_MESA=	yes
-MAN1=		fluid.1
+
+MAN1=		fluid.1 fltk-config.1
+MAN3=		fltk.3
 
 .if defined(WITH_XUNICODE)
 post-extract:
 	cd ${WRKSRC} && ${LN} -s ${X11BASE}/include/xunicode
 .endif
 
-post-install:
-	@ ${INSTALL_MAN} ${WRKSRC}/documentation/fluid.1 \
-		${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${DOCSDIR}
-	for ext in html gif jpg ; do \
-		${INSTALL_DATA} ${WRKSRC}/documentation/*.$$ext \
-		${DOCSDIR}; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/documentation/README \
-		${DOCSDIR}
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/fltk/distinfo b/x11-toolkits/fltk/distinfo
index 5055e65dac70..f9bd08b84f1c 100644
--- a/x11-toolkits/fltk/distinfo
+++ b/x11-toolkits/fltk/distinfo
@@ -1,2 +1 @@
-MD5 (fltk-1.0.10-source.tar.bz2) = e76cc38b6c0bdb046a8ac5cd31a7e65e
-MD5 (fltk-1.0.10-xunicode-20010114.diff) = 408ea0af9e4f6e56124744605822c79c
+MD5 (fltk-1.1.2-source.tar.bz2) = 5d3e96f253c737332cb6d45b6d7d9384
diff --git a/x11-toolkits/fltk/files/patch-ab b/x11-toolkits/fltk/files/patch-ab
index 400c6d108c96..053b1619f870 100644
--- a/x11-toolkits/fltk/files/patch-ab
+++ b/x11-toolkits/fltk/files/patch-ab
@@ -1,45 +1,43 @@
---- configure.orig	Sat Dec  9 07:00:06 2000
-+++ configure	Sat Feb 24 16:02:38 2001
-@@ -837,13 +837,13 @@
-   CFLAGS="$ac_save_CFLAGS"
+--- configure.orig	Mon Nov 25 17:38:38 2002
++++ configure	Sun Jan  5 15:03:00 2003
+@@ -1212,7 +1212,7 @@
+ FL_MINOR_VERSION=1
+ FL_PATCH_VERSION=2
+ FL_RELEASE_VERSION=
+-FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
++FL_API_VERSION=${FL_MAJOR_VERSION}
+ 
+ 
+ 
+@@ -2045,13 +2045,13 @@
+   CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
    if test "$GCC" = yes; then
 -    CFLAGS="-g -O2"
-+    CFLAGS="-g"
++#    CFLAGS="-g -O2"
    else
      CFLAGS="-g"
    fi
  else
    if test "$GCC" = yes; then
 -    CFLAGS="-O2"
-+    CFLAGS=""
++#    CFLAGS="-O2"
    else
      CFLAGS=
    fi
-@@ -980,13 +980,13 @@
-   CXXFLAGS="$ac_save_CXXFLAGS"
+@@ -2395,13 +2395,13 @@
+   CXXFLAGS=$ac_save_CXXFLAGS
  elif test $ac_cv_prog_cxx_g = yes; then
    if test "$GXX" = yes; then
 -    CXXFLAGS="-g -O2"
-+    CXXFLAGS="-g"
++#    CXXFLAGS="-g -O2"
    else
      CXXFLAGS="-g"
    fi
  else
    if test "$GXX" = yes; then
 -    CXXFLAGS="-O2"
-+    CXXFLAGS=""
++#    CXXFLAGS="-O2"
    else
      CXXFLAGS=
    fi
-@@ -2750,8 +2750,8 @@
- 	# WAS: I removed the -fforce-mem, -fforce-addr, -fcaller-saves
- 	#      They all seemed to make either no difference or enlarged
- 	#      the code by a few hundred bytes.
--        CFLAGS="-O2 $CFLAGS"
--        CXXFLAGS="-O2 $CXXFLAGS"
-+#        CFLAGS="-O2 $CFLAGS"
-+#        CXXFLAGS="-O2 $CXXFLAGS"
-     fi
-     if test $PICFLAG = 1; then
-     	CFLAGS="-fPIC $CFLAGS"
diff --git a/x11-toolkits/fltk/files/patch-documentation-Makefile b/x11-toolkits/fltk/files/patch-documentation-Makefile
new file mode 100644
index 000000000000..a5f8a05176c1
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-documentation-Makefile
@@ -0,0 +1,17 @@
+--- documentation/Makefile.orig	Sun Jan  5 15:43:13 2003
++++ documentation/Makefile	Sun Jan  5 15:43:32 2003
+@@ -230,14 +230,6 @@
+ 	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
+ 	$(CHMOD) 644 $(docdir)/*
+ 	echo "Installing man pages in $(mandir)..."
+-	-$(MKDIR) $(mandir)/cat1
+-	$(CP) fluid.$(CAT1EXT) $(mandir)/cat1
+-	$(CHMOD) 644 $(mandir)/cat1/fluid.$(CAT1EXT)
+-	$(CP) fltk-config.$(CAT1EXT) $(mandir)/cat1
+-	$(CHMOD) 644 $(mandir)/cat1/fltk-config.$(CAT1EXT)
+-	-$(MKDIR) $(mandir)/cat3
+-	$(CP) fltk.$(CAT3EXT) $(mandir)/cat3
+-	$(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT)
+ 	-$(MKDIR) $(mandir)/man1
+ 	$(CP) fluid.man $(mandir)/man1/fluid.1
+ 	$(CHMOD) 644 $(mandir)/man1/fluid.1
diff --git a/x11-toolkits/fltk/files/patch-makeinclude.in b/x11-toolkits/fltk/files/patch-makeinclude.in
new file mode 100644
index 000000000000..9f8a4f154a07
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-makeinclude.in
@@ -0,0 +1,13 @@
+--- makeinclude.in.orig	Sun Jan  5 14:57:05 2003
++++ makeinclude.in	Sun Jan  5 14:57:31 2003
+@@ -53,8 +53,8 @@
+ 
+ # flags for C++ compiler:
+ OPTIM		= @OPTIM@
+-CFLAGS		= $(OPTIM) @CFLAGS@
+-CXXFLAGS	= $(OPTIM) @CXXFLAGS@
++CFLAGS		= $(OPTIM) @CFLAGS@ @CPPFLAGS@
++CXXFLAGS	= $(OPTIM) @CXXFLAGS@ @CPPFLAGS@
+ 
+ # program to make the archive:
+ LIBNAME		= @LIBNAME@
diff --git a/x11-toolkits/fltk/files/patch-src-Makefile b/x11-toolkits/fltk/files/patch-src-Makefile
new file mode 100644
index 000000000000..cd71693cbf75
--- /dev/null
+++ b/x11-toolkits/fltk/files/patch-src-Makefile
@@ -0,0 +1,122 @@
+--- src/Makefile.orig	Sun Jan  5 15:08:13 2003
++++ src/Makefile	Sun Jan  5 15:11:01 2003
+@@ -198,11 +198,11 @@
+ 	$(LIBCOMMAND) $@ $(OBJECTS)
+ 	$(RANLIB) $@
+ 
+-libfltk.so.1.1: $(OBJECTS)
++libfltk.so.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(OBJECTS) $(IMAGELIBS)
+ 	-$(RM) libfltk.so
+-	$(LN) libfltk.so.1.1 libfltk.so
++	$(LN) libfltk.so.1 libfltk.so
+ 
+ libfltk.sl.1.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+@@ -230,11 +230,11 @@
+ 	$(LIBCOMMAND) $@ $(FLOBJECTS)
+ 	$(RANLIB) $@
+ 
+-libfltk_forms.so.1.1: $(FLOBJECTS)
++libfltk_forms.so.1: $(FLOBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(FLOBJECTS)
+ 	-$(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)
+ 	echo $(DSOCOMMAND) $@ ...
+@@ -262,11 +262,11 @@
+ 	$(LIBCOMMAND) $@ $(GLOBJECTS)
+ 	$(RANLIB) $@
+ 
+-libfltk_gl.so.1.1: $(GLOBJECTS)
++libfltk_gl.so.1: $(GLOBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(GLOBJECTS)
+ 	-$(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)
+ 	echo $(DSOCOMMAND) $@ ...
+@@ -294,11 +294,11 @@
+ 	$(LIBCOMMAND) $@ $(IMGOBJECTS)
+ 	$(RANLIB) $@
+ 
+-libfltk_images.so.1.1: $(IMGOBJECTS)
++libfltk_images.so.1: $(IMGOBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS)
+ 	-$(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)
+ 	echo $(DSOCOMMAND) $@ ...
+@@ -411,11 +411,11 @@
+ 		$(RANLIB) $(libdir)/$(GLLIBNAME); \
+ 	fi
+ 	$(RANLIB) $(libdir)/$(IMGLIBNAME)
+-	if test x$(DSONAME) = xlibfltk.so.1.1; then\
++	if test x$(DSONAME) = xlibfltk.so.1; then\
+ 		$(RM) $(libdir)/libfltk.so*;\
+-		$(CP) libfltk.so.1.1 $(libdir); \
+-		$(CHMOD) 755 $(libdir)/libfltk.so.1.1; \
+-		$(LN) libfltk.so.1.1 $(libdir)/libfltk.so;\
++		$(CP) libfltk.so.1 $(libdir); \
++		$(CHMOD) 755 $(libdir)/libfltk.so.1; \
++		$(LN) libfltk.so.1 $(libdir)/libfltk.so;\
+ 	fi
+ 	if test x$(DSONAME) = xlibfltk.sl.1.1; then\
+ 		$(RM) $(libdir)/libfltk.sl*;\
+@@ -434,11 +434,11 @@
+ 		$(CP) libfltk_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_s.a; \
+ 	fi
+-	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
++	if test x$(FLDSONAME) = xlibfltk_forms.so.1; then\
+ 		$(RM) $(libdir)/libfltk_forms.so*;\
+-		$(CP) libfltk_forms.so.1.1 $(libdir); \
+-		$(CHMOD) 755 $(libdir)/libfltk_forms.so.1.1; \
+-		$(LN) libfltk_forms.so.1.1 $(libdir)/libfltk_forms.so;\
++		$(CP) libfltk_forms.so.1 $(libdir); \
++		$(CHMOD) 755 $(libdir)/libfltk_forms.so.1; \
++		$(LN) libfltk_forms.so.1 $(libdir)/libfltk_forms.so;\
+ 	fi
+ 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
+ 		$(RM) $(libdir)/libfltk_forms.sl*;\
+@@ -457,11 +457,11 @@
+ 		$(CP) libfltk_forms_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
+ 	fi
+-	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
++	if test x$(GLDSONAME) = xlibfltk_gl.so.1; then\
+ 		$(RM) $(libdir)/libfltk_gl.so*;\
+-		$(CP) libfltk_gl.so.1.1 $(libdir); \
+-		$(CHMOD) 755 $(libdir)/libfltk_gl.so.1.1; \
+-		$(LN) libfltk_gl.so.1.1 $(libdir)/libfltk_gl.so;\
++		$(CP) libfltk_gl.so.1 $(libdir); \
++		$(CHMOD) 755 $(libdir)/libfltk_gl.so.1; \
++		$(LN) libfltk_gl.so.1 $(libdir)/libfltk_gl.so;\
+ 	fi
+ 	if test x$(GLDSONAME) = xlibfltk_gl.sl.1.1; then\
+ 		$(RM) $(libdir)/libfltk_gl.sl*;\
+@@ -480,11 +480,11 @@
+ 		$(CP) libfltk_gl_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
+ 	fi
+-	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
++	if test x$(IMGDSONAME) = xlibfltk_images.so.1; then\
+ 		$(RM) $(libdir)/libfltk_images.so*;\
+-		$(CP) libfltk_images.so.1.1 $(libdir); \
+-		$(CHMOD) 755 $(libdir)/libfltk_images.so.1.1; \
+-		$(LN) libfltk_images.so.1.1 $(libdir)/libfltk_images.so;\
++		$(CP) libfltk_images.so.1 $(libdir); \
++		$(CHMOD) 755 $(libdir)/libfltk_images.so.1; \
++		$(LN) libfltk_images.so.1 $(libdir)/libfltk_images.so;\
+ 	fi
+ 	if test x$(IMGDSONAME) = xlibfltk_images.sl.1.1; then\
+ 		$(RM) $(libdir)/libfltk_images.sl*;\
diff --git a/x11-toolkits/fltk/pkg-plist b/x11-toolkits/fltk/pkg-plist
index b13409ee48ae..5d02391c133c 100644
--- a/x11-toolkits/fltk/pkg-plist
+++ b/x11-toolkits/fltk/pkg-plist
@@ -1,10 +1,13 @@
 bin/fluid
+bin/fltk-config
 include/FL/Enumerations.H
 include/FL/Enumerations.h
 include/FL/Fl.H
 include/FL/Fl.h
 include/FL/Fl_Adjuster.H
 include/FL/Fl_Adjuster.h
+include/FL/Fl_BMP_Image.H
+include/FL/Fl_BMP_Image.h
 include/FL/Fl_Bitmap.H
 include/FL/Fl_Bitmap.h
 include/FL/Fl_Box.H
@@ -17,6 +20,8 @@ include/FL/Fl_Button.H
 include/FL/Fl_Button.h
 include/FL/Fl_Chart.H
 include/FL/Fl_Chart.h
+include/FL/Fl_Check_Browser.H
+include/FL/Fl_Check_Browser.h
 include/FL/Fl_Check_Button.H
 include/FL/Fl_Check_Button.h
 include/FL/Fl_Choice.H
@@ -31,6 +36,16 @@ include/FL/Fl_Dial.H
 include/FL/Fl_Dial.h
 include/FL/Fl_Double_Window.H
 include/FL/Fl_Double_Window.h
+include/FL/Fl_Export.H
+include/FL/Fl_Export.h
+include/FL/Fl_File_Browser.H
+include/FL/Fl_File_Browser.h
+include/FL/Fl_File_Chooser.H
+include/FL/Fl_File_Chooser.h
+include/FL/Fl_File_Icon.H
+include/FL/Fl_File_Icon.h
+include/FL/Fl_File_Input.H
+include/FL/Fl_File_Input.h
 include/FL/Fl_Fill_Dial.H
 include/FL/Fl_Fill_Dial.h
 include/FL/Fl_Fill_Slider.H
@@ -43,10 +58,16 @@ include/FL/Fl_FormsPixmap.H
 include/FL/Fl_FormsPixmap.h
 include/FL/Fl_Free.H
 include/FL/Fl_Free.h
+include/FL/Fl_GIF_Image.H
+include/FL/Fl_GIF_Image.h
 include/FL/Fl_Gl_Window.H
 include/FL/Fl_Gl_Window.h
 include/FL/Fl_Group.H
 include/FL/Fl_Group.h
+include/FL/Fl_Help_Dialog.H
+include/FL/Fl_Help_Dialog.h
+include/FL/Fl_Help_View.H
+include/FL/Fl_Help_View.h
 include/FL/Fl_Hold_Browser.H
 include/FL/Fl_Hold_Browser.h
 include/FL/Fl_Hor_Fill_Slider.H
@@ -65,6 +86,8 @@ include/FL/Fl_Input_.H
 include/FL/Fl_Input_.h
 include/FL/Fl_Int_Input.H
 include/FL/Fl_Int_Input.h
+include/FL/Fl_JPEG_Image.H
+include/FL/Fl_JPEG_Image.h
 include/FL/Fl_Light_Button.H
 include/FL/Fl_Light_Button.h
 include/FL/Fl_Line_Dial.H
@@ -97,12 +120,20 @@ include/FL/Fl_Output.H
 include/FL/Fl_Output.h
 include/FL/Fl_Overlay_Window.H
 include/FL/Fl_Overlay_Window.h
+include/FL/Fl_PNG_Image.H
+include/FL/Fl_PNG_Image.h
+include/FL/Fl_PNM_Image.H
+include/FL/Fl_PNM_Image.h
 include/FL/Fl_Pack.H
 include/FL/Fl_Pack.h
 include/FL/Fl_Pixmap.H
 include/FL/Fl_Pixmap.h
 include/FL/Fl_Positioner.H
 include/FL/Fl_Positioner.h
+include/FL/Fl_Preferences.H
+include/FL/Fl_Preferences.h
+include/FL/Fl_Progress.H
+include/FL/Fl_Progress.h
 include/FL/Fl_Radio_Button.H
 include/FL/Fl_Radio_Button.h
 include/FL/Fl_Radio_Light_Button.H
@@ -127,16 +158,28 @@ include/FL/Fl_Secret_Input.H
 include/FL/Fl_Secret_Input.h
 include/FL/Fl_Select_Browser.H
 include/FL/Fl_Select_Browser.h
+include/FL/Fl_Shared_Image.H
+include/FL/Fl_Shared_Image.h
 include/FL/Fl_Simple_Counter.H
 include/FL/Fl_Simple_Counter.h
 include/FL/Fl_Single_Window.H
 include/FL/Fl_Single_Window.h
 include/FL/Fl_Slider.H
 include/FL/Fl_Slider.h
+include/FL/Fl_Sys_Menu_Bar.H
+include/FL/Fl_Sys_Menu_Bar.h
 include/FL/Fl_Tabs.H
 include/FL/Fl_Tabs.h
+include/FL/Fl_Text_Buffer.H
+include/FL/Fl_Text_Buffer.h
+include/FL/Fl_Text_Display.H
+include/FL/Fl_Text_Display.h
+include/FL/Fl_Text_Editor.H
+include/FL/Fl_Text_Editor.h
 include/FL/Fl_Tile.H
 include/FL/Fl_Tile.h
+include/FL/Fl_Tiled_Image.H
+include/FL/Fl_Tiled_Image.h
 include/FL/Fl_Timer.H
 include/FL/Fl_Timer.h
 include/FL/Fl_Toggle_Button.H
@@ -145,6 +188,8 @@ include/FL/Fl_Toggle_Light_Button.H
 include/FL/Fl_Toggle_Light_Button.h
 include/FL/Fl_Toggle_Round_Button.H
 include/FL/Fl_Toggle_Round_Button.h
+include/FL/Fl_Tooltip.H
+include/FL/Fl_Tooltip.h
 include/FL/Fl_Valuator.H
 include/FL/Fl_Valuator.h
 include/FL/Fl_Value_Input.H
@@ -157,6 +202,12 @@ include/FL/Fl_Widget.H
 include/FL/Fl_Widget.h
 include/FL/Fl_Window.H
 include/FL/Fl_Window.h
+include/FL/Fl_Wizard.H
+include/FL/Fl_Wizard.h
+include/FL/Fl_XBM_Image.H
+include/FL/Fl_XBM_Image.h
+include/FL/Fl_XPM_Image.H
+include/FL/Fl_XPM_Image.h
 include/FL/dirent.h
 include/FL/filename.H
 include/FL/filename.h
@@ -180,8 +231,10 @@ include/FL/gl_draw.H
 include/FL/gl_draw.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/menubar.h
 include/FL/win32.H
 include/FL/win32.h
 include/FL/x.H
@@ -189,13 +242,26 @@ include/FL/x.h
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1
+lib/libfltk_gl.a
+lib/libfltk_gl.so
+lib/libfltk_gl.so.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
 share/doc/fltk/FL.gif
+share/doc/fltk/Fl.html
 share/doc/fltk/Fl_Adjuster.html
+share/doc/fltk/Fl_BMP_Image.html
+share/doc/fltk/Fl_Bitmap.html
 share/doc/fltk/Fl_Box.html
 share/doc/fltk/Fl_Browser.html
 share/doc/fltk/Fl_Browser_.html
 share/doc/fltk/Fl_Button.html
 share/doc/fltk/Fl_Chart.html
+share/doc/fltk/Fl_Check_Browser.html
 share/doc/fltk/Fl_Check_Button.gif
 share/doc/fltk/Fl_Check_Button.html
 share/doc/fltk/Fl_Choice.html
@@ -205,14 +271,26 @@ share/doc/fltk/Fl_Counter.html
 share/doc/fltk/Fl_Dial.html
 share/doc/fltk/Fl_Double_Window.html
 share/doc/fltk/Fl_End.html
+share/doc/fltk/Fl_File_Browser.html
+share/doc/fltk/Fl_File_Chooser.html
+share/doc/fltk/Fl_File_Chooser.jpg
+share/doc/fltk/Fl_File_Icon.html
+share/doc/fltk/Fl_File_Input.gif
+share/doc/fltk/Fl_File_Input.html
 share/doc/fltk/Fl_Float_Input.html
 share/doc/fltk/Fl_Free.html
+share/doc/fltk/Fl_GIF_Image.html
 share/doc/fltk/Fl_Gl_Window.html
 share/doc/fltk/Fl_Group.html
+share/doc/fltk/Fl_Help_Dialog.gif
+share/doc/fltk/Fl_Help_Dialog.html
+share/doc/fltk/Fl_Help_View.html
 share/doc/fltk/Fl_Hold_Browser.html
+share/doc/fltk/Fl_Image.html
 share/doc/fltk/Fl_Input.html
 share/doc/fltk/Fl_Input_.html
 share/doc/fltk/Fl_Int_Input.html
+share/doc/fltk/Fl_JPEG_Image.html
 share/doc/fltk/Fl_Light_Button.gif
 share/doc/fltk/Fl_Light_Button.html
 share/doc/fltk/Fl_Menu_.html
@@ -225,8 +303,14 @@ share/doc/fltk/Fl_Multiline_Input.html
 share/doc/fltk/Fl_Multiline_Output.html
 share/doc/fltk/Fl_Output.html
 share/doc/fltk/Fl_Overlay_Window.html
+share/doc/fltk/Fl_PNG_Image.html
+share/doc/fltk/Fl_PNM_Image.html
 share/doc/fltk/Fl_Pack.html
+share/doc/fltk/Fl_Pixmap.html
 share/doc/fltk/Fl_Positioner.html
+share/doc/fltk/Fl_Preferences.html
+share/doc/fltk/Fl_Progress.html
+share/doc/fltk/Fl_RGB_Image.html
 share/doc/fltk/Fl_Repeat_Button.html
 share/doc/fltk/Fl_Return_Button.gif
 share/doc/fltk/Fl_Return_Button.html
@@ -239,12 +323,18 @@ share/doc/fltk/Fl_Scroll.html
 share/doc/fltk/Fl_Scrollbar.html
 share/doc/fltk/Fl_Secret_Input.html
 share/doc/fltk/Fl_Select_Browser.html
+share/doc/fltk/Fl_Shared_Image.html
 share/doc/fltk/Fl_Single_Window.html
 share/doc/fltk/Fl_Slider.html
 share/doc/fltk/Fl_Tabs.html
+share/doc/fltk/Fl_Text_Buffer.html
+share/doc/fltk/Fl_Text_Display.html
+share/doc/fltk/Fl_Text_Editor.html
 share/doc/fltk/Fl_Tile.gif
 share/doc/fltk/Fl_Tile.html
+share/doc/fltk/Fl_Tiled_Image.html
 share/doc/fltk/Fl_Timer.html
+share/doc/fltk/Fl_Tooltip.html
 share/doc/fltk/Fl_Valuator.html
 share/doc/fltk/Fl_Value_Input.gif
 share/doc/fltk/Fl_Value_Input.html
@@ -253,12 +343,12 @@ share/doc/fltk/Fl_Value_Output.html
 share/doc/fltk/Fl_Value_Slider.html
 share/doc/fltk/Fl_Widget.html
 share/doc/fltk/Fl_Window.html
+share/doc/fltk/Fl_Wizard.html
+share/doc/fltk/Fl_XBM_Image.html
+share/doc/fltk/Fl_XPM_Image.html
 share/doc/fltk/adjuster1.gif
-share/doc/fltk/ask.C.gif
 share/doc/fltk/basics.html
-share/doc/fltk/bglogo.gif
 share/doc/fltk/boxtypes.gif
-share/doc/fltk/button.C.gif
 share/doc/fltk/buttons.gif
 share/doc/fltk/charts.gif
 share/doc/fltk/choice.gif
@@ -273,7 +363,6 @@ share/doc/fltk/editor.gif
 share/doc/fltk/editor.html
 share/doc/fltk/enumerations.html
 share/doc/fltk/events.html
-share/doc/fltk/filechooser.gif
 share/doc/fltk/fl_alert.gif
 share/doc/fltk/fl_ask.gif
 share/doc/fltk/fl_choice.gif
@@ -282,18 +371,20 @@ share/doc/fltk/fl_input.gif
 share/doc/fltk/fl_message.gif
 share/doc/fltk/fl_password.gif
 share/doc/fltk/fl_show_colormap.gif
-share/doc/fltk/fluid-org.gif
-share/doc/fltk/fluid-gettext.gif
 share/doc/fltk/fluid-catgets.gif
-share/doc/fltk/fluid.gif
+share/doc/fltk/fluid-gettext.gif
+share/doc/fltk/fluid-org.gif
 share/doc/fltk/fluid.html
 share/doc/fltk/fluid1.gif
 share/doc/fltk/fluid2.gif
-share/doc/fltk/fluid3.gif
+share/doc/fltk/fluid3-cxx.gif
+share/doc/fltk/fluid3-gui.gif
+share/doc/fltk/fluid3-style.gif
 share/doc/fltk/fluid4.gif
-share/doc/fltk/fluid_main.gif
 share/doc/fltk/fluid_prefs.gif
-share/doc/fltk/fluid_widget.gif
+share/doc/fltk/fluid_widget_cxx.gif
+share/doc/fltk/fluid_widget_gui.gif
+share/doc/fltk/fluid_widget_style.gif
 share/doc/fltk/forms.html
 share/doc/fltk/functions.html
 share/doc/fltk/glut.html
@@ -304,6 +395,7 @@ share/doc/fltk/license.html
 share/doc/fltk/menu.gif
 share/doc/fltk/menu_button.gif
 share/doc/fltk/menubar.gif
+share/doc/fltk/migration.html
 share/doc/fltk/opengl.html
 share/doc/fltk/osissues.html
 share/doc/fltk/positioner.gif
@@ -312,7 +404,6 @@ share/doc/fltk/resizebox1.gif
 share/doc/fltk/resizebox2.gif
 share/doc/fltk/round_clock.gif
 share/doc/fltk/scrollbar.gif
-share/doc/fltk/shape.C.gif
 share/doc/fltk/slider.gif
 share/doc/fltk/subclassing.html
 share/doc/fltk/symbols.gif
@@ -321,7 +412,6 @@ share/doc/fltk/text.gif
 share/doc/fltk/valuators.gif
 share/doc/fltk/value_slider.gif
 share/doc/fltk/widgets.html
-share/doc/fltk/README
 @dirrm include/FL
 include/Fl
 @dirrm share/doc/fltk