Update from FLTK 1.0.11 to FLTK 1.1.4.

9 files changed, 296 insertions, 328 deletions

diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
index 82d599b7bfc..6c88a7fff95 100644
--- a/x11/fltk/patches/patch-aa
+++ b/x11/fltk/patches/patch-aa
@@ -1,21 +1,20 @@
-$NetBSD: patch-aa,v 1.4 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2004/02/18 05:07:34 ben Exp $
 
---- Makefile.orig	Wed Mar 14 12:20:01 2001
+--- Makefile.orig	2003-06-14 22:39:12.000000000 -0700
 +++ Makefile
 @@ -25,7 +25,7 @@
  
- SHELL=/bin/sh
+ include makeinclude
  
--DIRS	=	src fluid test
-+DIRS	=	src fluid
+-DIRS	=	src fluid test documentation
++DIRS	=	src fluid documentation
  
  all: makeinclude
- 	@for dir in $(DIRS); do\
-@@ -35,6 +35,14 @@
- 		fi;\
+ 	for dir in $(DIRS); do\
+@@ -33,6 +33,14 @@ all: makeinclude
  		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
  	done
-+
+ 
 +test: makeinclude
 +	dir=test;\
 +	echo "=== making $$dir ===";\
@@ -23,6 +22,7 @@ $NetBSD: patch-aa,v 1.4 2001/05/26 06:37:46 jlam Exp $
 +		touch $$dir/makedepend;\
 +	fi;\
 +	(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
- 
++
  install: makeinclude
- 	@for dir in $(DIRS); do\
+ 	-mkdir -p $(bindir)
+ 	$(RM) $(bindir)/fltk-config
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index 5e8a22b3377..da488207ec6 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,24 +1,19 @@
-$NetBSD: patch-ab,v 1.7 2003/12/01 16:35:51 ben Exp $
+$NetBSD: patch-ab,v 1.8 2004/02/18 05:07:34 ben Exp $
 
---- configure.in.orig	2001-05-07 07:34:22.000000000 -0700
+--- configure.in.orig	2003-08-05 15:40:45.000000000 -0700
 +++ configure.in
-@@ -30,6 +30,9 @@ AC_INIT(src/Fl.cxx)
- AC_PROG_RANLIB
- 
- 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 @@ AC_ARG_ENABLE(debug, [  --enable-debug  
-   DEBUGFLAG="-g "
- fi])
+@@ -92,6 +92,7 @@ AC_SUBST(GLDEMOS)
+ AC_SUBST(GLLIBNAME)
+ AC_SUBST(IMGLIBNAME)
+ AC_SUBST(LIBNAME)
++AC_SUBST(LIBTOOL)
+ AC_SUBST(LINKFLTK)
+ AC_SUBST(LINKFLTKGL)
+ AC_SUBST(LINKFLTKIMG)
+@@ -107,6 +108,15 @@ 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(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
@@ -28,44 +23,37 @@ $NetBSD: patch-ab,v 1.7 2003/12/01 16:35:51 ben Exp $
 +    LIBTOOL=""
 +fi])
 +
-+if test "$enable_shared" = "yes"; then
-   PICFLAG=1
-   case $uname in
-       SunOS* | UNIX_S*)
-@@ -95,7 +107,14 @@ if eval "test x$enable_shared = xyes"; t
-           DSOCOMMAND="\$(CXX) -Wl,-soname,libfltk.so.1 \$(LDLIBS) -shared $DEBUGFLAG -o"
- 	  ;;
-   esac
--fi])
-+fi
-+
+ if test x$enable_shared = xyes; then
+     PICFLAG=1
+     SHAREDSUFFIX=""
+@@ -206,6 +216,21 @@ else
+     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
+ fi
+ 
 +if test "x$LIBTOOL" != "x"; then
-+    LIBNAME="libfltk.la"
-+    LIBRARY="\$(LIBNAME)"
-+    LIBFLTK="../src/\$(LIBNAME)"
-+    LINKFLTK="../src/\$(LIBNAME)"
++    LINKFLTK="../src/libfltk.la"
++    if test "x$LINKFLTKGL" != "x"; then    
++        LINKFLTKGL="../src/libfltk_gl.la"    
++    fi    
++    if test "x$LINKFLTKIMG" != "x"; then    
++        LINKFLTKIMG="../src/libfltk_images.la"    
++    fi
++    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++    DSONAME="libfltk.la"
++    FLDSONAME="libfltk_forms.la"
++    GLDSONAME="libfltk_gl.la"
++    IMGDSONAME="libfltk_images.la"
 +fi
