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.

11 files changed, 429 insertions, 223 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"
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 57286a7c54e..0dab6097632 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:07:38 skrll Exp $
+$NetBSD: distinfo,v 1.3 2001/05/26 06:37:45 jlam Exp $
 
-SHA1 (fltk-1.0.10-source.tar.bz2) = 88a39b0683585446d2c472fb43a2f4da80fe0046
-Size (fltk-1.0.10-source.tar.bz2) = 992877 bytes
-SHA1 (patch-aa) = c96194b4312b8e601ac8c5954386cef5bc9be8b3
-SHA1 (patch-ab) = fb925a3e4c81fe6d54e59791feff074a6a30f963
-SHA1 (patch-ac) = afcfc0f42fec2a6c6135692a80ebcf278864ab01
-SHA1 (patch-ad) = 163d8d823e0f59d1612f6f4d348b667e98f66176
-SHA1 (patch-ae) = 12d067e91beb1f9179f0e1cfa7582d51a86b2a52
-SHA1 (patch-af) = 29bb32cb91a29d632a3b6ff796e8a8cffb458b17
+SHA1 (fltk-1.0.11-source.tar.bz2) = daf8593ca6d794ac779cf8e0ec43dd5d275a39ad
+Size (fltk-1.0.11-source.tar.bz2) = 999099 bytes
+SHA1 (patch-aa) = f7da8bfeaf5918a60d42ed87da252ff6cbd0cec0
+SHA1 (patch-ab) = 0421ff36dc2df5977681bb4fcff56b5dbbb29a86
+SHA1 (patch-ac) = 6b6c0f6af35cc0f77a23adaab5a636e660e2ddac
+SHA1 (patch-ad) = 3d20ba261a675f508a270ef7864626a74ba1a357
+SHA1 (patch-ae) = 4c020ba0ffd321a1d9c0b083698c53dd3e354e0a
+SHA1 (patch-af) = f44d69eda82621e14c395ededfaa64ed3b1ac972
+SHA1 (patch-ag) = 20fed3a15f9b4b27fb719fe7a8ffe154e0244703
+SHA1 (patch-ah) = 0514008f3c66fe8e5533ff01d12d0063b885fc25
diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
index df5c3f0e37d..82d599b7bfc 100644
--- a/x11/fltk/patches/patch-aa
+++ b/x11/fltk/patches/patch-aa
@@ -1,26 +1,28 @@
-$NetBSD: patch-aa,v 1.3 2000/08/04 03:38:15 jlam Exp $
+$NetBSD: patch-aa,v 1.4 2001/05/26 06:37:46 jlam Exp $
 
---- fluid/Makefile.orig	Mon Jun  5 17:20:41 2000
-+++ fluid/Makefile	Thu Aug  3 23:13:08 2000
-@@ -51,7 +51,7 @@
+--- Makefile.orig	Wed Mar 14 12:20:01 2001
++++ Makefile
+@@ -25,7 +25,7 @@
  
