Originally fltk used different file names for the man pages depending on

the platform.  I followed the documentation that is now in pkgsrc.txt
and put the default names in PLIST, and the NetBSD names in PLIST.NetBSD.
The PLIST handling does not actually work this way, and it will be
cleaner to use the same file names for man pages regardless of platform.

8 files changed, 475 insertions, 433 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index ec9cde7c92d..2f62b4735fb 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2005/02/24 15:58:05 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2005/03/19 15:26:18 ben Exp $
 
 DISTNAME=	fltk-1.1.6-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
 		ftp://ftp.fltk.org/pub/fltk/${VERS}/ \
diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST
index bdf25f16c97..7d88b794ec0 100644
--- a/x11/fltk/PLIST
+++ b/x11/fltk/PLIST
@@ -1,4 +1,413 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/17 18:40:08 ben Exp $
-man/cat1/fltk-config.1
-man/cat1/fluid.1
-man/cat3/fltk.3
+@comment $NetBSD: PLIST,v 1.5 2005/03/19 15:26:18 ben Exp $
+bin/fltk-config
+bin/fluid
+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
+include/FL/Fl_Box.h
+include/FL/Fl_Browser.H
+include/FL/Fl_Browser.h
+include/FL/Fl_Browser_.H
+include/FL/Fl_Browser_.h
+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
+include/FL/Fl_Choice.h
+include/FL/Fl_Clock.H
+include/FL/Fl_Clock.h
+include/FL/Fl_Color_Chooser.H
+include/FL/Fl_Color_Chooser.h
+include/FL/Fl_Counter.H
+include/FL/Fl_Counter.h
+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
+include/FL/Fl_Fill_Slider.h
+include/FL/Fl_Float_Input.H
+include/FL/Fl_Float_Input.h
+include/FL/Fl_FormsBitmap.H
+include/FL/Fl_FormsBitmap.h
+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
+include/FL/Fl_Hor_Fill_Slider.h
+include/FL/Fl_Hor_Nice_Slider.H
+include/FL/Fl_Hor_Nice_Slider.h
+include/FL/Fl_Hor_Slider.H
+include/FL/Fl_Hor_Slider.h
+include/FL/Fl_Hor_Value_Slider.H
+include/FL/Fl_Hor_Value_Slider.h
+include/FL/Fl_Image.H
+include/FL/Fl_Image.h
+include/FL/Fl_Input.H
+include/FL/Fl_Input.h
+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
+include/FL/Fl_Line_Dial.h
+include/FL/Fl_Menu.H
+include/FL/Fl_Menu.h
+include/FL/Fl_Menu_.H
+include/FL/Fl_Menu_.h
+include/FL/Fl_Menu_Bar.H
+include/FL/Fl_Menu_Bar.h
+include/FL/Fl_Menu_Button.H
+include/FL/Fl_Menu_Button.h
+include/FL/Fl_Menu_Item.H
+include/FL/Fl_Menu_Item.h
+include/FL/Fl_Menu_Window.H
+include/FL/Fl_Menu_Window.h
+include/FL/Fl_Multi_Browser.H
+include/FL/Fl_Multi_Browser.h
+include/FL/Fl_Multi_Label.H
+include/FL/Fl_Multi_Label.h
+include/FL/Fl_Multiline_Input.H
+include/FL/Fl_Multiline_Input.h
+include/FL/Fl_Multiline_Output.H
+include/FL/Fl_Multiline_Output.h
+include/FL/Fl_Nice_Slider.H
+include/FL/Fl_Nice_Slider.h
+include/FL/Fl_Object.H
+include/FL/Fl_Object.h
+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
+include/FL/Fl_Radio_Light_Button.h
+include/FL/Fl_Radio_Round_Button.H
+include/FL/Fl_Radio_Round_Button.h
+include/FL/Fl_Repeat_Button.H
+include/FL/Fl_Repeat_Button.h
+include/FL/Fl_Return_Button.H
+include/FL/Fl_Return_Button.h
+include/FL/Fl_Roller.H
+include/FL/Fl_Roller.h
+include/FL/Fl_Round_Button.H
+include/FL/Fl_Round_Button.h
+include/FL/Fl_Round_Clock.H
+include/FL/Fl_Round_Clock.h
+include/FL/Fl_Scroll.H
+include/FL/Fl_Scroll.h
+include/FL/Fl_Scrollbar.H
+include/FL/Fl_Scrollbar.h
+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
+include/FL/Fl_Toggle_Button.h
+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
+include/FL/Fl_Value_Input.h
+include/FL/Fl_Value_Output.H
+include/FL/Fl_Value_Output.h
+include/FL/Fl_Value_Slider.H
+include/FL/Fl_Value_Slider.h
+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
+include/FL/fl_ask.H
+include/FL/fl_ask.h
+include/FL/fl_draw.H
+include/FL/fl_draw.h
+include/FL/fl_file_chooser.H
+include/FL/fl_file_chooser.h
+include/FL/fl_message.H
+include/FL/fl_message.h
+include/FL/fl_show_colormap.H
+include/FL/fl_show_colormap.h
+include/FL/fl_show_input.H
+include/FL/fl_show_input.h
+include/FL/forms.H
+include/FL/forms.h
+include/FL/gl.h
+include/FL/gl2opengl.h
+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/win32.H
+include/FL/win32.h
+include/FL/x.H
+include/FL/x.h
+include/Fl
+lib/libfltk.la
+lib/libfltk_forms.la
+lib/libfltk_gl.la
+lib/libfltk_images.la
+man/man1/fltk-config.1
+man/man1/fluid.1
+man/man3/fltk.3
+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
+share/doc/fltk/Fl_Clock.html
+share/doc/fltk/Fl_Color_Chooser.html
+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
+share/doc/fltk/Fl_Menu_Bar.html
+share/doc/fltk/Fl_Menu_Button.html
+share/doc/fltk/Fl_Menu_Item.html
+share/doc/fltk/Fl_Menu_Window.html
+share/doc/fltk/Fl_Multi_Browser.html
+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
+share/doc/fltk/Fl_Roller.gif
+share/doc/fltk/Fl_Roller.html
+share/doc/fltk/Fl_Round_Button.gif
+share/doc/fltk/Fl_Round_Button.html
+share/doc/fltk/Fl_Scroll.gif
+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
+share/doc/fltk/Fl_Value_Output.gif
+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/basics.html
+share/doc/fltk/boxtypes.gif
+share/doc/fltk/buttons.gif
+share/doc/fltk/charts.gif
+share/doc/fltk/choice.gif
+share/doc/fltk/clock.gif
+share/doc/fltk/common.html
+share/doc/fltk/counter.gif
+share/doc/fltk/cubeview.gif
+share/doc/fltk/dial.gif
+share/doc/fltk/drawing.html
+share/doc/fltk/editor-replace.gif
+share/doc/fltk/editor.gif
+share/doc/fltk/editor.html
+share/doc/fltk/enumerations.html
+share/doc/fltk/events.html
+share/doc/fltk/fl_alert.gif
+share/doc/fltk/fl_ask.gif
+share/doc/fltk/fl_choice.gif
+share/doc/fltk/fl_color_chooser.jpg
+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-catgets.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-cxx.gif
+share/doc/fltk/fluid3-gui.gif
+share/doc/fltk/fluid3-style.gif
+share/doc/fltk/fluid4.gif
+share/doc/fltk/fluid_prefs.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
+share/doc/fltk/hello.C.gif
+share/doc/fltk/index.html
+share/doc/fltk/intro.html
+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
+share/doc/fltk/preface.html
+share/doc/fltk/resizebox1.gif
+share/doc/fltk/resizebox2.gif
+share/doc/fltk/round_clock.gif
+share/doc/fltk/scrollbar.gif
+share/doc/fltk/slider.gif
+share/doc/fltk/subclassing.html
+share/doc/fltk/symbols.gif
+share/doc/fltk/tabs.gif
+share/doc/fltk/text.gif
+share/doc/fltk/valuators.gif
+share/doc/fltk/value_slider.gif
+share/doc/fltk/widgets.html
+@dirrm share/doc/fltk
+@dirrm include/FL
diff --git a/x11/fltk/PLIST.NetBSD b/x11/fltk/PLIST.NetBSD
deleted file mode 100644
index ee176b7328d..00000000000
--- a/x11/fltk/PLIST.NetBSD
+++ /dev/null
@@ -1,4 +0,0 @@
-@comment $NetBSD: PLIST.NetBSD,v 1.1 2004/04/17 18:40:08 ben Exp $
-man/cat1/fltk-config.0
-man/cat1/fluid.0
-man/cat3/fltk.0
diff --git a/x11/fltk/PLIST.common b/x11/fltk/PLIST.common
deleted file mode 100644
index 407d06911db..00000000000
--- a/x11/fltk/PLIST.common
+++ /dev/null
@@ -1,411 +0,0 @@
-@comment $NetBSD: PLIST.common,v 1.3 2004/09/22 08:09:57 jlam Exp $
-bin/fltk-config
-bin/fluid
-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
-include/FL/Fl_Box.h
-include/FL/Fl_Browser.H
-include/FL/Fl_Browser.h
-include/FL/Fl_Browser_.H
-include/FL/Fl_Browser_.h
-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
-include/FL/Fl_Choice.h
-include/FL/Fl_Clock.H
-include/FL/Fl_Clock.h
-include/FL/Fl_Color_Chooser.H
-include/FL/Fl_Color_Chooser.h
-include/FL/Fl_Counter.H
-include/FL/Fl_Counter.h
-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
-include/FL/Fl_Fill_Slider.h
-include/FL/Fl_Float_Input.H
-include/FL/Fl_Float_Input.h
-include/FL/Fl_FormsBitmap.H
-include/FL/Fl_FormsBitmap.h
-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
-include/FL/Fl_Hor_Fill_Slider.h
-include/FL/Fl_Hor_Nice_Slider.H
-include/FL/Fl_Hor_Nice_Slider.h
-include/FL/Fl_Hor_Slider.H
-include/FL/Fl_Hor_Slider.h
-include/FL/Fl_Hor_Value_Slider.H
-include/FL/Fl_Hor_Value_Slider.h
-include/FL/Fl_Image.H
-include/FL/Fl_Image.h
-include/FL/Fl_Input.H
-include/FL/Fl_Input.h
-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
-include/FL/Fl_Line_Dial.h
-include/FL/Fl_Menu.H
-include/FL/Fl_Menu.h
-include/FL/Fl_Menu_.H
-include/FL/Fl_Menu_.h
-include/FL/Fl_Menu_Bar.H
-include/FL/Fl_Menu_Bar.h
-include/FL/Fl_Menu_Button.H
-include/FL/Fl_Menu_Button.h
-include/FL/Fl_Menu_Item.H
-include/FL/Fl_Menu_Item.h
-include/FL/Fl_Menu_Window.H
-include/FL/Fl_Menu_Window.h
-include/FL/Fl_Multi_Browser.H
-include/FL/Fl_Multi_Browser.h
-include/FL/Fl_Multi_Label.H
-include/FL/Fl_Multi_Label.h
-include/FL/Fl_Multiline_Input.H
-include/FL/Fl_Multiline_Input.h
-include/FL/Fl_Multiline_Output.H
-include/FL/Fl_Multiline_Output.h
-include/FL/Fl_Nice_Slider.H
-include/FL/Fl_Nice_Slider.h
-include/FL/Fl_Object.H
-include/FL/Fl_Object.h
-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
-include/FL/Fl_Radio_Light_Button.h
-include/FL/Fl_Radio_Round_Button.H
-include/FL/Fl_Radio_Round_Button.h
-include/FL/Fl_Repeat_Button.H
-include/FL/Fl_Repeat_Button.h
-include/FL/Fl_Return_Button.H
-include/FL/Fl_Return_Button.h
-include/FL/Fl_Roller.H
-include/FL/Fl_Roller.h
-include/FL/Fl_Round_Button.H
-include/FL/Fl_Round_Button.h
-include/FL/Fl_Round_Clock.H
-include/FL/Fl_Round_Clock.h
-include/FL/Fl_Scroll.H
-include/FL/Fl_Scroll.h
-include/FL/Fl_Scrollbar.H
-include/FL/Fl_Scrollbar.h
-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
-include/FL/Fl_Toggle_Button.h
-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
-include/FL/Fl_Value_Input.h
-include/FL/Fl_Value_Output.H
-include/FL/Fl_Value_Output.h
-include/FL/Fl_Value_Slider.H
-include/FL/Fl_Value_Slider.h
-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
-include/FL/fl_ask.H
-include/FL/fl_ask.h
-include/FL/fl_draw.H
-include/FL/fl_draw.h
-include/FL/fl_file_chooser.H
-include/FL/fl_file_chooser.h
-include/FL/fl_message.H
-include/FL/fl_message.h
-include/FL/fl_show_colormap.H
-include/FL/fl_show_colormap.h
-include/FL/fl_show_input.H
-include/FL/fl_show_input.h
-include/FL/forms.H
-include/FL/forms.h
-include/FL/gl.h
-include/FL/gl2opengl.h
-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/win32.H
-include/FL/win32.h
-include/FL/x.H
-include/FL/x.h
-include/Fl
-lib/libfltk.la
-lib/libfltk_forms.la
-lib/libfltk_gl.la
-lib/libfltk_images.la
-man/man1/fltk-config.1
-man/man1/fluid.1
-man/man3/fltk.3
-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
-share/doc/fltk/Fl_Clock.html
-share/doc/fltk/Fl_Color_Chooser.html
-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
-share/doc/fltk/Fl_Menu_Bar.html
-share/doc/fltk/Fl_Menu_Button.html
-share/doc/fltk/Fl_Menu_Item.html
-share/doc/fltk/Fl_Menu_Window.html
-share/doc/fltk/Fl_Multi_Browser.html
-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
-share/doc/fltk/Fl_Roller.gif
-share/doc/fltk/Fl_Roller.html
-share/doc/fltk/Fl_Round_Button.gif
-share/doc/fltk/Fl_Round_Button.html
-share/doc/fltk/Fl_Scroll.gif
-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
-share/doc/fltk/Fl_Value_Output.gif
-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/basics.html
-share/doc/fltk/boxtypes.gif
-share/doc/fltk/buttons.gif
-share/doc/fltk/charts.gif
-share/doc/fltk/choice.gif
-share/doc/fltk/clock.gif
-share/doc/fltk/common.html
-share/doc/fltk/counter.gif
-share/doc/fltk/cubeview.gif
-share/doc/fltk/dial.gif
-share/doc/fltk/drawing.html
-share/doc/fltk/editor-replace.gif
-share/doc/fltk/editor.gif
-share/doc/fltk/editor.html
-share/doc/fltk/enumerations.html
-share/doc/fltk/events.html
-share/doc/fltk/fl_alert.gif
-share/doc/fltk/fl_ask.gif
-share/doc/fltk/fl_choice.gif
-share/doc/fltk/fl_color_chooser.jpg
-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-catgets.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-cxx.gif
-share/doc/fltk/fluid3-gui.gif
-share/doc/fltk/fluid3-style.gif
-share/doc/fltk/fluid4.gif
-share/doc/fltk/fluid_prefs.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
-share/doc/fltk/hello.C.gif
-share/doc/fltk/index.html
-share/doc/fltk/intro.html
-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
-share/doc/fltk/preface.html
-share/doc/fltk/resizebox1.gif
-share/doc/fltk/resizebox2.gif
-share/doc/fltk/round_clock.gif
-share/doc/fltk/scrollbar.gif
-share/doc/fltk/slider.gif
-share/doc/fltk/subclassing.html
-share/doc/fltk/symbols.gif
-share/doc/fltk/tabs.gif
-share/doc/fltk/text.gif
-share/doc/fltk/valuators.gif
-share/doc/fltk/value_slider.gif
-share/doc/fltk/widgets.html
diff --git a/x11/fltk/PLIST.common_end b/x11/fltk/PLIST.common_end
deleted file mode 100644
index 8190a035120..00000000000
--- a/x11/fltk/PLIST.common_end
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $NetBSD: PLIST.common_end,v 1.2 2004/06/27 15:01:59 grant Exp $
-@dirrm share/doc/fltk
-@dirrm include/FL
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 918772d3b7f..067324fad38 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.12 2005/02/24 15:58:05 drochner Exp $
+$NetBSD: distinfo,v 1.13 2005/03/19 15:26:18 ben Exp $
 
 SHA1 (fltk-1.1.6-source.tar.bz2) = 769bc18ec5dcd771221c13760b9fc0618b0712d2
 RMD160 (fltk-1.1.6-source.tar.bz2) = 5e2e69f6416a94ff9e372ba896872cc18ea1a936
 Size (fltk-1.1.6-source.tar.bz2) = 1898966 bytes
 SHA1 (patch-aa) = 40e6cf468e2af26c27e72747bf9fba0724078081