++
+ AC_SUBST(DSOCOMMAND)
+ AC_SUBST(DSOLINK)
+ AC_SUBST(DSONAME)
+@@ -668,7 +693,7 @@ if test -n "$GCC"; then
+ 	    ;;
+     esac
  
- AC_PROG_CC
- AC_PROG_CXX
-@@ -262,7 +281,7 @@ MAKEDEPEND="\$(CXX) -M"
- if test -n "$GXX"; then
-     # Use gcc instead of c++ or g++, since we don't need the C++
-     # library to depend on...
 -    CXX="$CC"
 +#    CXX="$CC"
-     CFLAGS="-Wall $CFLAGS"
-     CXXFLAGS="-Wall $CXXFLAGS"
-     if test -z "$DEBUGFLAG"; then
-@@ -375,7 +394,11 @@ CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
- 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)
+ 
+     # Show all standard warnings + unused variables when compiling...
+     OPTIM="-Wall -Wunused $OPTIM"
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 366f63df832..6936b7e736b 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,40 +1,27 @@
-$NetBSD: patch-ac,v 1.5 2003/12/01 16:35:51 ben Exp $
+$NetBSD: patch-ac,v 1.6 2004/02/18 05:07:34 ben Exp $
 
---- configure.orig	2001-05-07 07:53:14.000000000 -0700
+--- configure.orig	2003-09-08 12:18:58.000000000 -0700
 +++ configure
-@@ -18,6 +18,9 @@ ac_help="$ac_help
- ac_help="$ac_help
-   --enable-shared         turn on shared libraries [default=no]"
- ac_help="$ac_help
+@@ -838,6 +838,8 @@ Optional Features:
+   --enable-debug          turn on debugging default=no
+   --enable-gl             turn on OpenGL support default=yes
+   --enable-shared         turn on shared libraries default=no
 +  --enable-libtool=LIBTOOL_PATH
-+                          turn on building with libtool [default=no]"
-+ac_help="$ac_help
-   --with-x                use the X Window System"
- 
- # Initialize some variables set by options.
-@@ -562,6 +565,9 @@ fi
- 
- 
- 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 @@ fi
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
++                          turn on building with libtool [default=no]
+   --enable-threads        enable multi-threading support
+   --enable-xft            turn on Xft support default=no
+   --enable-xdbe           turn on Xdbe support default=no
+@@ -1294,7 +1296,22 @@ if test "${enable_shared+set}" = set; th
    enableval="$enable_shared"
-+  :
-+fi
+ 
+ fi;
+-if test x$enable_shared = xyes; then
 +
 +# 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
++
++if test x$enable_libtool != xno; then
 +    LIBTOOL="$enable_libtool"
 +    enable_shared=no
 +else
@@ -44,53 +31,45 @@ $NetBSD: patch-ac,v 1.5 2003/12/01 16:35:51 ben Exp $
 +
 +
 +if test "$enable_shared" = "yes"; then
-   PICFLAG=1
-   case $uname in
-       SunOS* | UNIX_S*)
-@@ -638,8 +659,13 @@ if eval "test x$enable_shared = xyes"; t
- 	  ;;
-   esac
++
+     PICFLAG=1
+     SHAREDSUFFIX=""
+     FLUID="fluid-shared"
+@@ -1395,6 +1412,20 @@ else
+     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
  fi
--fi
  
 +if test "x$LIBTOOL" != "x"; then
