[pkgsrc/trunk]: pkgsrc/x11/fltk Address FLTK issues mentioned in PR#25652. C...

[ben <ben%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2688198221f2
branches:  trunk
changeset: 475608:2688198221f2
user:      ben <ben%pkgsrc.org@localhost>
date:      Fri May 21 02:16:48 2004 +0000

description:
Address FLTK issues mentioned in PR#25652.  Changes:
* link libjpeg and libpng to fluid
* install documentation to doc instead of doc/html
* bump PKGREVISION

diffstat:

 x11/fltk/Makefile         |   5 ++++-
 x11/fltk/distinfo         |   4 ++--
 x11/fltk/patches/patch-ad |  12 +++---------
 3 files changed, 9 insertions(+), 12 deletions(-)

diffs (59 lines):

diff -r 4ded77e96943 -r 2688198221f2 x11/fltk/Makefile
--- a/x11/fltk/Makefile Thu May 20 22:21:12 2004 +0000
+++ b/x11/fltk/Makefile Fri May 21 02:16:48 2004 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.38 2004/04/13 09:36:17 xtraeme Exp $
+# $NetBSD: Makefile,v 1.39 2004/05/21 02:16:48 ben Exp $
 #
 
 DISTNAME=      fltk-1.1.5rc1-source
 PKGNAME=       ${DISTNAME:S/-source//}
+PKGREVISION=   1
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fltk/} \
@@ -30,4 +31,6 @@
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
+.include "../../graphics/jpeg/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4ded77e96943 -r 2688198221f2 x11/fltk/distinfo
--- a/x11/fltk/distinfo Thu May 20 22:21:12 2004 +0000
+++ b/x11/fltk/distinfo Fri May 21 02:16:48 2004 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2004/04/13 09:36:17 xtraeme Exp $
+$NetBSD: distinfo,v 1.9 2004/05/21 02:16:48 ben 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) = 46f5aff720c4172c24afc3342ea6d1273046d7ff
+SHA1 (patch-ad) = 1a829051be349be77d7d710cdfc96c8164144624
 SHA1 (patch-ae) = e1449b1b69379453c84287efe4c27ccafe1ed78a
 SHA1 (patch-af) = a9577b27ffc3b4c477a473def92adac025a43f45
 SHA1 (patch-ag) = d4a4042897c94d3c83cd0aa9245f074ce9366c1a
diff -r 4ded77e96943 -r 2688198221f2 x11/fltk/patches/patch-ad
--- a/x11/fltk/patches/patch-ad Thu May 20 22:21:12 2004 +0000
+++ b/x11/fltk/patches/patch-ad Fri May 21 02:16:48 2004 +0000
@@ -1,14 +1,8 @@
-$NetBSD: patch-ad,v 1.5 2004/02/18 05:07:34 ben Exp $
+$NetBSD: patch-ad,v 1.6 2004/05/21 02:16:48 ben Exp $
 
---- documentation/Makefile.orig        2003-09-08 10:11:44.000000000 -0700
+--- documentation/Makefile.orig        Sat Apr 10 21:38:55 2004
 +++ documentation/Makefile
-@@ -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?
--docdir = $(datadir)/doc/fltk
-+docdir = $(datadir)/doc/html/fltk
- 
+@@ -227,24 +227,24 @@ docdir = $(datadir)/doc/fltk
  install: $(MANPAGES)
        echo "Installing documentation files in $(docdir)..."
        -$(MKDIR) $(docdir)