13 files changed, 156 insertions, 144 deletions

diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile
index ff0594832413..a75f76d99b4d 100644
--- a/x11-toolkits/fltk2/Makefile
+++ b/x11-toolkits/fltk2/Makefile
@@ -26,12 +26,10 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
-SNAPSHOT=	r4825
+SNAPSHOT=	r5170
 
 OPTIONS=	FLTK_THREADS "Install with threads support" on
 
-CONFLICTS=	fltk-1.* fltk-threads-1.*
-
 LATEST_LINK=	fltk2
 
 USE_BZIP2=	yes
@@ -52,6 +50,7 @@ CONFIGURE_ARGS+=	--disable-shared
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbuild-freebsd${OSREL}
 
+DOCSDIR=	${PREFIX}/share/doc/fltk2
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
@@ -66,7 +65,7 @@ CONFIGURE_ARGS+=	--disable-threads
 
 post-patch:
 	${REINPLACE_CMD} -e 's:%%CXX%%:${CXX}:g' \
-	    ${WRKSRC}/fltk-config.in \
+	    ${WRKSRC}/fltk2-config.in \
 	    ${WRKSRC}/makeinclude.in
 
 post-install:
diff --git a/x11-toolkits/fltk2/distinfo b/x11-toolkits/fltk2/distinfo
index 0ba34fa7326e..04dca66b2ce8 100644
--- a/x11-toolkits/fltk2/distinfo
+++ b/x11-toolkits/fltk2/distinfo
@@ -1,3 +1,3 @@
-MD5 (fltk-2.0.x-r4825.tar.bz2) = 37395d18f6cc23d5753c3539288e5f0f
-SHA256 (fltk-2.0.x-r4825.tar.bz2) = 0b9a8bd41ea0afb28c4893e3e0a611fd68853e7bd7b3bb5f6c6c1ce4bc1bbabb
-SIZE (fltk-2.0.x-r4825.tar.bz2) = 2435835
+MD5 (fltk-2.0.x-r5170.tar.bz2) = 66fcc9c28806dae198a80f32b2368bc5
+SHA256 (fltk-2.0.x-r5170.tar.bz2) = 39db34ed0d70f1c08b0334fa436b769057b54d15d70534be8b8643e9a86fc420
+SIZE (fltk-2.0.x-r5170.tar.bz2) = 2533439
diff --git a/x11-toolkits/fltk2/files/patch-Makefile b/x11-toolkits/fltk2/files/patch-Makefile
index 5e5d91404452..c58f96675eab 100644
--- a/x11-toolkits/fltk2/files/patch-Makefile
+++ b/x11-toolkits/fltk2/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	Thu Aug  4 00:08:19 2005
-+++ ./Makefile	Sun Apr  2 13:24:34 2006
+--- Makefile.orig	Mon Apr 24 12:07:29 2006
++++ Makefile	Mon Jun  5 14:44:17 2006
 @@ -34,7 +34,7 @@
  	done
  
diff --git a/x11-toolkits/fltk2/files/patch-OpenGL-Makefile b/x11-toolkits/fltk2/files/patch-OpenGL-Makefile
index b891c70ee284..49beae7c0e2b 100644
--- a/x11-toolkits/fltk2/files/patch-OpenGL-Makefile
+++ b/x11-toolkits/fltk2/files/patch-OpenGL-Makefile
@@ -1,6 +1,6 @@
---- ./OpenGL/Makefile.orig	Thu Aug  4 00:08:19 2005
-+++ ./OpenGL/Makefile	Sun Apr  2 13:24:34 2006
-@@ -118,19 +118,17 @@
+--- OpenGL/Makefile.orig	Tue Apr 25 09:40:40 2006
++++ OpenGL/Makefile	Mon Jun  5 14:44:17 2006
+@@ -117,15 +117,13 @@
          ifneq (,$(wildcard ../lib/$(LIBNAME)))
  	echo "Installing static OpenGL library in $(libdir)"
  	$(MKDIR) $(DESTDIR)$(libdir)
@@ -17,9 +17,4 @@
 +	$(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)
  	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
          endif
