Install banners and testprint again, and depend on a cups version that

doesn't install them.

Bump PKGREVISION.

4 files changed, 12 insertions, 39 deletions

diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile
index 2239d12a58f..f8426baaa54 100644
--- a/print/cups-filters/Makefile
+++ b/print/cups-filters/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/08/22 09:58:36 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/22 21:58:21 wiz Exp $
 
 DISTNAME=	cups-filters-1.0.54
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
@@ -42,7 +42,7 @@ post-install:
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../net/avahi/buildlink3.mk"
-BUILDLINK_ABI_DEPENDS.cups+=	cups>=1.6
+BUILDLINK_ABI_DEPENDS.cups+=	cups>=1.7.4nb1
 .include "../../print/cups/buildlink3.mk"
 .include "../../print/ghostscript/buildlink3.mk"
 .include "../../print/ijs/buildlink3.mk"
diff --git a/print/cups-filters/PLIST b/print/cups-filters/PLIST
index 1fae954d93c..a58925bf0ad 100644
--- a/print/cups-filters/PLIST
+++ b/print/cups-filters/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2014/08/22 09:58:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/08/22 21:58:21 wiz Exp $
 bin/ttfread
 include/cupsfilters/colord.h
 include/cupsfilters/driver.h
@@ -42,7 +42,13 @@ man/man1/foomatic-rip.1
 man/man5/cups-browsed.conf.5
 man/man8/cups-browsed.8
 sbin/cups-browsed
+share/cups/banners/classified
+share/cups/banners/confidential
 share/cups/banners/form
+share/cups/banners/secret
+share/cups/banners/standard
+share/cups/banners/topsecret
+share/cups/banners/unclassified
 share/cups/charsets/pdf.utf-8
 share/cups/charsets/pdf.utf-8.heavy
 share/cups/charsets/pdf.utf-8.simple
@@ -52,6 +58,7 @@ share/cups/data/form_english.pdf
 share/cups/data/form_english_in.odt
 share/cups/data/form_russian.pdf
 share/cups/data/form_russian_in.odt
+share/cups/data/testprint
 share/cups/drv/cupsfilters.drv
 share/cups/mime/cupsfilters.convs
 share/cups/mime/cupsfilters.types
diff --git a/print/cups-filters/distinfo b/print/cups-filters/distinfo
index 99954d23449..b1de5a18ba9 100644
--- a/print/cups-filters/distinfo
+++ b/print/cups-filters/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2014/08/22 09:58:36 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/08/22 21:58:21 wiz Exp $
 
 SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c
 RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833
 Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes
-SHA1 (patch-Makefile.in) = f6f6fc8b7dae389533c714a24855cac535505633
 SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb
 SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b
diff --git a/print/cups-filters/patches/patch-Makefile.in b/print/cups-filters/patches/patch-Makefile.in
deleted file mode 100644
index ea929021928..00000000000
--- a/print/cups-filters/patches/patch-Makefile.in
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/08/22 09:58:36 wiz Exp $
-
-Installs some files that conflict with cups-1.7.
-Don't install them for now.
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1222
-
---- Makefile.in.orig	2014-06-06 14:28:21.000000000 +0000
-+++ Makefile.in
-@@ -993,13 +993,7 @@ test1284_CFLAGS = $(CUPS_CFLAGS)
- # =======
- pkgbannerdir = $(CUPS_DATADIR)/banners
- pkgbanner_DATA = \
--	banners/classified \
--	banners/confidential \
--	banners/secret \
--	banners/standard \
--	banners/form \
--	banners/topsecret \
--	banners/unclassified
-+	banners/form
- 
- 
- # ========
-@@ -1122,8 +1116,7 @@ pkgcupsdata_DATA = \
- 	data/form_english.pdf \
- 	data/form_english_in.odt \
- 	data/form_russian_in.odt \
--	data/default-testpage.pdf \
--	data/testprint
-+	data/default-testpage.pdf
- 
- 
- # ===========