Changes 1.1.5rc1:

        - Documentation updates (STR #186, STR #245, STR #250,
          STR #277, STR #281, STR #328, STR #338)
        - fl_scroll() did not handle scrolling from off-screen on
          WIN32 (STR #315)
        - Fl_File_Chooser did not allow manual entry of a drive
          letter (STR #339)
        - Fl_Menu now uses the boxtype to redraw the menu
          background (STR #204)
        - Fl_Scroll now shows the background image when a framed
          box type is used and the Fl_Scroll is a direct
          decendent of a window (STR #205)
        - Added a new_directory_tooltip string pointer to allow
          localization of the file chooser's new directory
          button (STR #340)
        - Added Fl_Menu_::find_item() method (STR #316)
        - The Fl_Widget copy operator definitions were not
          conditionally compiled properly (STR #329)
        - FLUID's Layout functionality did not move child
          widgets when laying out group widgets (STR #319)
        - FLUID's Layout->Center In Group functionality did not
          properly handle widgets that were children of a
          Fl_Window widget (STR #318)
        - The Fl_Text_Display destructor did not remove the
          predelete callback associated with the current buffer
          (STR #332)
        - Fixed several bugs in the MacOS X Fl::add_fd()
          handling (STR #333, STR #337)

9 files changed, 111 insertions, 115 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 056cd73f49f..6a4acdd0c36 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2004/10/03 00:18:29 tv Exp $
-#
+# $NetBSD: Makefile,v 1.42 2004/10/21 08:29:45 adam Exp $
 
-DISTNAME=	fltk-1.1.5rc1-source
+DISTNAME=	fltk-1.1.5-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	3
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index e2121b8f315..5cfd2e64b86 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.9 2004/05/21 02:16:48 ben Exp $
+$NetBSD: distinfo,v 1.10 2004/10/21 08:29:45 adam Exp $
 
-SHA1 (fltk-1.1.5rc1-source.tar.bz2) = 7b05948314474fe485a29ae49f18d19754608935
-Size (fltk-1.1.5rc1-source.tar.bz2) = 1325042 bytes
-SHA1 (patch-aa) = d75bb3c9772cb7b5920d2a32513cdc0f40694d8f
-SHA1 (patch-ab) = 04323aa95488755351e67c07273063aac18d465b
-SHA1 (patch-ac) = cf4b6038b6b72b11f2d3e67ac6c8c7e7e3407eb3
-SHA1 (patch-ad) = 1a829051be349be77d7d710cdfc96c8164144624
-SHA1 (patch-ae) = e1449b1b69379453c84287efe4c27ccafe1ed78a
-SHA1 (patch-af) = a9577b27ffc3b4c477a473def92adac025a43f45
-SHA1 (patch-ag) = d4a4042897c94d3c83cd0aa9245f074ce9366c1a
-SHA1 (patch-ah) = d1ea67737633097475dc7634484cbfb2c9df098d
-SHA1 (patch-ai) = 3bc18b682fb341e8e465bb8d5be5930776500abc
+SHA1 (fltk-1.1.5-source.tar.bz2) = 0e40826aad348c4a492b6cf4d296c31593024e99
+Size (fltk-1.1.5-source.tar.bz2) = 1891884 bytes
+SHA1 (patch-aa) = 40e6cf468e2af26c27e72747bf9fba0724078081
+SHA1 (patch-ab) = 5d833f246ed6355370d52f53d050bce6265fe4da
+SHA1 (patch-ac) = dd58a97b0071c3b8deb4d2cce50bdd43e823c584
+SHA1 (patch-ad) = 51e2b0747229405ea919f3834ff220e353ac3c26
+SHA1 (patch-ae) = ef52b0c7e74ef9976778733983d6f13870d76ecf
+SHA1 (patch-af) = b3bd0de47e4ff1e48e3cbf70449ccdb09bd006b9
+SHA1 (patch-ag) = 498a59e099803182ac6b119492ad167bd61e957f
diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
index 6c88a7fff95..3308e1f793d 100644
--- a/x11/fltk/patches/patch-aa
+++ b/x11/fltk/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-aa,v 1.6 2004/10/21 08:29:45 adam Exp $
 
---- Makefile.orig	2003-06-14 22:39:12.000000000 -0700
+--- Makefile.orig	2004-10-18 20:22:21.000000000 +0000
 +++ Makefile
 @@ -25,7 +25,7 @@
  
  include makeinclude
  
--DIRS	=	src fluid test documentation
-+DIRS	=	src fluid documentation
+-DIRS	=	$(IMAGEDIRS) src fluid test documentation
++DIRS	=	$(IMAGEDIRS) src fluid documentation
  
  all: makeinclude
  	for dir in $(DIRS); do\
@@ -24,5 +24,5 @@ $NetBSD: patch-aa,v 1.5 2004/02/18 05:07:34 ben Exp $
 +	(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
 +
  install: makeinclude
- 	-mkdir -p $(bindir)
- 	$(RM) $(bindir)/fltk-config
+ 	-mkdir -p $(DESTDIR)$(bindir)
+ 	$(RM) $(DESTDIR)$(bindir)/fltk-config
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index da488207ec6..058b3889d27 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.8 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-ab,v 1.9 2004/10/21 08:29:45 adam Exp $
 
---- configure.in.orig	2003-08-05 15:40:45.000000000 -0700
+--- configure.in.orig	2004-10-18 21:05:27.000000000 +0000
 +++ configure.in
-@@ -92,6 +92,7 @@ AC_SUBST(GLDEMOS)
- AC_SUBST(GLLIBNAME)
+@@ -95,6 +95,7 @@ AC_SUBST(GLLIBNAME)
  AC_SUBST(IMGLIBNAME)
+ AC_SUBST(LIBEXT)
  AC_SUBST(LIBNAME)
 +AC_SUBST(LIBTOOL)
  AC_SUBST(LINKFLTK)
  AC_SUBST(LINKFLTKGL)
  AC_SUBST(LINKFLTKIMG)
-@@ -107,6 +108,15 @@ fi
+@@ -110,6 +111,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]])
@@ -26,7 +26,7 @@ $NetBSD: patch-ab,v 1.8 2004/02/18 05:07:34 ben Exp $
  if test x$enable_shared = xyes; then
      PICFLAG=1
      SHAREDSUFFIX=""
-@@ -206,6 +216,21 @@ else
+@@ -209,6 +219,21 @@ else
      LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
  fi
  
@@ -48,12 +48,12 @@ $NetBSD: patch-ab,v 1.8 2004/02/18 05:07:34 ben Exp $
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOLINK)
  AC_SUBST(DSONAME)
-@@ -668,7 +693,7 @@ if test -n "$GCC"; then
+@@ -726,7 +751,7 @@ if test -n "$GCC"; then
  	    ;;
      esac
  
 -    CXX="$CC"
 +#    CXX="$CC"
  
-     # Show all standard warnings + unused variables when compiling...
-     OPTIM="-Wall -Wunused $OPTIM"
+     # Show all standard warnings + unused variables, conversion errors,
+     # and inlining problems when compiling...
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index 6936b7e736b..735812b323b 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.6 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-ac,v 1.7 2004/10/21 08:29:45 adam Exp $
 
---- configure.orig	2003-09-08 12:18:58.000000000 -0700
+--- configure.orig	2004-10-19 20:01:57.000000000 +0000
 +++ configure
-@@ -838,6 +838,8 @@ Optional Features:
+@@ -855,6 +855,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]
    --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
+   --enable-quartz         use Quartz instead of Quickdraw (default=no)
+   --enable-localjpeg      use local JPEG library, default=auto
+@@ -1377,7 +1379,22 @@ if test "${enable_shared+set}" = set; th
    enableval="$enable_shared"
  
  fi;
@@ -35,7 +35,7 @@ $NetBSD: patch-ac,v 1.6 2004/02/18 05:07:34 ben Exp $
      PICFLAG=1
      SHAREDSUFFIX=""
      FLUID="fluid-shared"
-@@ -1395,6 +1412,20 @@ else
+@@ -1478,6 +1495,20 @@ else
      LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
  fi
  
@@ -56,18 +56,18 @@ $NetBSD: patch-ac,v 1.6 2004/02/18 05:07:34 ben Exp $
  
  
  
-@@ -8919,7 +8950,7 @@ echo "${ECHO_T}yes" >&6
+@@ -9204,7 +9235,7 @@ echo "${ECHO_T}yes" >&6
  	    ;;
      esac
  
 -    CXX="$CC"
 +#    CXX="$CC"
  
-     # 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
+     # Show all standard warnings + unused variables, conversion errors,
+     # and inlining problems when compiling...
+@@ -10094,6 +10125,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
  s,@IMGLIBNAME@,$IMGLIBNAME,;t t
+ s,@LIBEXT@,$LIBEXT,;t t
  s,@LIBNAME@,$LIBNAME,;t t
 +s,@LIBTOOL@,$LIBTOOL,;t t
  s,@LINKFLTK@,$LINKFLTK,;t t
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
index 8e6fc73c447..4cf38da6fc8 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,36 +1,36 @@
-$NetBSD: patch-ad,v 1.6 2004/05/21 02:16:48 ben Exp $
+$NetBSD: patch-ad,v 1.7 2004/10/21 08:29:45 adam Exp $
 
---- documentation/Makefile.orig	Sat Apr 10 21:38:55 2004
+--- documentation/Makefile.orig	2004-10-18 20:22:22.000000000 +0000
 +++ documentation/Makefile
 @@ -227,24 +227,24 @@ docdir = $(datadir)/doc/fltk
  install: $(MANPAGES)
- 	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)/*
- 	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)
--	$(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) $(mandir)/man1
--	$(CP) fluid.man $(mandir)/man1/fluid.1
-+	$(INSTALL_MAN) fluid.man $(mandir)/man1/fluid.1
- 	$(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
+ 	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
+ 	-$(MKDIR) $(DESTDIR)$(docdir)
+-	$(CP) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(HTMLFILES) *.gif *.jpg index.html $(DESTDIR)$(docdir)
+ 	$(CHMOD) 644 $(DESTDIR)$(docdir)/*
+ 	echo "Installing man pages in $(DESTDIR)$(mandir)..."
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
+-	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
++	$(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+-	$(CP) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
++	$(INSTALL_MAN) fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/cat3
+-	$(CP) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
++	$(INSTALL_MAN) fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/man1
+-	$(CP) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
++	$(INSTALL_MAN) fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fluid.1
+-	$(CP) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
++	$(INSTALL_MAN) fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/man1/fltk-config.1
+ 	-$(MKDIR) $(DESTDIR)$(mandir)/man3
+-	$(CP) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
++	$(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+ 	$(CHMOD) 644 $(DESTDIR)$(mandir)/man3/fltk.3
  
  
diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae
index 30a1bd33f80..95098c088fb 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-ae,v 1.4 2004/10/21 08:29:45 adam Exp $
 
---- fluid/Makefile.orig	2003-08-02 14:17:30.000000000 -0700
+--- fluid/Makefile.orig	2004-10-18 20:22:22.000000000 +0000
 +++ fluid/Makefile
 @@ -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)
+ 	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
+ 	-$(MKDIR) $(DESTDIR)$(bindir)
+-	$(CP) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
++	$(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 	$(STRIP) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 	$(DESTDIR)$(bindir)/fltk-config --post $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+ 	$(CHMOD) 755 $(DESTDIR)$(bindir)/fluid$(EXEEXT)
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index d89e6da50e8..d0244bb801c 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.5 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $
 
---- makeinclude.in.orig	2003-01-30 13:38:24.000000000 -0800
+--- makeinclude.in.orig	2004-10-18 20:22:21.000000000 +0000
 +++ makeinclude.in
-@@ -47,8 +47,8 @@ SHELL		= /bin/sh
+@@ -46,8 +46,8 @@ SHELL		= /bin/sh
  STRIP		= strip
  
  # compiler names:
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.5 2004/02/18 05:07:34 ben Exp $
  MAKEDEPEND	= @MAKEDEPEND@
  
  # flags for C++ compiler:
-@@ -58,6 +58,7 @@ CXXFLAGS	= $(OPTIM) @CXXFLAGS@
+@@ -57,6 +57,7 @@ CXXFLAGS	= $(OPTIM) @CPPFLAGS@ @CXXFLAGS
  
  # program to make the archive:
  LIBNAME		= @LIBNAME@
@@ -31,9 +31,9 @@ $NetBSD: patch-af,v 1.5 2004/02/18 05:07:34 ben Exp $
  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@
+@@ -82,6 +84,12 @@ IMAGELIBS	= @IMAGELIBS@
+ # image libraries to build...
+ IMAGEDIRS	= @JPEG@ @ZLIB@ @PNG@
  
 +# installation programs:
 +INSTALL_BIN	=$(LIBTOOL) cp
diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag
index 2c9e0aa7fb8..ca93a6d8b1b 100644
--- a/x11/fltk/patches/patch-ag
+++ b/x11/fltk/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
 
---- src/Makefile.orig	2003-08-24 06:09:06.000000000 -0700
+--- src/Makefile.orig	2004-10-18 20:22:25.000000000 +0000
 +++ src/Makefile
-@@ -198,6 +198,10 @@ $(LIBNAME): $(OBJECTS)
+@@ -199,6 +199,10 @@ $(LIBNAME): $(OBJECTS)
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
  libfltk.so.1.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(OBJECTS)
-@@ -234,6 +238,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -235,6 +239,10 @@ $(FLLIBNAME): $(FLOBJECTS)
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
  libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-@@ -270,6 +278,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -271,6 +279,10 @@ $(GLLIBNAME): $(GLOBJECTS)
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
  libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-@@ -306,6 +318,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -307,6 +319,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
@@ -46,43 +46,43 @@ $NetBSD: patch-ag,v 1.3 2004/02/18 05:07:34 ben Exp $
  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); \
+@@ -429,6 +445,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
  	fi
- 	$(RANLIB) $(libdir)/$(IMGLIBNAME)
+ 	$(RANLIB) $(DESTDIR)$(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; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
+ 		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
+@@ -452,6 +471,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(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; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.so*;\
+ 		$(CP) libfltk_forms.so.1.1 $(DESTDIR)$(libdir); \
+@@ -475,6 +497,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_forms_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(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; \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_gl.so*;\
+ 		$(CP) libfltk_gl.so.1.1 $(DESTDIR)$(libdir); \
+@@ -498,6 +523,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_gl_s.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(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); \
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_images.so*;\
+ 		$(CP) libfltk_images.so.1.1 $(DESTDIR)$(libdir); \