-SHA1 (patch-ab) = 5d833f246ed6355370d52f53d050bce6265fe4da
-SHA1 (patch-ac) = dd58a97b0071c3b8deb4d2cce50bdd43e823c584
+SHA1 (patch-ab) = a0a9762dff3cb4d51b0e3dc446fffa53031a3a0b
+SHA1 (patch-ac) = 92c7b445a630aec5df4760d46b32201adf5472cc
 SHA1 (patch-ad) = 51e2b0747229405ea919f3834ff220e353ac3c26
 SHA1 (patch-ae) = ef52b0c7e74ef9976778733983d6f13870d76ecf
 SHA1 (patch-af) = b3bd0de47e4ff1e48e3cbf70449ccdb09bd006b9
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 058b3889d27..d47051c6a73 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.9 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
 
---- configure.in.orig	2004-10-18 21:05:27.000000000 +0000
+--- configure.in.orig	2004-11-19 19:44:17.000000000 -0800
 +++ configure.in
 @@ -95,6 +95,7 @@ AC_SUBST(GLLIBNAME)
  AC_SUBST(IMGLIBNAME)
@@ -48,7 +48,31 @@ $NetBSD: patch-ab,v 1.9 2004/10/21 08:29:45 adam Exp $
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOLINK)
  AC_SUBST(DSONAME)
