From d5fb1f092f5c0fcff1a54c981dc17450c48f0a48 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sun, 22 Jan 2006 11:11:34 +0000
Subject: Update to 1.1.7, ok jlam@: FLTK 1.1.7 fixes many bugs, adds some new
 example programs, and adds many new improvements to the FLUID software
 including multi-level undo, syntax highlighting in all code fields, widget
 alignment and sizing guides, dialog templates, widget subclasses, and
 printing and testing of user interfaces within FLUID.

---
 x11/fltk/Makefile         | 14 +++++++-------
 x11/fltk/PLIST            |  9 ++++++++-
 x11/fltk/distinfo         | 22 +++++++++++-----------
 x11/fltk/patches/patch-aa |  8 ++++----
 x11/fltk/patches/patch-ab | 41 +++++++++++++++++++----------------------
 x11/fltk/patches/patch-ac | 35 ++++++++++++++++-------------------
 x11/fltk/patches/patch-ad | 14 +++++++-------
 x11/fltk/patches/patch-ae |  6 +++---
 x11/fltk/patches/patch-af | 36 +++++++++++++++++++++++++++---------
 x11/fltk/patches/patch-ag | 42 +++++++++++++++++++++---------------------
 10 files changed, 123 insertions(+), 104 deletions(-)

(limited to 'x11/fltk')

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index d838afe6740..c8fe9563a46 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.53 2005/12/17 05:20:24 jlam Exp $
+# $NetBSD: Makefile,v 1.54 2006/01/22 11:11:34 wiz Exp $
 
-DISTNAME=	fltk-1.1.6-source
+DISTNAME=	fltk-1.1.7-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
-		ftp://ftp.fltk.org/pub/fltk/${VERS}/ \
 		ftp://ftp2.easysw.com/pub/fltk/${VERS}/ \
-		ftp://ftp.northamerica.net/pub/ESP/fltk/${VERS}/ \
-		ftp://ftp.funet.fi/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
-		ftp://ftp.kddlabs.co.jp/pub/lang/fltk/${VERS}/
+		ftp://ftp3.easysw.com/pub/fltk/${VERS}/ \
+		http://ftp.easysw.com/pub/fltk/${VERS}/ \
+		http://mirror.nu6.org/ftp.easysw.com/pub/fltk/${VERS}/ \
+		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
+		ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jlam@pkgsrc.org
diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST
index 0905915fa5c..6012c6e5936 100644
--- a/x11/fltk/PLIST
+++ b/x11/fltk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/08/24 19:48:18 kristerw Exp $
+@comment $NetBSD: PLIST,v 1.9 2006/01/22 11:11:34 wiz Exp $
 bin/fltk-config
 bin/fluid
 include/FL/Enumerations.H
@@ -85,6 +85,8 @@ include/FL/Fl_Input.H
 include/FL/Fl_Input.h
 include/FL/Fl_Input_.H
 include/FL/Fl_Input_.h
+include/FL/Fl_Input_Choice.H
+include/FL/Fl_Input_Choice.h
 include/FL/Fl_Int_Input.H
 include/FL/Fl_Int_Input.h
 include/FL/Fl_JPEG_Image.H
@@ -167,6 +169,8 @@ include/FL/Fl_Single_Window.H
 include/FL/Fl_Single_Window.h
 include/FL/Fl_Slider.H
 include/FL/Fl_Slider.h
+include/FL/Fl_Spinner.H
+include/FL/Fl_Spinner.h
 include/FL/Fl_Sys_Menu_Bar.H
 include/FL/Fl_Sys_Menu_Bar.h
 include/FL/Fl_Tabs.H
@@ -289,6 +293,7 @@ share/doc/fltk/Fl_Hold_Browser.html
 share/doc/fltk/Fl_Image.html
 share/doc/fltk/Fl_Input.html
 share/doc/fltk/Fl_Input_.html
+share/doc/fltk/Fl_Input_Choice.html
 share/doc/fltk/Fl_Int_Input.html
 share/doc/fltk/Fl_JPEG_Image.html
 share/doc/fltk/Fl_Light_Button.gif