-+    LIBNAME="libfltk.la"
-+    LIBRARY="\$(LIBNAME)"
-+    LIBFLTK="../src/\$(LIBNAME)"
-+    LINKFLTK="../src/\$(LIBNAME)"
++    LINKFLTK="../src/libfltk.la"
++    if test "x$LINKFLTKGL" != "x"; then
++        LINKFLTKGL="../src/libfltk_gl.la"
++    fi
++    if test "x$LINKFLTKIMG" != "x"; then
++        LINKFLTKIMG="../src/libfltk_images.la"
++    fi
++    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
++    DSONAME="libfltk.la"
++    FLDSONAME="libfltk_forms.la"
++    GLDSONAME="libfltk_gl.la"
++    IMGDSONAME="libfltk_images.la"
 +fi
  
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
-@@ -3072,7 +3098,7 @@ MAKEDEPEND="\$(CXX) -M"
- if test -n "$GXX"; then
-     # Use gcc instead of c++ or g++, since we don't need the C++
-     # library to depend on...
--    CXX="$CC"
-+#    CXX="$CC"
-     CFLAGS="-Wall $CFLAGS"
-     CXXFLAGS="-Wall $CXXFLAGS"
-     if test -z "$DEBUGFLAG"; then
-@@ -3220,6 +3246,10 @@ CXXFLAGS="$DEBUGFLAG $CXXFLAGS"
  
  
+@@ -8919,7 +8950,7 @@ echo "${ECHO_T}yes" >&6
+ 	    ;;
+     esac
  
-+
-+
-+
-+
- trap '' 1 2 15
- cat > confcache <<\EOF
- # This file is a shell script that caches the results of configure
-@@ -3369,7 +3399,11 @@ s%@CAT3EXT@%$CAT3EXT%g
- 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
+-    CXX="$CC"
++#    CXX="$CC"
  
- CEOF
+     # Show all standard warnings + unused variables when compiling...
+     OPTIM="-Wall -Wunused $OPTIM"
+@@ -9753,6 +9784,7 @@ s,@GLDEMOS@,$GLDEMOS,;t t
+ s,@GLLIBNAME@,$GLLIBNAME,;t t
+ s,@IMGLIBNAME@,$IMGLIBNAME,;t t
+ s,@LIBNAME@,$LIBNAME,;t t
++s,@LIBTOOL@,$LIBTOOL,;t t
+ s,@LINKFLTK@,$LINKFLTK,;t t
+ s,@LINKFLTKGL@,$LINKFLTKGL,;t t
+ s,@LINKFLTKIMG@,$LINKFLTKIMG,;t t
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
index ceec98ca0b4..42654805c5c 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-ad,v 1.5 2004/02/18 05:07:34 ben Exp $
 
---- documentation/Makefile.orig	Mon Feb 12 10:12:14 2001
+--- documentation/Makefile.orig	2003-09-08 10:11:44.000000000 -0700
 +++ documentation/Makefile
-@@ -129,23 +129,23 @@
+@@ -222,29 +222,29 @@ depend:
  # 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?
@@ -10,25 +10,33 @@ $NetBSD: patch-ad,v 1.4 2001/05/26 06:37:46 jlam Exp $
 +docdir = $(datadir)/doc/html/fltk
  
  install: $(MANPAGES)