-@@ -726,7 +751,7 @@ if test -n "$GCC"; then
+@@ -658,23 +683,8 @@ AC_SUBST(POSTBUILD)
+ AC_SUBST(THREADS)
+ 
+ dnl Figure out the appropriate formatted man page extension...
+-case "$uname" in
+-    *BSD* | Darwin*)
+-	# *BSD
+-	CAT1EXT=0
+-	CAT3EXT=0
+-	;;
+-    IRIX*)
+-	# SGI IRIX
+-	CAT1EXT=z
+-	CAT3EXT=z
+-	;;
+-    *)
+-	# All others
+ 	CAT1EXT=1
+ 	CAT3EXT=3
+-	;;
+-esac
+ 
+ AC_SUBST(CAT1EXT)
+ AC_SUBST(CAT3EXT)
+@@ -743,7 +753,7 @@ if test -n "$GCC"; then
  	    ;;
      esac
  
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 735812b323b..35099ede359 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.7 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
 
---- configure.orig	2004-10-19 20:01:57.000000000 +0000
+--- configure.orig	2004-11-23 12:35:43.000000000 -0800
 +++ configure
 @@ -855,6 +855,8 @@ Optional Features:
    --enable-debug          turn on debugging default=no
@@ -56,7 +56,33 @@ $NetBSD: patch-ac,v 1.7 2004/10/21 08:29:45 adam Exp $
  
  
  