@@ -326,6 +331,7 @@ share/doc/fltk/Fl_Select_Browser.html
 share/doc/fltk/Fl_Shared_Image.html
 share/doc/fltk/Fl_Single_Window.html
 share/doc/fltk/Fl_Slider.html
+share/doc/fltk/Fl_Spinner.html
 share/doc/fltk/Fl_Tabs.html
 share/doc/fltk/Fl_Text_Buffer.html
 share/doc/fltk/Fl_Text_Display.html
@@ -390,6 +396,7 @@ share/doc/fltk/functions.html
 share/doc/fltk/glut.html
 share/doc/fltk/hello.C.gif
 share/doc/fltk/index.html
+share/doc/fltk/input_choice.jpg
 share/doc/fltk/intro.html
 share/doc/fltk/license.html
 share/doc/fltk/menu.gif
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 067324fad38..0c9dc857397 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.13 2005/03/19 15:26:18 ben Exp $
+$NetBSD: distinfo,v 1.14 2006/01/22 11:11:34 wiz Exp $
 
-SHA1 (fltk-1.1.6-source.tar.bz2) = 769bc18ec5dcd771221c13760b9fc0618b0712d2
-RMD160 (fltk-1.1.6-source.tar.bz2) = 5e2e69f6416a94ff9e372ba896872cc18ea1a936
-Size (fltk-1.1.6-source.tar.bz2) = 1898966 bytes
-SHA1 (patch-aa) = 40e6cf468e2af26c27e72747bf9fba0724078081
-SHA1 (patch-ab) = a0a9762dff3cb4d51b0e3dc446fffa53031a3a0b
-SHA1 (patch-ac) = 92c7b445a630aec5df4760d46b32201adf5472cc
-SHA1 (patch-ad) = 51e2b0747229405ea919f3834ff220e353ac3c26
-SHA1 (patch-ae) = ef52b0c7e74ef9976778733983d6f13870d76ecf
-SHA1 (patch-af) = b3bd0de47e4ff1e48e3cbf70449ccdb09bd006b9
-SHA1 (patch-ag) = 498a59e099803182ac6b119492ad167bd61e957f
+SHA1 (fltk-1.1.7-source.tar.bz2) = 16b174522920403af1e4ccddd36daaefda3765c8
+RMD160 (fltk-1.1.7-source.tar.bz2) = a539a1c6bb3363e54bc82c7995037c5d8ede9dd7
+Size (fltk-1.1.7-source.tar.bz2) = 2060757 bytes
+SHA1 (patch-aa) = 5fea7f520c1b51f0d1f10d863c30f3ed18406db6
+SHA1 (patch-ab) = c4311407ec801e834e9ecfdcb9410c3179a12aa7
+SHA1 (patch-ac) = f2fee36611abc95e470a76e6596f84bd3f33523a
+SHA1 (patch-ad) = 68d48cee2366931f232f88115f79f47f3e1e8206
+SHA1 (patch-ae) = 2a7183e8668787c9fd79d22a10001a56c401e35a
+SHA1 (patch-af) = 0f46220ebb5bfa5b87ac070036f21663dea47cb6
+SHA1 (patch-ag) = 3676310862feca1feb5369cfa5d3756cfd040934
diff --git a/x11/fltk/patches/patch-aa b/x11/fltk/patches/patch-aa
index 3308e1f793d..b7d75c6dd83 100644
--- a/x11/fltk/patches/patch-aa
+++ b/x11/fltk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-aa,v 1.7 2006/01/22 11:11:34 wiz Exp $
 
---- Makefile.orig	2004-10-18 20:22:21.000000000 +0000
+--- Makefile.orig	2006-01-15 19:36:16.000000000 +0100
 +++ Makefile
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
  
  include makeinclude
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.6 2004/10/21 08:29:45 adam Exp $
  
  all: makeinclude
  	for dir in $(DIRS); do\