- 	-mkdir -p $(docdir)
--	cp $(HTMLFILES) *.gif *.jpg index.html $(docdir)
+ 	echo "Installing documentation files in $(docdir)..."
+ 	-$(MKDIR) $(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
+ 	$(CHMOD) 644 $(docdir)/*
+ 	echo "Installing man pages in $(mandir)..."
+ 	-$(MKDIR) $(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
+ 	$(CHMOD) 644 $(mandir)/cat1/fluid.$(CAT1EXT)
+-	$(CP) fltk-config.$(CAT1EXT) $(mandir)/cat1
++	$(INSTALL_MAN) fltk-config.$(CAT1EXT) $(mandir)/cat1
+ 	$(CHMOD) 644 $(mandir)/cat1/fltk-config.$(CAT1EXT)
+ 	-$(MKDIR) $(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
+ 	$(CHMOD) 644 $(mandir)/cat3/fltk.$(CAT3EXT)
+ 	-$(MKDIR) $(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
+ 	$(CHMOD) 644 $(mandir)/man1/fluid.1
+-	$(CP) fltk-config.man $(mandir)/man1/fltk-config.1
++	$(INSTALL_MAN) fltk-config.man $(mandir)/man1/fltk-config.1
+ 	$(CHMOD) 644 $(mandir)/man1/fltk-config.1
+ 	-$(MKDIR) $(mandir)/man3
+-	$(CP) fltk.man $(mandir)/man3/fltk.3
 +	$(INSTALL_MAN) fltk.man $(mandir)/man3/fltk.3
- 	chmod 644 $(mandir)/man3/fltk.3
+ 	$(CHMOD) 644 $(mandir)/man3/fltk.3
+ 
  
- # 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 4697820eebb..30a1bd33f80 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -1,28 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2004/02/18 05:07:34 ben Exp $
 
---- fluid/Makefile.orig	Mon Jan 22 10:13:38 2001
+--- fluid/Makefile.orig	2003-08-02 14:17:30.000000000 -0700
 +++ fluid/Makefile
-@@ -49,9 +49,9 @@
- 
- include ../makeinclude
- 
--$(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:
+@@ -75,7 +75,7 @@ include makedepend
+ install: all
+ 	echo "Installing FLUID in $(bindir)..."
+ 	-$(MKDIR) $(bindir)
+-	$(CP) $(FLUID) $(bindir)/fluid$(EXEEXT)
++	$(INSTALL_BIN) $(FLUID) $(bindir)/fluid$(EXEEXT)
+ 	$(STRIP) $(bindir)/fluid$(EXEEXT)
+ 	$(bindir)/fltk-config --post $(bindir)/fluid$(EXEEXT)
+ 	$(CHMOD) 755 $(bindir)/fluid$(EXEEXT)
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index 122f66f0ca6..d89e6da50e8 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,36 +1,39 @@
-$NetBSD: patch-af,v 1.4 2003/12/01 16:35:51 ben Exp $
+$NetBSD: patch-af,v 1.5 2004/02/18 05:07:34 ben Exp $
 
---- makeinclude.in.orig	Sat Apr 14 07:11:43 2001
+--- makeinclude.in.orig	2003-01-30 13:38:24.000000000 -0800
 +++ makeinclude.in
-@@ -39,8 +39,8 @@
- NROFF		=@NROFF@
+@@ -47,8 +47,8 @@ SHELL		= /bin/sh
+ STRIP		= strip
  
  # compiler names:
--CXX		=@CXX@
--CC		=@CC@
-+CXX		=$(LIBTOOL) @CXX@
-+CC		=$(LIBTOOL) @CC@
- MAKEDEPEND	=@MAKEDEPEND@
+-CXX		= @CXX@
+-CC		= @CC@
++CXX		= $(LIBTOOL) @CXX@
++CC		= $(LIBTOOL) @CC@
+ MAKEDEPEND	= @MAKEDEPEND@
  
  # flags for C++ compiler:
-@@ -49,15 +49,26 @@
+@@ -58,6 +58,7 @@ CXXFLAGS	= $(OPTIM) @CXXFLAGS@
  
  # program to make the archive:
- LIBNAME		=@LIBNAME@
-+LIBRARY		=@LIBRARY@
-+LIBFLTK		=@LIBFLTK@
-+LINKFLTK	=@LINKFLTK@
- LIBCOMMAND	=@LIBCOMMAND@
-+LIBTOOL		=@LIBTOOL@
- RANLIB		=@RANLIB@
- DSONAME		=@DSONAME@
- DSOCOMMAND	=@DSOCOMMAND@
+ LIBNAME		= @LIBNAME@
++LIBTOOL		= @LIBTOOL@
+ FLLIBNAME	= @FLLIBNAME@
+ GLLIBNAME	= @GLLIBNAME@
+ IMGLIBNAME	= @IMGLIBNAME@
+@@ -70,7 +71,8 @@ IMGDSONAME	= @IMGDSONAME@
+ 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
+-LDLIBS		= @LDFLAGS@ @LIBS@
++#LDLIBS		= @LDFLAGS@ @LIBS@
++LDLIBS		= $(GLDLIBS)
+ GLDLIBS		= @LDFLAGS@ @GLLIB@ @LIBS@
+ LINKFLTK	= -L../lib @LINKFLTK@
+ LINKFLTKGL	= -L../lib @LINKFLTKGL@
+@@ -79,6 +81,12 @@ LINKFLTKIMG	= -L../lib -lfltk_images @LI
+ LINKSHARED	= @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
+ IMAGELIBS	= @IMAGELIBS@
  
 +# installation programs:
 +INSTALL_BIN	=$(LIBTOOL) cp
@@ -38,15 +41,6 @@ $NetBSD: patch-af,v 1.4 2003/12/01 16:35:51 ben Exp $
 +INSTALL_LIB	=$(LIBTOOL) cp
 +INSTALL_MAN	=cp
 +
- # Man page extensions...
- CAT1EXT		=@CAT1EXT@
- CAT3EXT		=@CAT3EXT@
-@@ -70,7 +81,7 @@
+ # The extension to use for executables...
+ EXEEXT		= @EXEEXT@
  
- .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
index 38919f44fed..2c9e0aa7fb8 100644
--- a/x11/fltk/patches/patch-ag
+++ b/x11/fltk/patches/patch-ag
@@ -1,57 +1,88 @@
-$NetBSD: patch-ag,v 1.2 2002/11/25 18:58:37 jlam Exp $
+$NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
 
---- src/Makefile.orig	Mon Jan 22 07:13:40 2001
+--- src/Makefile.orig	2003-08-24 06:09:06.000000000 -0700
 +++ src/Makefile
-@@ -148,17 +148,18 @@ CLEAN =
- 
- include ../makeinclude
- 
--LIBRARY = ../lib/$(LIBNAME)
--
- OBJECTS = $(CPPFILES:.cxx=.o) $(CFILES:.c=.o)
- 
- all:	$(LIBRARY) $(DSONAME)
- 
--$(LIBRARY): $(OBJECTS)
-+../lib/libfltk.a: $(OBJECTS)
- 	echo $(LIBCOMMAND) $@ ...
+@@ -198,6 +198,10 @@ $(LIBNAME): $(OBJECTS)
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
 +libfltk.la: $(OBJECTS)
-+	$(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:5 $(LDLIBS)
++	echo $(CXX) $@ ...
++	$(CXX) -o $@ $(OBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG
 +
- libfltk.so.1 libfltk.sl.1: $(OBJECTS)
+ libfltk.so.1.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(OBJECTS)
-@@ -174,11 +175,13 @@ include makedepend
+@@ -234,6 +238,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+ 	$(LIBCOMMAND) $@ $(FLOBJECTS)
+ 	$(RANLIB) $@
  
- ################################################################
++libfltk_forms.la: $(FLOBJECTS)
++	echo $(CXX) $@ ...
++	$(CXX) -o $@ $(FLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG
++
+ libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
+@@ -270,6 +278,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+ 	$(LIBCOMMAND) $@ $(GLOBJECTS)
+ 	$(RANLIB) $@
  
--install: $(LIBRARY) $(DSONAME)
-+install: install-lib install-includes
++libfltk_gl.la: $(GLOBJECTS)
++	echo $(CXX) $@ ...
++	$(CXX) -o $@ $(GLOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG
 +
-+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 @@ install: $(LIBRARY) $(DSONAME)
- 		chmod 755 $(libdir)/libfltk.sl.1; \
- 		ln -s libfltk.sl.1 $(libdir)/libfltk.sl;\
- 	fi
+ libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
+@@ -306,6 +318,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+ 	$(LIBCOMMAND) $@ $(IMGOBJECTS)
+ 	$(RANLIB) $@
+ 
++libfltk_images.la: $(IMGOBJECTS)
++	echo $(CXX) $@ ...
++	$(CXX) -o $@ $(IMGOBJECTS:.o=.lo) -rpath $(prefix)/lib -version-info 1:6 $(LDLIBS) $DEBUGFLAG
 +
-+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;\
+ libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
+ 	echo $(DSOCOMMAND) $@ ...
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
+@@ -428,6 +444,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RANLIB) $(libdir)/$(GLLIBNAME); \
+ 	fi
+ 	$(RANLIB) $(libdir)/$(IMGLIBNAME)
++	if test x$(DSONAME) = xlibfltk.la; then\
++		$(INSTALL_LIB) libfltk.la $(libdir); \
++	fi
+ 	if test x$(DSONAME) = xlibfltk.so.1.1; then\
+ 		$(RM) $(libdir)/libfltk.so*;\
+ 		$(CP) libfltk.so.1.1 $(libdir); \
+@@ -451,6 +470,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_s.a; \
+ 	fi
++	if test x$(FLDSONAME) = xlibfltk_forms.la; then\
++		$(INSTALL_LIB) libfltk_forms.la $(libdir); \
++	fi
+ 	if test x$(FLDSONAME) = xlibfltk_forms.so.1.1; then\
+ 		$(RM) $(libdir)/libfltk_forms.so*;\
+ 		$(CP) libfltk_forms.so.1.1 $(libdir); \
+@@ -474,6 +496,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_forms_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_forms.a; \
+ 	fi
++	if test x$(GLDSONAME) = xlibfltk_gl.la; then\
++		$(INSTALL_LIB) libfltk_gl.la $(libdir); \
++	fi
+ 	if test x$(GLDSONAME) = xlibfltk_gl.so.1.1; then\
+ 		$(RM) $(libdir)/libfltk_gl.so*;\
+ 		$(CP) libfltk_gl.so.1.1 $(libdir); \
+@@ -497,6 +522,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_gl_s.a $(libdir); \
+ 		$(CHMOD) 755 $(libdir)/libfltk_gl.a; \
+ 	fi
++	if test x$(IMGDSONAME) = xlibfltk_images.la; then\
++		$(INSTALL_LIB) libfltk_images.la $(libdir); \
++	fi
+ 	if test x$(IMGDSONAME) = xlibfltk_images.so.1.1; then\
+ 		$(RM) $(libdir)/libfltk_images.so*;\
+ 		$(CP) libfltk_images.so.1.1 $(libdir); \
diff --git a/x11/fltk/patches/patch-ah b/x11/fltk/patches/patch-ah
index 4f25d50b627..06c23bee138 100644
--- a/x11/fltk/patches/patch-ah
+++ b/x11/fltk/patches/patch-ah
@@ -1,71 +1,32 @@
-$NetBSD: patch-ah,v 1.1 2001/05/26 06:37:46 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2004/02/18 05:07:34 ben 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
+--- src/Fl_Text_Buffer.cxx.orig	2003-05-28 09:09:12.000000000 -0700
++++ src/Fl_Text_Buffer.cxx
+@@ -935,7 +935,8 @@ int Fl_Text_Buffer::expand_character( ch
+   /* Convert control codes to readable character sequences */
+   /*... is this safe with international character sets? */
+   if ( ( ( unsigned char ) c ) <= 31 ) {
+-    sprintf( outStr, "<%s>", ControlCodeTable[ c ] );
++    i = c;
++    sprintf( outStr, "<%s>", ControlCodeTable[ i ] );
+     return strlen( outStr );
+   } else if ( c == 127 ) {
+     sprintf( outStr, "<del>" );
+@@ -958,12 +959,14 @@ int Fl_Text_Buffer::expand_character( ch
+ ** to ignore).
+ */
+ int Fl_Text_Buffer::character_width( char c, int indent, int tabDist, char nullSubsChar ) {
++  int i;
+   /* Note, this code must parallel that in Fl_Text_Buffer::ExpandCharacter */
+   if ( c == '\t' )
+     return tabDist - ( indent % tabDist );
+-  else if ( ( ( unsigned char ) c ) <= 31 )
+-    return strlen( ControlCodeTable[ c ] ) + 2;
+-  else if ( c == 127 )
++  else if ( ( ( unsigned char ) c ) <= 31 ) {
++    i = c;
++    return strlen( ControlCodeTable[ i ] ) + 2;
++  } else if ( c == 127 )
+     return 5;
+   else if ( c == nullSubsChar )
+     return 5;
diff --git a/x11/fltk/patches/patch-ai b/x11/fltk/patches/patch-ai
new file mode 100644
index 00000000000..6512085c051
--- /dev/null
+++ b/x11/fltk/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2004/02/18 05:07:34 ben Exp $
+
+--- src/fl_draw_pixmap.cxx.orig	2003-01-30 13:43:43.000000000 -0800
++++ src/fl_draw_pixmap.cxx
+@@ -147,14 +147,15 @@ int fl_draw_pixmap(const char*const* di,
+     // if first color is ' ' it is transparent (put it later to make
+     // it not be transparent):
+     if (*p == ' ') {
+-      uchar* c = (uchar*)&d.colors[' '];
++      uchar* c;
++      transparent_index = ' ';
++      c = (uchar*)&d.colors[transparent_index];
+ #ifdef U64
+       *(U64*)c = 0;
+ #  if WORDS_BIGENDIAN
+       c += 4;
+ #  endif
+ #endif
+-      transparent_index = ' ';
+       Fl::get_color(bg, c[0], c[1], c[2]); c[3] = 0;
+       p += 4;
+       ncolors--;