Don't install cat pages by default, fixes PR 33587. Bump revision.

4 files changed, 13 insertions, 19 deletions

diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index fb2e1a9675f..d29d6c94514 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2006/05/21 22:16:54 ben Exp $
+# $NetBSD: Makefile,v 1.60 2006/06/01 13:14:18 joerg Exp $
 
 DISTNAME=	fltk-1.1.7-source
 PKGNAME=	${DISTNAME:S/-source//}
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fltk/} \
 		ftp://ftp2.easysw.com/pub/fltk/${VERS}/ \
diff --git a/x11/fltk/PLIST b/x11/fltk/PLIST
index c08e6610d11..90b9fdb9069 100644
--- a/x11/fltk/PLIST
+++ b/x11/fltk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/03/22 19:31:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.11 2006/06/01 13:14:18 joerg Exp $
 bin/fltk-config
 bin/fluid
 include/FL/Enumerations.H
@@ -249,9 +249,6 @@ lib/libfltk.la
 lib/libfltk_forms.la
 lib/libfltk_gl.la
 lib/libfltk_images.la
-man/cat1/fltk-config.1
-man/cat1/fluid.1
-man/cat3/fltk.3
 man/man1/fltk-config.1
 man/man1/fluid.1
 man/man3/fltk.3
diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 0c9dc857397..ad9cc25b445 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2006/01/22 11:11:34 wiz Exp $
+$NetBSD: distinfo,v 1.15 2006/06/01 13:14:18 joerg Exp $
 
 SHA1 (fltk-1.1.7-source.tar.bz2) = 16b174522920403af1e4ccddd36daaefda3765c8
 RMD160 (fltk-1.1.7-source.tar.bz2) = a539a1c6bb3363e54bc82c7995037c5d8ede9dd7
@@ -6,7 +6,7 @@ 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-ad) = 96eab6558675067ae5eae3e176066c653eee957d
 SHA1 (patch-ae) = 2a7183e8668787c9fd79d22a10001a56c401e35a
 SHA1 (patch-af) = 0f46220ebb5bfa5b87ac070036f21663dea47cb6
 SHA1 (patch-ag) = 3676310862feca1feb5369cfa5d3756cfd040934
diff --git a/x11/fltk/patches/patch-ad b/x11/fltk/patches/patch-ad
index 8d9fa62bac0..0c4c45aa8bb 100644
--- a/x11/fltk/patches/patch-ad
+++ b/x11/fltk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.8 2006/01/22 11:11:34 wiz Exp $
+$NetBSD: patch-ad,v 1.9 2006/06/01 13:14:19 joerg Exp $
 
---- documentation/Makefile.orig	2006-01-15 19:36:16.000000000 +0100
+--- documentation/Makefile.orig	2006-01-15 18:36:16.000000000 +0000
 +++ documentation/Makefile
-@@ -229,24 +229,24 @@ depend:
+@@ -229,24 +229,16 @@ depend:
  install: $(MANPAGES)
  	echo "Installing documentation files in $(DESTDIR)$(docdir)..."
  	-$(MKDIR) $(DESTDIR)$(docdir)
@@ -10,17 +10,14 @@ $NetBSD: patch-ad,v 1.8 2006/01/22 11:11:34 wiz Exp $
 +	$(INSTALL_DATA) $(HTMLFILES) $(IMAGEFILES) index.html $(DESTDIR)$(docdir)
  	$(CHMOD) 644 $(DESTDIR)$(docdir)/*.*
  	echo "Installing man pages in $(DESTDIR)$(mandir)..."
- 	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
+-	-$(MKDIR) $(DESTDIR)$(mandir)/cat1
 -	$(CP) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
-+	$(INSTALL_MAN) fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
- 	$(CHMOD) 644 $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+-	$(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
+-	$(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)
+-	$(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