-@@ -33,6 +33,14 @@ all: makeinclude
+@@ -35,6 +35,14 @@ all: makeinclude
  		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
  	done
  
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index d47051c6a73..949872e8bee 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
+$NetBSD: patch-ab,v 1.11 2006/01/22 11:11:34 wiz Exp $
 
---- configure.in.orig	2004-11-19 19:44:17.000000000 -0800
+--- configure.in.orig	2006-01-15 18:36:16.000000000 +0000
 +++ configure.in
-@@ -95,6 +95,7 @@ AC_SUBST(GLLIBNAME)
+@@ -96,6 +96,7 @@ AC_SUBST(GLLIBNAME)
  AC_SUBST(IMGLIBNAME)
  AC_SUBST(LIBEXT)
  AC_SUBST(LIBNAME)
 +AC_SUBST(LIBTOOL)
  AC_SUBST(LINKFLTK)
+ AC_SUBST(LINKFLTKFORMS)
  AC_SUBST(LINKFLTKGL)
- AC_SUBST(LINKFLTKIMG)
-@@ -110,6 +111,15 @@ fi
+@@ -112,6 +113,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,10 +26,10 @@ $NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
  if test x$enable_shared = xyes; then
      PICFLAG=1
      SHAREDSUFFIX=""
-@@ -209,6 +219,21 @@ else
-     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
+@@ -222,6 +232,21 @@ else
+     FLUID="fluid"
+     LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
  fi
- 
 +if test "x$LIBTOOL" != "x"; then
 +    LINKFLTK="../src/libfltk.la"
 +    if test "x$LINKFLTKGL" != "x"; then    
@@ -45,11 +45,11 @@ $NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
 +    IMGDSONAME="libfltk_images.la"
 +fi
 +
+ 
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOLINK)
- AC_SUBST(DSONAME)
-@@ -658,23 +683,8 @@ AC_SUBST(POSTBUILD)
- AC_SUBST(THREADS)
+@@ -757,26 +782,9 @@ AC_SUBST(INSTALL_DESKTOP)
+ AC_SUBST(UNINSTALL_DESKTOP)
  
  dnl Figure out the appropriate formatted man page extension...
 -case "$uname" in
@@ -57,27 +57,24 @@ $NetBSD: patch-ab,v 1.10 2005/03/19 15:26:18 ben Exp $
 -	# *BSD
 -	CAT1EXT=0
 -	CAT3EXT=0
+-	CAT6EXT=0
 -	;;
 -    IRIX*)
 -	# SGI IRIX
 -	CAT1EXT=z
 -	CAT3EXT=z
+-	CAT6EXT=z
 -	;;
 -    *)
 -	# All others
- 	CAT1EXT=1
- 	CAT3EXT=3
+-	CAT1EXT=1
+-	CAT3EXT=3
+-	CAT6EXT=3
 -	;;
 -esac
++  	CAT1EXT=1
++  	CAT3EXT=3
++  	CAT6EXT=6
  
  AC_SUBST(CAT1EXT)
  AC_SUBST(CAT3EXT)
-@@ -743,7 +753,7 @@ if test -n "$GCC"; then
- 	    ;;
-     esac
- 
--    CXX="$CC"
-+#    CXX="$CC"
- 
-     # 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 35099ede359..b9012ec5941 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
+$NetBSD: patch-ac,v 1.9 2006/01/22 11:11:34 wiz Exp $
 
---- configure.orig	2004-11-23 12:35:43.000000000 -0800
+--- configure.orig	2006-01-18 02:30:52.000000000 +0000
 +++ configure
-@@ -855,6 +855,8 @@ Optional Features:
+@@ -856,6 +856,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
@@ -10,8 +10,8 @@ $NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
 +                          turn on building with libtool [default=no]
    --enable-threads        enable multi-threading support
    --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
+   --disable-largefile     omit support for large files
+@@ -1412,7 +1414,22 @@ if test "${enable_shared+set}" = set; th
    enableval="$enable_shared"
  
  fi;
