Fri Aug 22 09:58:36 2014 UTC ()
Stop installing some banner files and the testprint page, to avoid
conflict with cups-1.7.
Upstream bug report was filed a month ago, but so far there was
no clarification:
https://bugs.linuxfoundation.org/show_bug.cgi?id=1222

Bump PKGREVISION.


(wiz)
diff -r1.4 -r1.5 pkgsrc/print/cups-filters/Makefile
diff -r1.1 -r1.2 pkgsrc/print/cups-filters/PLIST
diff -r1.2 -r1.3 pkgsrc/print/cups-filters/distinfo
diff -r0 -r1.1 pkgsrc/print/cups-filters/patches/patch-Makefile.in
cvs diff -r1.4 -r1.5 pkgsrc/print/cups-filters/Makefile (expand / switch to context diff)
--- pkgsrc/print/cups-filters/Makefile 2014/07/04 14:31:49 1.4
+++ pkgsrc/print/cups-filters/Makefile 2014/08/22 09:58:36 1.5
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2014/07/04 14:31:49 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2014/08/22 09:58:36 wiz Exp $
 
 DISTNAME=	cups-filters-1.0.54
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://openprinting.org/download/cups-filters/
 EXTRACT_SUFX=	.tar.xz
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-filters/PLIST (expand / switch to context diff)
--- pkgsrc/print/cups-filters/PLIST 2014/06/07 11:47:47 1.1
+++ pkgsrc/print/cups-filters/PLIST 2014/08/22 09:58:36 1.2
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/06/07 11:47:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2014/08/22 09:58:36 wiz Exp $
 bin/ttfread
 include/cupsfilters/colord.h
 include/cupsfilters/driver.h
@@ -42,13 +42,7 @@
 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
@@ -58,7 +52,6 @@
 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
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-filters/distinfo (expand / switch to context diff)
--- pkgsrc/print/cups-filters/distinfo 2014/06/07 13:53:41 1.2
+++ pkgsrc/print/cups-filters/distinfo 2014/08/22 09:58:36 1.3
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2014/06/07 13:53:41 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/08/22 09:58:36 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
File Added: pkgsrc/print/cups-filters/patches/patch-Makefile.in
$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
 
 
 # ===========