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 unified 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,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2014/07/04 14:31:49 wiz Exp $ 1# $NetBSD: Makefile,v 1.5 2014/08/22 09:58:36 wiz Exp $
2 2
3DISTNAME= cups-filters-1.0.54 3DISTNAME= cups-filters-1.0.54
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= print 5CATEGORIES= print
6MASTER_SITES= http://openprinting.org/download/cups-filters/ 6MASTER_SITES= http://openprinting.org/download/cups-filters/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters 10HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
11COMMENT= Backends, filters, and other software for cups 11COMMENT= Backends, filters, and other software for cups
12#LICENSE= # TODO: (see mk/license.mk) 12#LICENSE= # TODO: (see mk/license.mk)
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_TOOLS+= bash:run pkg-config 16USE_TOOLS+= bash:run pkg-config
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
cvs diff -r1.1 -r1.2 pkgsrc/print/cups-filters/PLIST (expand / switch to unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2014/06/07 11:47:47 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/08/22 09:58:36 wiz Exp $
2bin/ttfread 2bin/ttfread
3include/cupsfilters/colord.h 3include/cupsfilters/colord.h
4include/cupsfilters/driver.h 4include/cupsfilters/driver.h
5include/cupsfilters/image.h 5include/cupsfilters/image.h
6include/cupsfilters/raster.h 6include/cupsfilters/raster.h
7include/fontembed/bitset.h 7include/fontembed/bitset.h
8include/fontembed/embed.h 8include/fontembed/embed.h
9include/fontembed/fontfile.h 9include/fontembed/fontfile.h
10include/fontembed/iofn.h 10include/fontembed/iofn.h
11include/fontembed/sfnt.h 11include/fontembed/sfnt.h
12lib/libcupsfilters.la 12lib/libcupsfilters.la
13lib/libfontembed.la 13lib/libfontembed.la
14lib/pkgconfig/libcupsfilters.pc 14lib/pkgconfig/libcupsfilters.pc
@@ -32,43 +32,36 @@ libexec/cups/filter/pdftops @@ -32,43 +32,36 @@ libexec/cups/filter/pdftops
32libexec/cups/filter/pdftoraster 32libexec/cups/filter/pdftoraster
33libexec/cups/filter/pstopdf 33libexec/cups/filter/pstopdf
34libexec/cups/filter/rastertoescpx 34libexec/cups/filter/rastertoescpx
35libexec/cups/filter/rastertopclx 35libexec/cups/filter/rastertopclx
36libexec/cups/filter/rastertopdf 36libexec/cups/filter/rastertopdf
37libexec/cups/filter/textonly 37libexec/cups/filter/textonly
38libexec/cups/filter/texttopdf 38libexec/cups/filter/texttopdf
39libexec/cups/filter/texttops 39libexec/cups/filter/texttops
40libexec/cups/filter/urftopdf 40libexec/cups/filter/urftopdf
41man/man1/foomatic-rip.1 41man/man1/foomatic-rip.1
42man/man5/cups-browsed.conf.5 42man/man5/cups-browsed.conf.5
43man/man8/cups-browsed.8 43man/man8/cups-browsed.8
44sbin/cups-browsed 44sbin/cups-browsed
45share/cups/banners/classified 
46share/cups/banners/confidential 
47share/cups/banners/form 45share/cups/banners/form
48share/cups/banners/secret 
49share/cups/banners/standard 
50share/cups/banners/topsecret 
51share/cups/banners/unclassified 
52share/cups/charsets/pdf.utf-8 46share/cups/charsets/pdf.utf-8
53share/cups/charsets/pdf.utf-8.heavy 47share/cups/charsets/pdf.utf-8.heavy
54share/cups/charsets/pdf.utf-8.simple 48share/cups/charsets/pdf.utf-8.simple
55share/cups/data/default-testpage.pdf 49share/cups/data/default-testpage.pdf
56share/cups/data/default.pdf 50share/cups/data/default.pdf
57share/cups/data/form_english.pdf 51share/cups/data/form_english.pdf
58share/cups/data/form_english_in.odt 52share/cups/data/form_english_in.odt
59share/cups/data/form_russian.pdf 53share/cups/data/form_russian.pdf
60share/cups/data/form_russian_in.odt 54share/cups/data/form_russian_in.odt
61share/cups/data/testprint 
62share/cups/drv/cupsfilters.drv 55share/cups/drv/cupsfilters.drv
63share/cups/mime/cupsfilters.convs 56share/cups/mime/cupsfilters.convs
64share/cups/mime/cupsfilters.types 57share/cups/mime/cupsfilters.types
65share/cups/ppdc/escp.h 58share/cups/ppdc/escp.h
66share/cups/ppdc/pcl.h 59share/cups/ppdc/pcl.h
67share/doc/cups-filters/AUTHORS 60share/doc/cups-filters/AUTHORS
68share/doc/cups-filters/COPYING 61share/doc/cups-filters/COPYING
69share/doc/cups-filters/INSTALL 62share/doc/cups-filters/INSTALL
70share/doc/cups-filters/NEWS 63share/doc/cups-filters/NEWS
71share/doc/cups-filters/README 64share/doc/cups-filters/README
72share/examples/cups-filters/cups-browsed.conf 65share/examples/cups-filters/cups-browsed.conf
73share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf 66share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf
74share/examples/rc.d/cups-browsed 67share/examples/rc.d/cups-browsed
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-filters/distinfo (expand / switch to unified 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 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.2 2014/06/07 13:53:41 wiz Exp $ 1$NetBSD: distinfo,v 1.3 2014/08/22 09:58:36 wiz Exp $
2 2
3SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c 3SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c
4RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833 4RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833
5Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes 5Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes
 6SHA1 (patch-Makefile.in) = f6f6fc8b7dae389533c714a24855cac535505633
6SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb 7SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb
7SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b 8SHA1 (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
 
 
 # ===========