My survey of packages was not quite complete enough. There are at

least two packages that still use <FL/*.h> files, so modify fltk to
*always* create the links on all platforms.  This unfortunately doesn't
allow installing this package on a case-insensitive filesystem.  Bump
PKGREVISION to 3.

3 files changed, 125 insertions, 6 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index a215ceae41b..765507edc18 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.49 2005/06/14 22:42:49 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/06/15 02:24:40 jlam Exp $
 
 DISTNAME=	fltk-1.1.6-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
 		ftp://ftp.fltk.org/pub/fltk/${VERS}/ \
@@ -26,7 +26,7 @@ TEST_TARGET=		test
 PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-libtool=${LIBTOOL}
-CONFIGURE_ARGS+=	--without-links
+CONFIGURE_ARGS+=	--with-links
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST
index 314366c05b8..66a26318aa6 100644
--- a/x11/fltk/PLIST
+++ b/x11/fltk/PLIST
@@ -1,127 +1,246 @@
-@comment $NetBSD: PLIST,v 1.6 2005/06/14 22:42:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/06/15 02:24:40 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
diff --git a/x11/fltk/buildlink3.mk b/x11/fltk/buildlink3.mk
index f68f7fa6cef..2382d9e68d8 100644
--- a/x11/fltk/buildlink3.mk
+++ b/x11/fltk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2005/06/15 01:40:33 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2005/06/15 02:24:40 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 FLTK_BUILDLINK3_MK:=	${FLTK_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	fltk
 BUILDLINK_DEPENDS.fltk+=	fltk>=1.1.5rc1
 BUILDLINK_RECOMMENDED.fltk+=	fltk>=1.1.5rc1nb3
 BUILDLINK_PKGSRCDIR.fltk?=	../../x11/fltk
-BUILDLINK_FILES.fltk+=		include/FL/*
+BUILDLINK_FILES.fltk+=		include/Fl/*
 .endif	# FLTK_BUILDLINK3_MK
 
 .include "../../graphics/MesaLib/buildlink3.mk"