Update fltk to 1.0.11. Changes from version 1.0.10 include bugfixes and:

- Added new const const pointer versions of pixmap functions to eliminate
  an annoying pointer warning message that was generated by the Sun and
  other C++ compilers.

- Eliminated all "var hides class::var" warnings.

- Eliminated all "string literal converted to char *" warnings.

- The file chooser buttons use user_data() rather than the label to decide
  what to do, allowing the label to be somewhat cleaner.

- Fl_has_idle only tested N-1 callbacks and missed one.

- Fl_Gl_Window has a new method to allow you to get and set the context:

      void Fl_Gl_Window::context(void*, int destroy = 0)
      void* Fl_Gl_Window::context() const;

  Return or set a pointer to the GLContext that this window is using. This
  is a system-dependent structure, but it is portable to copy the context
  from one window to another. You can also set it to NULL, which will
  force FLTK to recreate the context the next time make_current() is
  called, this is useful for getting around bugs in OpenGL implementations.

  If destroy_flag is true the context will be destroyed by fltk when the
  window is destroyed, or when the mode() is changed, or the next time
  context(x) is called.

- Added Fl::add_check(...), Fl::remove_check, and Fl::has_check. These are
  similar to idle callbacks but are only called just before it waits for
  new events.  They can be used to watch for changes in global state and
  respond to them.

- Added simple FLTK and FLUID manual pages.

1 files changed, 12 insertions, 16 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 81903d5c4f0..bc94e340df1 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2001/05/17 08:32:13 abs Exp $
+# $NetBSD: Makefile,v 1.15 2001/05/26 06:37:45 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME}-source
-PKGNAME=	fltk-1.0.10
+PKGNAME=	fltk-1.0.11
 VERS=		${PKGNAME:S/fltk-//}
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	x11
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=FLTK/} \
 		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERS}/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 
@@ -24,22 +24,18 @@ USE_GMAKE=	# defined
 USE_LIBTOOL=	# defined
 
 GNU_CONFIGURE=	# defined
+CONFIGURE_ARGS=	--enable-libtool=${LIBTOOL}
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
-CPPFLAGS+=	-I${X11PREFIX}/include		# GL/GL.h
-MAKE_ENV+=	INSTALL_DATA_DIR="${INSTALL_DATA_DIR}"
-MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
 
-# When the API changes and breaks binary-compatibility with the previous
-# version, increment the MAJOR by 1 and reset the MINOR to 0.  Otherwise,
-# bump the MINOR when a new version comes out.
-#
-FLTK_MAJOR=	1
-FLTK_MINOR=	4
-MAKE_ENV+=	FLTK_MAJOR="${FLTK_MAJOR}" FLTK_MINOR="${FLTK_MINOR}"
-PLIST_SUBST+=	FLTK_MAJOR=${FLTK_MAJOR} FLTK_MINOR=${FLTK_MINOR}
+.include "../../graphics/Mesa/buildlink.mk"
+
+CPPFLAGS+=	-I${BUILDLINK_INCDIR}
+LDFLAGS+=	-L${BUILDLINK_LIBDIR}
+
+pre-configure: ${BUILDLINK_TARGETS}
 
 test:
-	@cd ${WRKSRC}/test && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} all
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV}				\
+		${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} test
 
 .include "../../mk/bsd.pkg.mk"