@@ -35,10 +35,12 @@ $NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
      PICFLAG=1
      SHAREDSUFFIX=""
      FLUID="fluid-shared"
-@@ -1478,6 +1495,20 @@ else
-     LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk"
+@@ -1524,8 +1541,20 @@ else
+     LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
  fi
  
+-
+-
 +if test "x$LIBTOOL" != "x"; then
 +    LINKFLTK="../src/libfltk.la"
 +    if test "x$LINKFLTKGL" != "x"; then
@@ -56,7 +58,7 @@ $NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
  
  
  
-@@ -9148,23 +9179,8 @@ esac
+@@ -11073,26 +11102,9 @@ esac
  
  
  
@@ -65,37 +67,32 @@ $NetBSD: patch-ac,v 1.8 2005/03/19 15:26:18 ben Exp $
 -	# *BSD
 -	CAT1EXT=0
 -	CAT3EXT=0
+-	CAT6EXT=0
 -	;;
 -    IRIX*)
 -	# SGI IRIX
 -	CAT1EXT=z
 -	CAT3EXT=z
+-	CAT6EXT=z
 -	;;
 -    *)
 -	# All others
 -	CAT1EXT=1
 -	CAT3EXT=3
+-	CAT6EXT=3
 -	;;
 -esac
 +CAT1EXT=1
 +CAT3EXT=3
++CAT6EXT=6
  
  
  
-@@ -9230,7 +9246,7 @@ echo "${ECHO_T}yes" >&6
- 	    ;;
-     esac
- 
--    CXX="$CC"
-+#    CXX="$CC"
- 
-     # Show all standard warnings + unused variables, conversion errors,
-     # and inlining problems when compiling...
-@@ -10120,6 +10136,7 @@ s,@GLLIBNAME@,$GLLIBNAME,;t t
+@@ -12034,6 +12048,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
+ s,@LINKFLTKFORMS@,$LINKFLTKFORMS,;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 4cf38da6fc8..8d9fa62bac0 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,14 +1,14 @@
-$NetBSD: patch-ad,v 1.7 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-ad,v 1.8 2006/01/22 11:11:34 wiz Exp $
 
---- documentation/Makefile.orig	2004-10-18 20:22:22.000000000 +0000
+--- documentation/Makefile.orig	2006-01-15 19:36:16.000000000 +0100
 +++ documentation/Makefile
