Import build rules for fltk2. This is currently static only.

10 files changed, 362 insertions, 0 deletions

diff --git a/x11/fltk2/DESCR b/x11/fltk2/DESCR
new file mode 100644
index 00000000000..afa3fcb6d90
--- /dev/null
+++ b/x11/fltk2/DESCR
@@ -0,0 +1,7 @@
+FLTK (pronounced "fulltick") is a LGPL'd C++ graphical user interface
+toolkit for X (UNIX), OpenGL, and Win32.  FLTK was designed to be small and
+modular enough to be statically linked, but also works fine as a shared
+library.  FLTK also includes FLUID, an interactive user interface builder
+program.
+
+FLTK2 is the next generation of FLTK and still in very active development.
diff --git a/x11/fltk2/Makefile b/x11/fltk2/Makefile
new file mode 100644
index 00000000000..969ab27e670
--- /dev/null
+++ b/x11/fltk2/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+VERS=		6129
+DISTNAME=	fltk-2.0.x-r${VERS}
+PKGNAME=	fltk2-2.0pre${VERS}
+CATEGORIES=	x11
+MASTER_SITES=	http://ftp.easysw.com/pub/fltk/snapshots/ \
+		http://mirror.nu6.org/ftp.easysw.com/pub/fltk/snapshots/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/snapshots/ \
+		ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/snapshots/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.fltk.org/
+COMMENT=	Fast Light Tool Kit for graphical user interfaces
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
+TEST_TARGET=		test
+
+PTHREAD_OPTS+=		require
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-threads
+CONFIGURE_ARGS+=	ac_cv_have_overlay=yes
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/fltk2/PLIST b/x11/fltk2/PLIST
new file mode 100644
index 00000000000..836ae3d8066
--- /dev/null
+++ b/x11/fltk2/PLIST
@@ -0,0 +1,199 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+bin/fltk2-config
+bin/fluid2
+include/fltk/Adjuster.h
+include/fltk/AlignGroup.h
+include/fltk/AnsiWidget.h
+include/fltk/BarGroup.h
+include/fltk/Box.h
+include/fltk/Browser.h
+include/fltk/Button.h
+include/fltk/CheckButton.h
+include/fltk/Choice.h
+include/fltk/Clock.h
+include/fltk/Color.h
+include/fltk/ColorChooser.h
+include/fltk/ComboBox.h
+include/fltk/Cursor.h
+include/fltk/CycleButton.h
+include/fltk/Dial.h
+include/fltk/Divider.h
+include/fltk/DoubleBufferWindow.h
+include/fltk/FL_API.h
+include/fltk/FL_VERSION.h
+include/fltk/FileBrowser.h
+include/fltk/FileChooser.h
+include/fltk/FileIcon.h
+include/fltk/FileInput.h
+include/fltk/FillDial.h
+include/fltk/FillSlider.h
+include/fltk/Flags.h
+include/fltk/FloatInput.h
+include/fltk/Font.h
+include/fltk/GlWindow.h
+include/fltk/Group.h
+include/fltk/HelpDialog.h
+include/fltk/HelpView.h
+include/fltk/HighlightButton.h
+include/fltk/Image.h
+include/fltk/Input.h
+include/fltk/InputBrowser.h
+include/fltk/IntInput.h
+include/fltk/InvisibleBox.h
+include/fltk/Item.h
+include/fltk/ItemGroup.h
+include/fltk/LabelType.h
+include/fltk/LightButton.h
+include/fltk/LineDial.h
+include/fltk/Menu.h
+include/fltk/MenuBar.h
+include/fltk/MenuBuild.h
+include/fltk/MenuWindow.h
+include/fltk/Monitor.h
+include/fltk/MultiBrowser.h
+include/fltk/MultiImage.h
+include/fltk/MultiLineInput.h
+include/fltk/MultiLineOutput.h
+include/fltk/NumericInput.h
+include/fltk/Output.h
+include/fltk/PackedGroup.h
+include/fltk/PixelType.h
+include/fltk/PopupMenu.h
+include/fltk/Preferences.h
+include/fltk/ProgressBar.h
+include/fltk/RadioButton.h
+include/fltk/RadioItem.h
+include/fltk/RadioLightButton.h
+include/fltk/Rectangle.h
+include/fltk/RepeatButton.h
+include/fltk/ReturnButton.h
+include/fltk/ScrollGroup.h
+include/fltk/Scrollbar.h
+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
+include/fltk/Symbol.h
+include/fltk/SystemMenuBar.h
+include/fltk/TabGroup.h
+include/fltk/TextBuffer.h
+include/fltk/TextDisplay.h
+include/fltk/TextEditor.h
+include/fltk/Threads.h
+include/fltk/ThumbWheel.h
+include/fltk/TiledGroup.h
+include/fltk/TiledImage.h
+include/fltk/ToggleButton.h
+include/fltk/ToggleItem.h
+include/fltk/Tooltip.h
+include/fltk/Valuator.h
+include/fltk/ValueInput.h
+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
+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_Pack.H
+include/fltk/compat/FL/Fl_Pixmap.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_Shared_Image.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
+include/fltk/damage.h
+include/fltk/dirent.h
+include/fltk/draw.h
+include/fltk/error.h
+include/fltk/events.h
+include/fltk/file_chooser.h
+include/fltk/filename.h
+include/fltk/fltk_cairo.h
+include/fltk/forms.h
+include/fltk/gl.h
+include/fltk/gl2opengl.h
+include/fltk/glut.h
+include/fltk/layout.h
+include/fltk/load_plugin.h
+include/fltk/mac.r
+include/fltk/math.h
+include/fltk/osx.h
+include/fltk/pnmImage.h
+include/fltk/rgbImage.h
+include/fltk/run.h
+include/fltk/show_colormap.h
+include/fltk/string.h
+include/fltk/utf.h
+include/fltk/visual.h
+include/fltk/win32.h
+include/fltk/x.h
+include/fltk/x11.h
+include/fltk/xbmImage.h
+include/fltk/xpmImage.h
+lib/libfltk2.a
+lib/libfltk2_gl.a
+lib/libfltk2_glut.a
+lib/libfltk2_images.a
+@dirrm include/fltk/compat/FL
+@dirrm include/fltk/compat
+@dirrm include/fltk
diff --git a/x11/fltk2/buildlink3.mk b/x11/fltk2/buildlink3.mk
new file mode 100644
index 00000000000..3f599264b83
--- /dev/null
+++ b/x11/fltk2/buildlink3.mk
@@ -0,0 +1,30 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+BUILDLINK_DEPMETHOD.fltk2?=	build
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+FLTK2_BUILDLINK3_MK:=	${FLTK2_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	fltk2
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nfltk2}
+BUILDLINK_PACKAGES+=	fltk2
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}fltk2
+
+.if ${FLTK2_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.fltk2+=	fltk2>=2.0pre6129
+BUILDLINK_PKGSRCDIR.fltk2?=	../../x11/fltk2
+.endif	# FLTK2_BUILDLINK3_MK
+
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXi/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/fltk2/distinfo b/x11/fltk2/distinfo
new file mode 100644
index 00000000000..996532150d8
--- /dev/null
+++ b/x11/fltk2/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5
+RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f
+Size (fltk-2.0.x-r6129.tar.bz2) = 2593617 bytes
+SHA1 (patch-aa) = 344311614b787f1e7b42bde06f2eeee9dc9459e8
+SHA1 (patch-ab) = bf71acd8c34f2dedbe3e9ace6662db151dcf6240
+SHA1 (patch-ac) = 5fdd8cfe380b6eb2b25f62f809e256e5c0f5dede
+SHA1 (patch-ad) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088
+SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3
diff --git a/x11/fltk2/patches/patch-aa b/x11/fltk2/patches/patch-aa
new file mode 100644
index 00000000000..7d51c9de59b
--- /dev/null
+++ b/x11/fltk2/patches/patch-aa
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+--- fltk2-config.in.orig	2008-05-16 18:06:21.000000000 +0200
++++ fltk2-config.in
+@@ -252,10 +252,10 @@ fi
+ #
+ case `uname -s` in
+     MINGW*)
+-	if test "$includedir" == /usr/include; then
++	if test "$includedir" = /usr/include; then
+ 	  includes=-I$includedir
+ 	fi
+-	if test "$libdir" == /usr/lib; then
++	if test "$libdir" = /usr/lib; then
+ 	  libs=-L$libdir
+ 	fi
+ 	;;
diff --git a/x11/fltk2/patches/patch-ab b/x11/fltk2/patches/patch-ab
new file mode 100644
index 00000000000..634427f0a07
--- /dev/null
+++ b/x11/fltk2/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+--- configure.in.orig	2008-05-16 18:07:02.000000000 +0200
++++ configure.in
+@@ -685,7 +685,7 @@ case $uname in
+ 
+ 	dnl Check for the Xshm extension unless disabled...
+         AC_ARG_ENABLE(xshm, [  --enable-xshm           turn on MIT-SHM support (default=no)])
+-	if test x$enable_xshm == xyes; then
++	if test x$enable_xshm = xyes; then
+ 	  AC_CHECK_HEADER(X11/extensions/XShm.h, AC_DEFINE(USE_XSHM),,
+ 	    [#include <X11/Xlib.h>])
+ 	fi
diff --git a/x11/fltk2/patches/patch-ac b/x11/fltk2/patches/patch-ac
new file mode 100644
index 00000000000..18bfd2db635
--- /dev/null
+++ b/x11/fltk2/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+--- configure.orig	2008-05-16 18:07:17.000000000 +0200
++++ configure
+@@ -11085,7 +11085,7 @@ if test "${enable_xshm+set}" = set; then
+   enableval=$enable_xshm;
+ fi
+ 
+-	if test x$enable_xshm == xyes; then
++	if test x$enable_xshm = xyes; then
+ 	  { echo "$as_me:$LINENO: checking for X11/extensions/XShm.h" >&5
+ echo $ECHO_N "checking for X11/extensions/XShm.h... $ECHO_C" >&6; }
+ if test "${ac_cv_header_X11_extensions_XShm_h+set}" = set; then
diff --git a/x11/fltk2/patches/patch-ad b/x11/fltk2/patches/patch-ad
new file mode 100644
index 00000000000..55c6d0e353f
--- /dev/null
+++ b/x11/fltk2/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+--- src/Browser.cxx.orig	2008-05-16 18:09:01.000000000 +0200
++++ src/Browser.cxx
+@@ -1676,7 +1676,7 @@ RETURN:
+ 
+ void Browser::column_click_cb_(Widget *ww, void *d) {
+   Browser *w = (Browser*)(ww->parent());
+-  w->selected_column_ = *(int*)&d;
++  w->selected_column_ = *(int *)d;
+   w->do_callback();
+   w->selected_column_ = NO_COLUMN_SELECTED;
+ }
+@@ -1774,7 +1774,7 @@ void Browser::column_labels(const char *
+       if (i<nHeader) sides |= 2;
+       header_[i] = new BButton(sides, column_labels_[i]);
+       header_[i]->parent(this);
+-      header_[i]->callback(column_click_cb_, (void*)i);
++      header_[i]->callback(column_click_cb_, &i);
+     }
+     Group::current(g);
+   }
diff --git a/x11/fltk2/patches/patch-ae b/x11/fltk2/patches/patch-ae
new file mode 100644
index 00000000000..b861c0da352
--- /dev/null
+++ b/x11/fltk2/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2008/05/25 15:29:19 joerg Exp $
+
+--- fluid/Makefile.orig	2008-05-16 18:17:05.000000000 +0200
++++ fluid/Makefile
+@@ -132,7 +132,7 @@ install:
+ 	-$(MKDIR) $(DESTDIR)$(bindir)
+ 	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+ 	$(STRIP) $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+-	$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
++	#$(bindir)/fltk2-config --post $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+ 	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid2$(EXEEXT)
+ 
+