- $(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
- 	echo Linking $@...
--	$(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -lfltk $(LDLIBS)
-+	$(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(FLTKLIB) $(LDLIBS)
+ SHELL=/bin/sh
  
- clean :
- 	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
-@@ -63,10 +63,8 @@
+-DIRS	=	src fluid test
++DIRS	=	src fluid
  
- install: $(PROGRAM)
- 	echo "Installing FLUID..."
--	strip $(PROGRAM)
--	-mkdir -p $(bindir)
--	cp $(PROGRAM) $(bindir)/$(PROGRAM)
--	chmod 755 $(bindir)/$(PROGRAM)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(bindir)
-+	$(LIBTOOL) $(BSD_INSTALL_PROGRAM) $(PROGRAM) $(bindir)
+ all: makeinclude
+ 	@for dir in $(DIRS); do\
+@@ -35,6 +35,14 @@
+ 		fi;\
+ 		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
+ 	done
++
++test: makeinclude
++	dir=test;\
++	echo "=== making $$dir ===";\
++	if test ! -f $$dir/makedepend; then\
++		touch $$dir/makedepend;\
++	fi;\
++	(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
  
- uninstall:
- 	-rm -f $(bindir)/$(PROGRAM)
+ install: makeinclude
+ 	@for dir in $(DIRS); do\
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 0147fed29b8..cd21b23c605 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,43 +1,62 @@
-$NetBSD: patch-ab,v 1.5 2001/01/02 22:11:18 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2001/05/26 06:37:46 jlam Exp $
 
---- makeinclude.in.orig	Mon Nov 20 10:10:00 2000
-+++ makeinclude.in
-@@ -33,23 +33,24 @@
- VPATH		=@srcdir@
+--- configure.in.orig	Mon May  7 10:34:22 2001
++++ configure.in
+@@ -30,6 +30,9 @@
+ AC_PROG_RANLIB
  
- # compiler names:
--CXX		=@CXX@
--CC		=@CC@
-+CXX		=${LIBTOOL} @CXX@
-+CC		=${LIBTOOL} @CC@
- MAKEDEPEND	=@MAKEDEPEND@
+ LIBNAME="libfltk.a"
++LIBRARY="../lib/\$(LIBNAME)"
++LIBFLTK="../lib/\$(LIBNAME)"
++LINKFLTK="-L../lib -lfltk"
+ if test "$RANLIB" != ":"; then
+   LIBCOMMAND="ar cr"
+ else
+@@ -58,8 +61,17 @@
+   DEBUGFLAG="-g "
+ fi])
+ AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [default=yes]])
+-AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]],[
+-if eval "test x$enable_shared = xyes"; then
++AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries [default=no]])
++AC_ARG_ENABLE(libtool, [  --enable-libtool=LIBTOOL_PATH
++                          turn on building with libtool [default=no]],[
++if eval "test x$enable_libtool != xno"; then
++    LIBTOOL="$enable_libtool"
++    enable_shared=no
++else
++    LIBTOOL=""
++fi])
++
++if test "$enable_shared" = "yes"; then
+   PICFLAG=1
+   case $uname in
+       SunOS* | UNIX_S*)
+@@ -95,7 +107,14 @@
+           DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
+ 	  ;;
+   esac
+-fi])
++fi
++
++if test "x$LIBTOOL" != "x"; then
++    LIBNAME="libfltk.la"
++    LIBRARY="\$(LIBNAME)"
++    LIBFLTK="../src/\$(LIBNAME)"
++    LINKFLTK="../src/\$(LIBNAME)"
++fi
  
- # flags for C++ compiler:
--CFLAGS		=@CFLAGS@
--CXXFLAGS	=@CXXFLAGS@
-+CFLAGS		=@CFLAGS@ @CPPFLAGS@
-+CXXFLAGS	=@CXXFLAGS@ @CPPFLAGS@
- 
- # program to make the archive:
- LIBNAME		=@LIBNAME@
-+FLTKLIB		=../src/libfltk.la
- LIBCOMMAND	=@LIBCOMMAND@
- RANLIB		=@RANLIB@
- DSONAME		=@DSONAME@
- DSOCOMMAND	=@DSOCOMMAND@
- 
- # libraries to link with:
--LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
-+LDLIBS		=$(GLDLIBS)
- GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
- 
- # Be quiet when building...
-@@ -60,7 +61,7 @@
- 
- .cxx:
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) $< $(FLTKLIB) $(LDLIBS) -o $@
- 
- .c.o:
- 	echo Compiling $@...
+ AC_PROG_CC
+ AC_PROG_CXX
+@@ -375,7 +394,11 @@
+ AC_SUBST(DSONAME)
+ AC_SUBST(DSOCOMMAND)
+ AC_SUBST(LIBNAME)
++AC_SUBST(LIBRARY)
++AC_SUBST(LIBFLTK)
++AC_SUBST(LINKFLTK)
+ AC_SUBST(LIBCOMMAND)
++AC_SUBST(LIBTOOL)
+ AC_SUBST(MAKEDEPEND)
+ AC_CONFIG_HEADER(config.h:configh.in)
+ AC_OUTPUT(makeinclude)
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 8c05ae94758..2722dfa0f6a 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,53 +1,93 @@
-$NetBSD: patch-ac,v 1.3 2000/08/04 03:38:15 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2001/05/26 06:37:46 jlam Exp $
 