-@@ -227,24 +227,24 @@ docdir = $(datadir)/doc/fltk
+@@ -229,24 +229,24 @@ depend:
  install: $(MANPAGES)
  	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)/*
+-	$(CP) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) $(HTMLFILES) $(IMAGEFILES) 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
@@ -33,4 +33,4 @@ $NetBSD: patch-ad,v 1.7 2004/10/21 08:29:45 adam Exp $
 +	$(INSTALL_MAN) fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
  	$(CHMOD) 644 $(DESTDIR)$(mandir)/man3/fltk.3
  
- 
+ install-linux install-osx:
diff --git a/x11/fltk/patches/patch-ae b/x11/fltk/patches/patch-ae
index 95098c088fb..d5894ab02df 100644
--- a/x11/fltk/patches/patch-ae
+++ b/x11/fltk/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.4 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-ae,v 1.5 2006/01/22 11:11:34 wiz Exp $
 
---- fluid/Makefile.orig	2004-10-18 20:22:22.000000000 +0000
+--- fluid/Makefile.orig	2006-01-15 20:26:08.000000000 +0100
 +++ fluid/Makefile
-@@ -75,7 +75,7 @@ include makedepend
+@@ -80,7 +80,7 @@ include makedepend
  install: all
  	echo "Installing FLUID in $(DESTDIR)$(bindir)..."
  	-$(MKDIR) $(DESTDIR)$(bindir)
diff --git a/x11/fltk/patches/patch-af b/x11/fltk/patches/patch-af
index d0244bb801c..e9f680a1bf7 100644
--- a/x11/fltk/patches/patch-af
+++ b/x11/fltk/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-af,v 1.7 2006/01/22 11:11:34 wiz Exp $
 
---- makeinclude.in.orig	2004-10-18 20:22:21.000000000 +0000
+--- makeinclude.in.orig	2006-01-15 18:36:16.000000000 +0000
 +++ makeinclude.in
-@@ -46,8 +46,8 @@ SHELL		= /bin/sh
+@@ -49,8 +49,8 @@ SHELL		= /bin/sh
  STRIP		= strip
  
  # compiler names:
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $
  MAKEDEPEND	= @MAKEDEPEND@
  
  # flags for C++ compiler:
-@@ -57,6 +57,7 @@ CXXFLAGS	= $(OPTIM) @CPPFLAGS@ @CXXFLAGS
+@@ -60,6 +60,7 @@ CXXFLAGS	= $(OPTIM) @LARGEFILE@ @CPPFLAG
  
  # program to make the archive:
  LIBNAME		= @LIBNAME@
@@ -21,17 +21,17 @@ $NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $
  FLLIBNAME	= @FLLIBNAME@
  GLLIBNAME	= @GLLIBNAME@
  IMGLIBNAME	= @IMGLIBNAME@
-@@ -70,7 +71,8 @@ IMGDSONAME	= @IMGDSONAME@
- DSOCOMMAND	= @DSOCOMMAND@
+@@ -74,7 +75,8 @@ DSOCOMMAND	= @DSOCOMMAND@
  
  # libraries to link with:
+ AUDIOLIBS	= @AUDIOLIBS@
 -LDLIBS		= @LDFLAGS@ @LIBS@
 +#LDLIBS		= @LDFLAGS@ @LIBS@
 +LDLIBS		= $(GLDLIBS)
  GLDLIBS		= @LDFLAGS@ @GLLIB@ @LIBS@
- LINKFLTK	= -L../lib @LINKFLTK@
- LINKFLTKGL	= -L../lib @LINKFLTKGL@
-@@ -82,6 +84,12 @@ IMAGELIBS	= @IMAGELIBS@
+ LINKFLTK	= @LINKFLTK@
+ LINKFLTKGL	= @LINKFLTKGL@
+@@ -86,6 +88,12 @@ IMAGELIBS	= -L../lib @IMAGELIBS@
  # image libraries to build...
  IMAGEDIRS	= @JPEG@ @ZLIB@ @PNG@
  
@@ -44,3 +44,21 @@ $NetBSD: patch-af,v 1.6 2004/10/21 08:29:45 adam Exp $
  # The extension to use for executables...
  EXEEXT		= @EXEEXT@
  
+@@ -114,7 +122,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ .SILENT:
+ 
+ # Build commands and filename extensions...
+-.SUFFIXES:	.0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT)
++.SUFFIXES:	.0 .1 .3 .6 .c .cxx .h .fl .man .o .z $(EXEEXT)
+ 
+ .o$(EXEEXT):
+ 	echo Linking $@...
+@@ -129,7 +137,7 @@ UNINSTALL_DESKTOP = @UNINSTALL_DESKTOP@
+ 	echo Compiling $<...
+ 	$(CXX) -I.. @PNGINC@ @JPEGINC@ @ZLIBINC@ $(CXXFLAGS) -c $<
+ 
+-.man.0 .man.1 .man.3:
++.man.0 .man.1 .man.3 .man.6:
+ 	echo Formatting $<...
+ 	rm -f $@
+ 	$(NROFF) -man $< >$@
diff --git a/x11/fltk/patches/patch-ag b/x11/fltk/patches/patch-ag
index ca93a6d8b1b..9bfcf36b48a 100644
--- a/x11/fltk/patches/patch-ag
+++ b/x11/fltk/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
+$NetBSD: patch-ag,v 1.5 2006/01/22 11:11:34 wiz Exp $
 
---- src/Makefile.orig	2004-10-18 20:22:25.000000000 +0000
+--- src/Makefile.orig	2005-08-08 02:54:30.000000000 +0200
 +++ src/Makefile
-@@ -199,6 +199,10 @@ $(LIBNAME): $(OBJECTS)
+@@ -200,6 +200,10 @@ $(LIBNAME): $(OBJECTS)
  	$(LIBCOMMAND) $@ $(OBJECTS)
  	$(RANLIB) $@
  
@@ -13,7 +13,7 @@ $NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
  libfltk.so.1.1: $(OBJECTS)
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(OBJECTS)
-@@ -235,6 +239,10 @@ $(FLLIBNAME): $(FLOBJECTS)
+@@ -236,6 +240,10 @@ $(FLLIBNAME): $(FLOBJECTS)
  	$(LIBCOMMAND) $@ $(FLOBJECTS)
  	$(RANLIB) $@
  
@@ -24,7 +24,7 @@ $NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
  libfltk_forms.so.1.1: $(FLOBJECTS) libfltk.so.1.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
-@@ -271,6 +279,10 @@ $(GLLIBNAME): $(GLOBJECTS)
+@@ -272,6 +280,10 @@ $(GLLIBNAME): $(GLOBJECTS)
  	$(LIBCOMMAND) $@ $(GLOBJECTS)
  	$(RANLIB) $@
  
@@ -35,7 +35,7 @@ $NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
  libfltk_gl.so.1.1: $(GLOBJECTS) libfltk.so.1.1
  	echo $(DSOCOMMAND) $@ ...
  	$(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
-@@ -307,6 +319,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+@@ -308,6 +320,10 @@ $(IMGLIBNAME): $(IMGOBJECTS)
  	$(LIBCOMMAND) $@ $(IMGOBJECTS)
  	$(RANLIB) $@
  
@@ -45,8 +45,8 @@ $NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
 +
  libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
  	echo $(DSOCOMMAND) $@ ...
- 	$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk
-@@ -429,6 +445,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 	$(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
+@@ -477,6 +493,9 @@ install: $(LIBNAME) $(DSONAME) \
  		$(RANLIB) $(DESTDIR)$(libdir)/$(GLLIBNAME); \
  	fi
  	$(RANLIB) $(DESTDIR)$(libdir)/$(IMGLIBNAME)
@@ -56,29 +56,29 @@ $NetBSD: patch-ag,v 1.4 2004/10/21 08:29:45 adam Exp $
  	if test x$(DSONAME) = xlibfltk.so.1.1; then\
  		$(RM) $(DESTDIR)$(libdir)/libfltk.so*;\
  		$(CP) libfltk.so.1.1 $(DESTDIR)$(libdir); \
-@@ -452,6 +471,9 @@ install: $(LIBNAME) $(DSONAME) \
+@@ -500,6 +519,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) $(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; \
+ 	if test x$(DSONAME) = xcygfltknox-1.1.dll; then\
+ 		$(RM) $(DESTDIR)$(bindir)/$(DSONAME);\
+ 		$(CP) $(DSONAME) $(DESTDIR)$(bindir); \
+@@ -522,6 +544,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_forms.so.1.1; \
+ 		$(LN) libfltk_forms.so.1.1 $(DESTDIR)$(libdir)/libfltk_forms.so;\
  	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) $(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; \
+ 	if test x$(FLDSONAME) = xlibfltk_forms.sl.1.1; then\
+ 		$(RM) $(DESTDIR)$(libdir)/libfltk_forms.sl*;\
+ 		$(CP) libfltk_forms.sl.1.1 $(DESTDIR)$(libdir); \
+@@ -594,6 +619,9 @@ install: $(LIBNAME) $(DSONAME) \
+ 		$(CP) libfltk_gl.dll.a $(DESTDIR)$(libdir); \
+ 		$(CHMOD) 755 $(DESTDIR)$(libdir)/libfltk_gl.dll.a; \
  	fi
 +	if test x$(IMGDSONAME) = xlibfltk_images.la; then\
 +		$(INSTALL_LIB) libfltk_images.la $(libdir); \
-- 
cgit v1.2.3