-@@ -9204,7 +9235,7 @@ echo "${ECHO_T}yes" >&6
+@@ -9148,23 +9179,8 @@ esac
+ 
+ 
+ 
+-case "$uname" in
+-    *BSD* | Darwin*)
+-	# *BSD
+-	CAT1EXT=0
+-	CAT3EXT=0
+-	;;
+-    IRIX*)
+-	# SGI IRIX
+-	CAT1EXT=z
+-	CAT3EXT=z
+-	;;
+-    *)
+-	# All others
+-	CAT1EXT=1
+-	CAT3EXT=3
+-	;;
+-esac
++CAT1EXT=1
++CAT3EXT=3
+ 
+ 
+ 
+@@ -9230,7 +9246,7 @@ echo "${ECHO_T}yes" >&6
  	    ;;
      esac
  
@@ -65,7 +91,7 @@ $NetBSD: patch-ac,v 1.7 2004/10/21 08:29:45 adam Exp $
  
      # Show all standard warnings + unused variables, conversion errors,
      # and inlining problems when compiling...
-@@ -10094,6 +10125,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
+@@ -10120,6 +10136,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
  s,@IMGLIBNAME@,$IMGLIBNAME,;t t
  s,@LIBEXT@,$LIBEXT,;t t
  s,@LIBNAME@,$LIBNAME,;t t