-         ifeq ($(DSONAME), fltk_gl.dll)
--	$(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
-+	$(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
-         endif
- 	
- #
+         ifeq ($(DSONAME), fltk2_gl.dll)
diff --git a/x11-toolkits/fltk2/files/patch-configure b/x11-toolkits/fltk2/files/patch-configure
index 833d22671be0..7c71ffa2c314 100644
--- a/x11-toolkits/fltk2/files/patch-configure
+++ b/x11-toolkits/fltk2/files/patch-configure
@@ -1,5 +1,5 @@
---- ./configure.orig	Fri Mar 17 06:00:50 2006
-+++ ./configure	Sun Apr  2 13:24:34 2006
+--- configure.orig	Fri Jun  2 06:01:04 2006
++++ configure	Mon Jun  5 14:44:17 2006
 @@ -1328,7 +1328,7 @@
  FL_MINOR_VERSION=0
  FL_PATCH_VERSION=0
diff --git a/x11-toolkits/fltk2/files/patch-fltk-ComboBox.h b/x11-toolkits/fltk2/files/patch-fltk-ComboBox.h
deleted file mode 100644
index 8976eebef1cc..000000000000
--- a/x11-toolkits/fltk2/files/patch-fltk-ComboBox.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- fltk/ComboBox.h.orig	Sun Apr  2 12:05:31 2006
-+++ fltk/ComboBox.h	Sun Apr  2 12:07:16 2006
-@@ -103,7 +103,7 @@
- 	ComboBox *combo_;
-   };  
-   ComboInput *input_;
--#ifdef _WIN32
-+#if defined ( _WIN32 ) || defined ( __GNUC__ ) && __GNUC__ < 3
-  public:
- #endif
-   static void input_callback_(Widget*,void*);
diff --git a/x11-toolkits/fltk2/files/patch-fltk-config.in b/x11-toolkits/fltk2/files/patch-fltk2-config.in
index f4542aeb485b..80af424837bd 100644
--- a/x11-toolkits/fltk2/files/patch-fltk-config.in
+++ b/x11-toolkits/fltk2/files/patch-fltk2-config.in
@@ -1,5 +1,5 @@
---- ./fltk-config.in.orig	Thu Aug 11 02:17:12 2005
-+++ ./fltk-config.in	Sun Apr  2 13:24:34 2006
+--- ./fltk2-config.in.orig	Tue Apr 11 00:08:47 2006
++++ ./fltk2-config.in	Fri Apr 14 15:42:24 2006
 @@ -62,7 +62,7 @@
  srcdir=@srcdir@
  
diff --git a/x11-toolkits/fltk2/files/patch-fluid-Makefile b/x11-toolkits/fltk2/files/patch-fluid-Makefile
index 9fc656c45bec..7eddd0e41afd 100644
--- a/x11-toolkits/fltk2/files/patch-fluid-Makefile
+++ b/x11-toolkits/fltk2/files/patch-fluid-Makefile
@@ -1,14 +1,14 @@
---- ./fluid/Makefile.orig	Wed Aug 10 17:31:43 2005
-+++ ./fluid/Makefile	Sun Apr  2 13:24:34 2006
-@@ -122,10 +122,8 @@
+--- fluid/Makefile.orig	Thu May  4 17:14:35 2006
++++ fluid/Makefile	Mon Jun  5 14:44:17 2006
+@@ -128,10 +128,8 @@
  install:
- 	echo "Installing FLUID in $(bindir)..."
+ 	echo "Installing FLUID2 in $(bindir)..."
  	-$(MKDIR) $(DESTDIR)$(bindir)
--	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
--	$(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
-+	$(BSD_INSTALL_PROGRAM) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
- 	$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)
--	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+-	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+-	$(STRIP) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
++	$(BSD_INSTALL_PROGRAM) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+ 	$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+-	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
  
  
  uninstall:
diff --git a/x11-toolkits/fltk2/files/patch-images-Makefile b/x11-toolkits/fltk2/files/patch-images-Makefile
index 6424072e0b13..c8bebb3554b0 100644
--- a/x11-toolkits/fltk2/files/patch-images-Makefile
+++ b/x11-toolkits/fltk2/files/patch-images-Makefile
@@ -1,16 +1,16 @@
---- ./images/Makefile.orig	Fri Aug 12 04:53:31 2005
-+++ ./images/Makefile	Sun Apr  2 13:24:34 2006
-@@ -120,8 +120,7 @@
+--- images/Makefile.orig	Tue Apr 25 09:40:40 2006
++++ images/Makefile	Mon Jun  5 14:44:17 2006
+@@ -124,8 +124,7 @@
          ifneq (,$(wildcard ../lib/$(LIBNAME)))
  	echo "Installing static images library in $(libdir)"
  	$(MKDIR) $(DESTDIR)$(libdir)
 -	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
 -	$(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
 +	$(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
- 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_z$(LIBSUFFIX)
- 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_png$(LIBSUFFIX)
- 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk_jpeg$(LIBSUFFIX)
-@@ -132,13 +131,12 @@
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
+ 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_z$(LIBSUFFIX)
+ 	$(RM) -f $(DESTDIR)$(libdir)/$(LIBPREFIX)fltk2_png$(LIBSUFFIX)
+@@ -138,9 +137,8 @@
          ifneq (,$(wildcard ../lib/$(DSONAME)))
  	echo "Installing shared images library in $(libdir)"
  	$(MKDIR) $(DESTDIR)$(libdir)
@@ -20,9 +20,4 @@
 +	$(BSD_INSTALL_DATA) ../lib/$(DSONAME) $(DESTDIR)$(libdir)
  	$(LN) -s $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
          endif
-         ifeq ($(DSONAME), fltk_images.dll)
--	$(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
-+	$(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
-         endif
- #
- # Uninstall the libraries...
+         ifeq ($(DSONAME), fltk2_images.dll)
diff --git a/x11-toolkits/fltk2/files/patch-makeinclude.in b/x11-toolkits/fltk2/files/patch-makeinclude.in
index f6a218c814a9..b2a46bb32e21 100644
--- a/x11-toolkits/fltk2/files/patch-makeinclude.in
+++ b/x11-toolkits/fltk2/files/patch-makeinclude.in
@@ -1,12 +1,12 @@
---- ./makeinclude.in.orig	Wed Aug 10 17:43:23 2005
-+++ ./makeinclude.in	Sun Apr  2 13:24:34 2006
+--- ./makeinclude.in.orig	Tue Apr 11 00:06:06 2006
++++ ./makeinclude.in	Fri Apr 14 15:42:25 2006
 @@ -49,11 +49,11 @@
  
  # compiler names:
  CC		= @CC@
 -CXX		= @CXX@
 +CXX		= %%CXX%%
- MAKEDEPEND	= @MAKEDEPEND@ -Y
+ MAKEDEPEND	= @MAKEDEPEND@
  
  # flags for C++ compiler:
 -OPTIM		= @OPTIM@
diff --git a/x11-toolkits/fltk2/files/patch-src-Makefile b/x11-toolkits/fltk2/files/patch-src-Makefile
index 2ef6b724354d..ee57a13b95ba 100644
--- a/x11-toolkits/fltk2/files/patch-src-Makefile
+++ b/x11-toolkits/fltk2/files/patch-src-Makefile
@@ -1,28 +1,28 @@
---- ./src/Makefile.orig	Fri Mar 10 01:02:34 2006
-+++ ./src/Makefile	Sun Apr  2 13:24:34 2006
-@@ -254,39 +254,30 @@
+--- src/Makefile.orig	Fri May 12 00:09:39 2006
++++ src/Makefile	Mon Jun  5 14:44:17 2006
+@@ -251,36 +251,27 @@
  	    mkdir $(DESTDIR);                               \
  	  fi                                                \
  	fi
 -	$(RMDIR) $(DESTDIR)$(includedir)/fltk
  	$(MKDIR) $(DESTDIR)$(includedir)/fltk
--	$(CP) ../fltk/*.h  $(DESTDIR)$(includedir)/fltk
+-	$(CP) ../fltk/*.h ../fltk/*.r  $(DESTDIR)$(includedir)/fltk
 -	$(CHMOD) 755 $(DESTDIR)$(includedir)/fltk
 -	$(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/*
-+	$(BSD_INSTALL_DATA) ../fltk/*.h  $(DESTDIR)$(includedir)/fltk
- 	echo "Installing FLTK1.1 emulation include files in $(includedir)/FL..."
--	$(RMDIR) $(DESTDIR)$(includedir)/FL
- 	$(MKDIR) $(DESTDIR)$(includedir)/FL
--	$(CP) ../FL/*.H ../FL/*.h  $(DESTDIR)$(includedir)/FL
--	$(CHMOD) 755 $(DESTDIR)$(includedir)/FL
--	$(CHMOD) 644 $(DESTDIR)$(includedir)/FL/*
-+	$(BSD_INSTALL_DATA) ../FL/*.H ../FL/*.h  $(DESTDIR)$(includedir)/FL
-         ifneq (,$(wildcard ../fltk-config))
- 	echo "Installing fltk-config in $(bindir)..."
++	$(BSD_INSTALL_DATA) ../fltk/*.h ../fltk/*.r $(DESTDIR)$(includedir)/fltk
+ 	echo "Installing FLTK1.1 emulation include files in $(includedir)/fltk..."
+-	$(RMDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
+ 	$(MKDIR) $(DESTDIR)$(includedir)/fltk/compat/FL
+-	$(CP) ../fltk/compat/FL/*.H ../fltk/compat/FL/*.h  $(DESTDIR)$(includedir)/fltk/compat/FL
+-	$(CHMOD) 755 $(DESTDIR)$(includedir)/fltk/compat/FL
+-	$(CHMOD) 644 $(DESTDIR)$(includedir)/fltk/compat/FL/*
++	$(BSD_INSTALL_DATA) ../fltk/compat/FL/*.H ../fltk/compat/FL/*.h  $(DESTDIR)$(includedir)/fltk/compat/FL
+         ifneq (,$(wildcard ../fltk2-config))
+ 	echo "Installing fltk2-config in $(bindir)..."
  	$(MKDIR) $(DESTDIR)$(bindir)
--	$(CP) ../fltk-config $(DESTDIR)$(bindir)
--	$(CHMOD) 755 $(DESTDIR)$(bindir)/fltk-config
-+	$(BSD_INSTALL_SCRIPT) ../fltk-config $(DESTDIR)$(bindir)
+-	$(CP) ../fltk2-config $(DESTDIR)$(bindir)
+-	$(CHMOD) 755 $(DESTDIR)$(bindir)/fltk2-config
++	$(BSD_INSTALL_SCRIPT) ../fltk2-config $(DESTDIR)$(bindir)
          endif
          ifneq (,$(wildcard ../lib/$(LIBNAME)))
  	echo "Installing static core library in $(libdir)"
@@ -30,6 +30,7 @@
 -	$(RM) $(DESTDIR)$(libdir)/$(LIBNAME)
 -	$(CP) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
 +	$(BSD_INSTALL_DATA) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
+ 	$(RANLIB) $(DESTDIR)$(libdir)/$(LIBNAME)
          endif
          ifneq (,$(wildcard ../lib/$(DSONAME)))
  	echo "Installing shared core library in $(libdir)"
@@ -41,8 +42,3 @@
  	$(LN) $(DSONAME) $(DESTDIR)$(libdir)/$(DSOLINK)
          endif
          ifeq ($(DSONAME), fltk.dll)
--	$(CP) lib$(DSONAME).a $(DESTDIR)$(libdir)
-+	$(BSD_INSTALL_DATA) lib$(DSONAME).a $(DESTDIR)$(libdir)
-         endif
- 
- #
diff --git a/x11-toolkits/fltk2/files/patch-test-Makefile b/x11-toolkits/fltk2/files/patch-test-Makefile
new file mode 100644
index 000000000000..b8bfededa3f3
--- /dev/null
+++ b/x11-toolkits/fltk2/files/patch-test-Makefile
@@ -0,0 +1,32 @@
+This is a temporary hack to disconnect some demo programs from the
+build process. This is because fluid2 wants to establish an X server
+connection when building these programs and fails when it cannot
+do so.
+
+The issue is known and probably a fluid2 bug, see FLTK2 STR #1302.
+--- test/Makefile.orig	Fri May 12 22:16:29 2006
++++ test/Makefile	Mon Jun  5 14:44:17 2006
+@@ -142,7 +142,6 @@
+ 	image$(EXEEXT) \
+ 	inactive$(EXEEXT) \
+ 	input$(EXEEXT) \
+-	keyboard$(EXEEXT) \
+ 	label$(EXEEXT) \
+ 	line_style$(EXEEXT) \
+ 	list_visuals$(EXEEXT) \
+@@ -155,7 +154,6 @@
+ 	pack$(EXEEXT) \
+ 	pixmap$(EXEEXT) \
+ 	progress$(EXEEXT) \
+-	radio$(EXEEXT) \
+ 	qubix$(EXEEXT) \
+ 	resizable$(EXEEXT) \
+ 	resizealign$(EXEEXT) \
+@@ -169,7 +167,6 @@
+ 	timer$(EXEEXT) \
+ 	utf$(EXEEXT) \
+ 	fullscreen$(EXEEXT) \
+-	valuators$(EXEEXT) \
+ 	list$(EXEEXT) \
+ 	wizard$(EXEEXT)
+ 
diff --git a/x11-toolkits/fltk2/pkg-plist b/x11-toolkits/fltk2/pkg-plist
index 0c2ae56e5678..3726e0377645 100644
--- a/x11-toolkits/fltk2/pkg-plist
+++ b/x11-toolkits/fltk2/pkg-plist
@@ -1,65 +1,66 @@
 @comment $FreeBSD$
-bin/fltk-config
-bin/fluid
-include/FL/Enumerations.H
-include/FL/Fl.H
-include/FL/Fl_Adjuster.H
-include/FL/Fl_Box.H
-include/FL/Fl_Browser.H
-include/FL/Fl_Button.H
-include/FL/Fl_Chart.H
-include/FL/Fl_Check_Button.H
-include/FL/Fl_Choice.H
-include/FL/Fl_Clock.H
-include/FL/Fl_Color_Chooser.H
-include/FL/Fl_Counter.H
-include/FL/Fl_Dial.H
-include/FL/Fl_Double_Window.H
-include/FL/Fl_File_Chooser.H
-include/FL/Fl_Gl_Window.H
-include/FL/Fl_Group.H
-include/FL/Fl_Hold_Browser.H
-include/FL/Fl_Hor_Slider.H
-include/FL/Fl_Hor_Value_Slider.H
-include/FL/Fl_Input.H
-include/FL/Fl_Int_Input.H
-include/FL/Fl_Light_Button.H
-include/FL/Fl_Menu_.H
-include/FL/Fl_Menu_Bar.H
-include/FL/Fl_Menu_Button.H
-include/FL/Fl_Menu_Item.H
-include/FL/Fl_Output.H
-include/FL/Fl_Overlay_Window.H
-include/FL/Fl_Return_Button.H
-include/FL/Fl_Roller.H
-include/FL/Fl_Scroll.H
-include/FL/Fl_Scrollbar.H
-include/FL/Fl_Select_Browser.H
-include/FL/Fl_Single_Window.H
-include/FL/Fl_Slider.H
-include/FL/Fl_Tabs.H
-include/FL/Fl_Text_Buffer.H
-include/FL/Fl_Text_Editor.H
-include/FL/Fl_Tile.H
-include/FL/Fl_Toggle_Button.H
-include/FL/Fl_Toggle_Light_Button.H
-include/FL/Fl_Valuator.H
-include/FL/Fl_Value_Input.H
-include/FL/Fl_Value_Output.H
-include/FL/Fl_Value_Slider.H
-include/FL/Fl_Widget.H
-include/FL/Fl_Window.H
-include/FL/filename.H
-include/FL/fl_ask.H
-include/FL/fl_draw.H
-include/FL/fl_message.H
-include/FL/forms.H
-include/FL/gl.h
-include/FL/glut.H
-include/FL/math.h
-include/FL/menubar.h
-include/FL/x.H
-@dirrm include/FL
+bin/fltk2-config
+bin/fluid2
+include/fltk/compat/FL/Enumerations.H
+include/fltk/compat/FL/Fl.H
+include/fltk/compat/FL/Fl_Adjuster.H
+include/fltk/compat/FL/Fl_Box.H
+include/fltk/compat/FL/Fl_Browser.H
+include/fltk/compat/FL/Fl_Button.H
+include/fltk/compat/FL/Fl_Chart.H
+include/fltk/compat/FL/Fl_Check_Button.H
+include/fltk/compat/FL/Fl_Choice.H
+include/fltk/compat/FL/Fl_Clock.H
+include/fltk/compat/FL/Fl_Color_Chooser.H
+include/fltk/compat/FL/Fl_Counter.H
+include/fltk/compat/FL/Fl_Dial.H
+include/fltk/compat/FL/Fl_Double_Window.H
+include/fltk/compat/FL/Fl_File_Chooser.H
+include/fltk/compat/FL/Fl_Gl_Window.H
+include/fltk/compat/FL/Fl_Group.H
+include/fltk/compat/FL/Fl_Hold_Browser.H
+include/fltk/compat/FL/Fl_Hor_Slider.H
+include/fltk/compat/FL/Fl_Hor_Value_Slider.H
+include/fltk/compat/FL/Fl_Input.H
+include/fltk/compat/FL/Fl_Int_Input.H
+include/fltk/compat/FL/Fl_Light_Button.H
+include/fltk/compat/FL/Fl_Menu_.H
+include/fltk/compat/FL/Fl_Menu_Bar.H
+include/fltk/compat/FL/Fl_Menu_Button.H
+include/fltk/compat/FL/Fl_Menu_Item.H
+include/fltk/compat/FL/Fl_Output.H
+include/fltk/compat/FL/Fl_Overlay_Window.H
+include/fltk/compat/FL/Fl_Return_Button.H
+include/fltk/compat/FL/Fl_Roller.H
+include/fltk/compat/FL/Fl_Scroll.H
+include/fltk/compat/FL/Fl_Scrollbar.H
+include/fltk/compat/FL/Fl_Select_Browser.H
+include/fltk/compat/FL/Fl_Single_Window.H
+include/fltk/compat/FL/Fl_Slider.H
+include/fltk/compat/FL/Fl_Tabs.H
+include/fltk/compat/FL/Fl_Text_Buffer.H
+include/fltk/compat/FL/Fl_Text_Editor.H
+include/fltk/compat/FL/Fl_Tile.H
+include/fltk/compat/FL/Fl_Toggle_Button.H
+include/fltk/compat/FL/Fl_Toggle_Light_Button.H
+include/fltk/compat/FL/Fl_Valuator.H
+include/fltk/compat/FL/Fl_Value_Input.H
+include/fltk/compat/FL/Fl_Value_Output.H
+include/fltk/compat/FL/Fl_Value_Slider.H
+include/fltk/compat/FL/Fl_Widget.H
+include/fltk/compat/FL/Fl_Window.H
+include/fltk/compat/FL/filename.H
+include/fltk/compat/FL/fl_ask.H
+include/fltk/compat/FL/fl_draw.H
+include/fltk/compat/FL/fl_message.H
+include/fltk/compat/FL/forms.H
+include/fltk/compat/FL/gl.h
+include/fltk/compat/FL/glut.H
+include/fltk/compat/FL/math.h
+include/fltk/compat/FL/menubar.h
+include/fltk/compat/FL/x.H
+@dirrm include/fltk/compat/FL
+@dirrm include/fltk/compat
 include/fltk/Adjuster.h
 include/fltk/AlignGroup.h
 include/fltk/BarGroup.h
@@ -131,6 +132,7 @@ include/fltk/SecretInput.h
 include/fltk/ShapedWindow.h
 include/fltk/SharedImage.h
 include/fltk/Slider.h
+include/fltk/StatusBarGroup.h
 include/fltk/StringList.h
 include/fltk/Style.h
 include/fltk/StyleSet.h
@@ -151,6 +153,7 @@ include/fltk/ValueOutput.h
 include/fltk/ValueSlider.h
 include/fltk/Widget.h
 include/fltk/Window.h
+include/fltk/WizardGroup.h
 include/fltk/WordwrapInput.h
 include/fltk/WordwrapOutput.h
 include/fltk/ask.h
@@ -168,11 +171,14 @@ include/fltk/glut.h
 include/fltk/layout.h
 include/fltk/load_plugin.h
 include/fltk/mac.h
+include/fltk/mac.r
 include/fltk/math.h
+include/fltk/pnmImage.h
 include/fltk/rgbImage.h
 include/fltk/run.h
 include/fltk/show_colormap.h
 include/fltk/string.h
+include/fltk/types.h
 include/fltk/utf.h
 include/fltk/visual.h
 include/fltk/win32.h
@@ -180,6 +186,6 @@ include/fltk/x.h
 include/fltk/xbmImage.h
 include/fltk/xpmImage.h
 @dirrm include/fltk
-lib/libfltk.a
-lib/libfltk_gl.a
-lib/libfltk_images.a
+lib/libfltk2.a
+lib/libfltk2_gl.a
+lib/libfltk2_images.a