---- src/Makefile.orig	Mon Jun  5 17:21:03 2000
-+++ src/Makefile	Thu Aug  3 23:13:08 2000
-@@ -152,7 +152,13 @@
+--- configure.orig	Mon May  7 10:53:14 2001
++++ configure
+@@ -18,6 +18,9 @@
+ ac_help="$ac_help
+   --enable-shared         turn on shared libraries [default=no]"
+ ac_help="$ac_help
++  --enable-libtool=LIBTOOL_PATH
++                          turn on building with libtool [default=no]"
++ac_help="$ac_help
+   --with-x                use the X Window System"
  
- OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
+ # Initialize some variables set by options.
+@@ -562,6 +565,9 @@
  
--all:	$(LIBRARY) $(DSONAME)
-+all:	libfltk.la
+ 
+ LIBNAME="libfltk.a"
++LIBRARY="../lib/\$(LIBNAME)"
++LIBFLTK="../lib/\$(LIBNAME)"
++LINKFLTK="-L../lib -lfltk"
+ if test "$RANLIB" != ":"; then
+   LIBCOMMAND="ar cr"
+ else
+@@ -600,8 +606,23 @@
+ # Check whether --enable-shared or --disable-shared was given.
+ if test "${enable_shared+set}" = set; then
+   enableval="$enable_shared"
++  :
++fi
++
++# Check whether --enable-libtool or --disable-libtool was given.
++if test "${enable_libtool+set}" = set; then
++  enableval="$enable_libtool"
+   
+-if eval "test x$enable_shared = xyes"; then
++if eval "test x$enable_libtool != xno"; then
++    LIBTOOL="$enable_libtool"
++    enable_shared=no
++else
++    LIBTOOL=""
++fi
++fi
 +
-+libfltk.la: $(OBJECTS)
-+	$(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib \
-+		-version-info $(FLTK_MAJOR):$(FLTK_MINOR)
-+	$(RM) -f $(LIBRARY)
-+	echo timestamp > $(LIBRARY)
++
++if test "$enable_shared" = "yes"; then
+   PICFLAG=1
+   case $uname in
+       SunOS* | UNIX_S*)
+@@ -638,13 +659,18 @@
+ 	  ;;
+   esac
+ fi
+-fi
+ 
++if test "x$LIBTOOL" != "x"; then
++    LIBNAME="libfltk.la"
++    LIBRARY="\$(LIBNAME)"
++    LIBFLTK="../src/\$(LIBNAME)"
++    LINKFLTK="../src/\$(LIBNAME)"
++fi
  
- $(LIBRARY): $(OBJECTS)
- 	echo $(LIBCOMMAND) $@ ...
-@@ -174,7 +180,14 @@
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:648: checking for $ac_word" >&5
++echo "configure:674: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3220,6 +3246,10 @@
  
- ################################################################
  
--install: $(LIBRARY) $(DSONAME)
-+install: install-la install-includes
+ 
++
 +
-+install-la: libfltk.la
-+	echo "Installing libraries..."
-+	$(BSD_INSTALL_DATA_DIR) $(libdir)
-+	$(LIBTOOL) $(BSD_INSTALL_DATA) libfltk.la $(libdir)
 +
-+install-lib: $(LIBRARY) $(DSONAME)
- 	echo "Installing libraries..."
- 	-mkdir -p $(libdir)
- 	rm -f $(libdir)/$(LIBNAME)
-@@ -192,13 +205,11 @@
- 		chmod 755 $(libdir)/libfltk.sl.1; \
- 		ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\
- 	fi
 +
-+install-includes:
- 	echo "Installing include files..."
--	-mkdir -p $(includedir)
--	rm -rf $(includedir)/FL
--	mkdir $(includedir)/FL
--	cp ../FL/*.[hH] $(includedir)/FL
--	-chmod 755 $(includedir)/FL
--	-chmod 644 $(includedir)/FL/*
-+	$(BSD_INSTALL_DATA_DIR) $(includedir)/FL
-+	$(BSD_INSTALL_DATA) ../FL/* $(includedir)/FL
- 	cd $(includedir)/FL;\
- 	for file in *.H; do\
- 		ln -s $$file "`basename $$file H`h";\
+ trap '' 1 2 15
+ cat > confcache <<\EOF
+ # This file is a shell script that caches the results of configure
+@@ -3369,7 +3399,11 @@
+ s%@DSONAME@%$DSONAME%g
+ s%@DSOCOMMAND@%$DSOCOMMAND%g
+ s%@LIBNAME@%$LIBNAME%g
++s%@LIBRARY@%$LIBRARY%g
++s%@LIBFLTK@%$LIBFLTK%g
++s%@LINKFLTK@%$LINKFLTK%g
+ s%@LIBCOMMAND@%$LIBCOMMAND%g
++s%@LIBTOOL@%$LIBTOOL%g
+ s%@MAKEDEPEND@%$MAKEDEPEND%g
+ 
+ CEOF
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
index 5a3b1a4badc..ceec98ca0b4 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,68 +1,34 @@
-$NetBSD: patch-ad,v 1.3 2000/08/04 03:38:15 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/05/26 06:37:46 jlam Exp $
 
---- test/Makefile.orig	Mon Jun  5 17:21:15 2000
-+++ test/Makefile	Thu Aug  3 23:13:08 2000
-@@ -56,7 +56,7 @@
- .fl:
- 	echo Generating, compiling, and linking $@...
- 	../fluid/fluid -c $<
--	$(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx -lfltk $(LDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx $(FLTKLIB) $(LDLIBS) -o $@
+--- documentation/Makefile.orig	Mon Feb 12 10:12:14 2001
++++ documentation/Makefile
+@@ -129,23 +129,23 @@
+ # htmldir = $(datadir)/doc/html/en/fltk
+ # Possibly the "en/" can be removed, it is not clear.
+ # KDE uses "HTML" instead of "html", which is correct?
+-docdir = $(datadir)/doc/fltk
++docdir = $(datadir)/doc/html/fltk
  
+ install: $(MANPAGES)
+ 	-mkdir -p $(docdir)
+-	cp $(HTMLFILES) *.gif *.jpg index.html $(docdir)
++	$(INSTALL_DATA) $(HTMLFILES) *.gif *.jpg index.html $(docdir)
+ 	chmod 644 $(docdir)/*
+ 	-mkdir -p $(mandir)/cat1
+-	cp fluid.$(CAT1EXT) $(mandir)/cat1
++	$(INSTALL_MAN) fluid.$(CAT1EXT) $(mandir)/cat1
+ 	chmod 644 $(mandir)/cat1/fluid.$(CAT1EXT)
+ 	-mkdir -p $(mandir)/cat3
+-	cp fltk.$(CAT3EXT) $(mandir)/cat3
++	$(INSTALL_MAN) fltk.$(CAT3EXT) $(mandir)/cat3
+ 	chmod 644 $(mandir)/cat3/fltk.$(CAT3EXT)
+ 	-mkdir -p $(mandir)/man1
+-	cp fluid.man $(mandir)/man1/fluid.1
++	$(INSTALL_MAN) fluid.man $(mandir)/man1/fluid.1
+ 	chmod 644 $(mandir)/man1/fluid.1
+ 	-mkdir -p $(mandir)/man3
+-	cp fltk.man $(mandir)/man3/fltk.3
++	$(INSTALL_MAN) fltk.man $(mandir)/man3/fltk.3
+ 	chmod 644 $(mandir)/man3/fltk.3
  
- $(ALL):  ../lib/$(LIBNAME)
-@@ -65,43 +65,43 @@
- CubeView: CubeMain.o CubeView.o CubeViewUI.o
- 	echo Compiling and linking $@...
- 	$(CXX) -I.. -L../lib $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
--		-lfltk $(GLDLIBS) -o $@
-+		$(FLTKLIB) $(GLDLIBS) -o $@
- CubeMain.o: CubeViewUI.h CubeView.h
- CubeView.o: CubeView.h
- 
- cube: cube.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- fractals: fractals.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- fullscreen: fullscreen.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- glpuzzle: glpuzzle.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- gl_overlay: gl_overlay.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- shiny: shiny.cxx shiny_panel.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- keyboard: keyboard.cxx keyboard_ui.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx -lfltk $(LDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx $(FLTKLIB) $(LDLIBS) -o $@
- mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx -lfltk $(LDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx $(FLTKLIB) $(LDLIBS) -o $@
- shape: shape.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx -lfltk $(GLDLIBS) -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx $(FLTKLIB) $(GLDLIBS) -o $@
- 
- # If you have libjpeg installed, you might want to try this test program:
- 
- jpeg_image: jpeg_image.cxx
- 	echo Compiling and linking $@...
--	$(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -lfltk $(LDLIBS) -ljpeg -lXext -o $@
-+	$(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(FLTKLIB) $(LDLIBS) -ljpeg -lXext -o $@
- 
- depend:
- 	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
+ # Base html files are now the readable ones, so this target is not make by
diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae
index 20a73041ec5..4697820eebb 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -1,18 +1,28 @@
-$NetBSD: patch-ae,v 1.1 2000/08/28 13:38:57 wiz Exp $
+$NetBSD: patch-ae,v 1.2 2001/05/26 06:37:46 jlam Exp $
 
---- documentation/Makefile.orig	Mon Jun  5 23:20:35 2000
-+++ documentation/Makefile
-@@ -128,10 +128,9 @@
- depend:
+--- fluid/Makefile.orig	Mon Jan 22 10:13:38 2001
++++ fluid/Makefile
+@@ -49,9 +49,9 @@
  
- install:
--	-mkdir -p $(prefix)/share/doc/fltk
--	cp -f $(HTMLFILES) index.html $(prefix)/share/doc/fltk
--	cp -f *.gif *.jpg $(prefix)/share/doc/fltk
--	chmod 644 $(prefix)/share/doc/fltk/*
-+	-${INSTALL_DATA_DIR} $(prefix)/share/doc/html/fltk
-+	${INSTALL_DATA} $(HTMLFILES) index.html $(prefix)/share/doc/html/fltk
-+	${INSTALL_DATA} *.gif *.jpg $(prefix)/share/doc/html/fltk
+ include ../makeinclude
  
- fltk.d/index.html: $(HTMLFILES)
- 	echo "Generating HTML documentation..."
+-$(PROGRAM) : $(OBJECTS) ../lib/$(LIBNAME)
++$(PROGRAM) : $(OBJECTS) $(LIBFLTK)
+ 	echo Linking $@...
+-	$(CXX) -L../lib $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) -lfltk $(LDLIBS)
++	$(CXX) $(LDFLAGS) -o $(PROGRAM) $(OBJECTS) $(LINKFLTK) $(LDLIBS)
+ 
+ clean :
+ 	-@ rm -f *.o $(PROGRAM) $(CLEAN) core *~ makedepend
+@@ -63,9 +63,9 @@
+ 
+ install: $(PROGRAM)
+ 	echo "Installing FLUID..."
+-	strip $(PROGRAM)
+ 	-mkdir -p $(bindir)
+-	cp $(PROGRAM) $(bindir)/$(PROGRAM)
++	$(INSTALL_BIN) $(PROGRAM) $(bindir)/$(PROGRAM)
++	strip $(bindir)/$(PROGRAM)
+ 	chmod 755 $(bindir)/$(PROGRAM)
+ 
+ uninstall:
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index 1425b8ed4ca..cf891fcf5f6 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,13 +1,52 @@
-$NetBSD: patch-af,v 1.1 2001/01/02 22:11:18 jlam Exp $
+$NetBSD: patch-af,v 1.2 2001/05/26 06:37:46 jlam Exp $
 
---- Makefile.orig	Fri Jun 30 00:23:12 2000
-+++ Makefile
-@@ -25,7 +25,7 @@
+--- makeinclude.in.orig	Sat Apr 14 07:11:43 2001
++++ makeinclude.in
+@@ -39,8 +39,8 @@
+ NROFF		=@NROFF@
  
- SHELL=/bin/sh
+ # compiler names:
+-CXX		=@CXX@
+-CC		=@CC@
++CXX		=$(LIBTOOL) @CXX@
++CC		=$(LIBTOOL) @CC@
+ MAKEDEPEND	=@MAKEDEPEND@
  
--DIRS	=	src fluid test
-+DIRS	=	src fluid
+ # flags for C++ compiler:
+@@ -49,15 +49,26 @@
  
- all: makeinclude
- 	@for dir in $(DIRS); do\
+ # program to make the archive:
+ LIBNAME		=@LIBNAME@
++LIBRARY		=@LIBRARY@
++LIBFLTK		=@LIBFLTK@
++LINKFLTK	=@LINKFLTK@
+ LIBCOMMAND	=@LIBCOMMAND@
++LIBTOOL		=@LIBTOOL@
+ RANLIB		=@RANLIB@
+ DSONAME		=@DSONAME@
+ DSOCOMMAND	=@DSOCOMMAND@
+ 
+ # libraries to link with:
+-LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
++#LDLIBS		=@LDFLAGS@ @LIBS@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
++LDLIBS		=$(GLDLIBS)
+ GLDLIBS		=@LDFLAGS@ @LIBS@ @GLLIB@ -lX11 -lXext @X_EXTRA_LIBS@ -lm
+ 
++# installation programs:
++INSTALL_BIN	=$(LIBTOOL) cp
++INSTALL_DATA	=cp
++INSTALL_LIB	=$(LIBTOOL) cp
++INSTALL_MAN	=cp
++
+ # Man page extensions...
+ CAT1EXT		=@CAT1EXT@
+ CAT3EXT		=@CAT3EXT@
+@@ -70,7 +81,7 @@
+ 
+ .cxx:
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@
+ 
+ .c.o:
+ 	echo Compiling $@...
diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag
new file mode 100644
index 00000000000..f40a969aa71
--- /dev/null
+++ b/x11/fltk/patches/patch-ag
@@ -0,0 +1,57 @@
+$NetBSD: patch-ag,v 1.1 2001/05/26 06:37:46 jlam Exp $
+
+--- src/Makefile.orig	Mon Jan 22 10:13:40 2001
++++ src/Makefile
+@@ -148,17 +148,18 @@
+ 
+ include ../makeinclude
+ 
+-LIBRARY = ../lib/$(LIBNAME)
+-
+ OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
+ 
+ all:	$(LIBRARY) $(DSONAME)
+ 
+-$(LIBRARY): $(OBJECTS)
++../lib/libfltk.a: $(OBJECTS)
+ 	echo $(LIBCOMMAND) $@ ...
+ 	$(LIBCOMMAND) $@ $(OBJECTS)
+ 	$(RANLIB) $@
+ 
++libfltk.la: $(OBJECTS)
++	$(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:5
++
+ libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(OBJECTS)
+@@ -174,11 +175,13 @@
+ 
+ ################################################################
+ 
+-install: $(LIBRARY) $(DSONAME)
++install: install-lib install-includes
++
++install-lib: $(LIBRARY) $(DSONAME)
+ 	echo "Installing libraries..."
+ 	-mkdir -p $(libdir)
+ 	rm -f $(libdir)/$(LIBNAME)
+-	-cp $(LIBRARY) $(libdir)
++	-$(INSTALL_LIB) $(LIBRARY) $(libdir)
+ 	-chmod 644 $(libdir)/$(LIBNAME)
+ 	if test "$(DSONAME)" = libfltk.so.1; then\
+ 		rm -f $(libdir)/libfltk.so*;\
+@@ -192,11 +195,13 @@
+ 		chmod 755 $(libdir)/libfltk.sl.1; \
+ 		ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\
+ 	fi
++
++install-includes:
+ 	echo "Installing include files..."
+ 	-mkdir -p $(includedir)
+ 	rm -rf $(includedir)/FL
+ 	mkdir $(includedir)/FL
+-	cp ../FL/*.[hH] $(includedir)/FL
++	$(INSTALL_DATA) ../FL/*.[hH] $(includedir)/FL
+ 	-chmod 755 $(includedir)/FL
+ 	-chmod 644 $(includedir)/FL/*
+ 	cd $(includedir)/FL;\
diff --git a/x11/fltk/patches/patch-ah b/x11/fltk/patches/patch-ah
new file mode 100644
index 00000000000..4f25d50b627
--- /dev/null
+++ b/x11/fltk/patches/patch-ah
@@ -0,0 +1,71 @@
+$NetBSD: patch-ah,v 1.1 2001/05/26 06:37:46 jlam Exp $
+
+--- test/Makefile.orig	Mon Jan 22 10:13:41 2001
++++ test/Makefile
+@@ -56,52 +56,52 @@
+ .fl:
+ 	echo Generating, compiling, and linking $@...
+ 	../fluid/fluid -c $<
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) $@.cxx -lfltk $(LDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) $@.cxx $(LINKFLTK) $(LDLIBS) -o $@
+ 
+ 
+-$(ALL):  ../lib/$(LIBNAME)
++$(ALL):  $(LIBFLTK)
+ 
+ # Other programs needing special "help"...
+ CubeView: CubeMain.o CubeView.o CubeViewUI.o
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
+-		-lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) CubeMain.o CubeView.o CubeViewUI.o \
++		$(LINKFLTK) $(GLDLIBS) -o $@
+ CubeMain.o: CubeViewUI.h CubeView.h
+ CubeView.o: CubeView.h
+ 
+ cube: cube.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) cube.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) cube.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ fractals: fractals.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) fractals.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) fractals.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ fullscreen: fullscreen.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) fullscreen.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) fullscreen.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ glpuzzle: glpuzzle.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) glpuzzle.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) glpuzzle.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ gl_overlay: gl_overlay.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) gl_overlay.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) gl_overlay.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ shiny: shiny.cxx shiny_panel.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) shiny.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) shiny.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ keyboard: keyboard.cxx keyboard_ui.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) keyboard.cxx -lfltk $(LDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) keyboard.cxx $(LINKFLTK) $(LDLIBS) -o $@
+ mandelbrot: mandelbrot.cxx mandelbrot_ui.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) mandelbrot.cxx -lfltk $(LDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) mandelbrot.cxx $(LINKFLTK) $(LDLIBS) -o $@
+ shape: shape.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) shape.cxx -lfltk $(GLDLIBS) -o $@
++	$(CXX) -I.. $(CXXFLAGS) shape.cxx $(LINKFLTK) $(GLDLIBS) -o $@
+ 
+ # If you have libjpeg installed, you might want to try this test program:
+ 
+ jpeg_image: jpeg_image.cxx
+ 	echo Compiling and linking $@...
+-	$(CXX) -I.. -L../lib $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx -lfltk $(LDLIBS) -ljpeg -lXext -o $@
++	$(CXX) -I.. $(CXXFLAGS) -I../../../local/jpeg-6b -L../../../local/jpeg-6b jpeg_image.cxx $(LINKFLTK) $(LDLIBS) -ljpeg -lXext -o $@
+ 
+ depend:
+ 	$(MAKEDEPEND) -I.. $(CXXFLAGS) $(CPPFILES) > makedepend
diff --git a/x11/fltk/pkg/PLIST b/x11/fltk/pkg/PLIST
index 0f170c93381..e4b9662fd9c 100644
--- a/x11/fltk/pkg/PLIST
+++ b/x11/fltk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:11:00 agc Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/05/26 06:37:46 jlam Exp $
 bin/fluid
 include/FL/Enumerations.H
 include/FL/Enumerations.h
@@ -187,11 +187,17 @@ include/FL/win32.H
 include/FL/win32.h
 include/FL/x.H
 include/FL/x.h
+@exec   ln -sf FL %D/include/Fl
+@unexec rm -f %D/include/Fl
 lib/libfltk.a
 lib/libfltk.la
 lib/libfltk.so
-lib/libfltk.so.${FLTK_MAJOR}
-lib/libfltk.so.${FLTK_MAJOR}.${FLTK_MINOR}
+lib/libfltk.so.1
+lib/libfltk.so.1.5
+man/cat1/fluid.0
+man/cat3/fltk.0
+man/man1/fluid.1
+man/man3/fltk.3
 share/doc/html/fltk/FL.gif
 share/doc/html/fltk/Fl_Adjuster.html
 share/doc/html/fltk/Fl_Box.html
@@ -324,7 +330,5 @@ share/doc/html/fltk/text.gif
 share/doc/html/fltk/valuators.gif
 share/doc/html/fltk/value_slider.gif
 share/doc/html/fltk/widgets.html
-@exec	ln -sf FL %D/include/Fl
-@unexec	rm -f %D/include/Fl
 @dirrm share/doc/html/fltk
 @dirrm include/FL