Fri Aug 22 21:58:21 2014 UTC ()
Install banners and testprint again, and depend on a cups version that
doesn't install them.

Bump PKGREVISION.


(wiz)
diff -r1.5 -r1.6 pkgsrc/print/cups-filters/Makefile
diff -r1.2 -r1.3 pkgsrc/print/cups-filters/PLIST
diff -r1.3 -r1.4 pkgsrc/print/cups-filters/distinfo
diff -r1.1 -r0 pkgsrc/print/cups-filters/patches/patch-Makefile.in
cvs diff -r1.5 -r1.6 pkgsrc/print/cups-filters/Makefile (expand / switch to unified diff)

--- pkgsrc/print/cups-filters/Makefile 2014/08/22 09:58:36 1.5
+++ pkgsrc/print/cups-filters/Makefile 2014/08/22 21:58:21 1.6
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.5 2014/08/22 09:58:36 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2014/08/22 21:58:21 wiz Exp $
2 2
3DISTNAME= cups-filters-1.0.54 3DISTNAME= cups-filters-1.0.54
4PKGREVISION= 2 4PKGREVISION= 3
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++
@@ -32,24 +32,24 @@ CONF_FILES= ${PREFIX}/share/examples/cu @@ -32,24 +32,24 @@ CONF_FILES= ${PREFIX}/share/examples/cu
32 32
33post-install: 33post-install:
34 ${MV} ${DESTDIR}${PREFIX}/etc/cups/cups-browsed.conf ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf 34 ${MV} ${DESTDIR}${PREFIX}/etc/cups/cups-browsed.conf ${DESTDIR}${PREFIX}/share/examples/cups-filters/cups-browsed.conf
35 ${MV} ${DESTDIR}/etc/rc.d/cups-browsed ${DESTDIR}${PREFIX}/share/examples/rc.d/cups-browsed 35 ${MV} ${DESTDIR}/etc/rc.d/cups-browsed ${DESTDIR}${PREFIX}/share/examples/rc.d/cups-browsed
36 36
37.include "../../devel/glib2/buildlink3.mk" 37.include "../../devel/glib2/buildlink3.mk"
38.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
39.include "../../fonts/fontconfig/buildlink3.mk" 39.include "../../fonts/fontconfig/buildlink3.mk"
40.include "../../graphics/freetype2/buildlink3.mk" 40.include "../../graphics/freetype2/buildlink3.mk"
41.include "../../graphics/lcms2/buildlink3.mk" 41.include "../../graphics/lcms2/buildlink3.mk"
42.include "../../graphics/png/buildlink3.mk" 42.include "../../graphics/png/buildlink3.mk"
43.include "../../graphics/tiff/buildlink3.mk" 43.include "../../graphics/tiff/buildlink3.mk"
44.include "../../net/avahi/buildlink3.mk" 44.include "../../net/avahi/buildlink3.mk"
45BUILDLINK_ABI_DEPENDS.cups+= cups>=1.6 45BUILDLINK_ABI_DEPENDS.cups+= cups>=1.7.4nb1
46.include "../../print/cups/buildlink3.mk" 46.include "../../print/cups/buildlink3.mk"
47.include "../../print/ghostscript/buildlink3.mk" 47.include "../../print/ghostscript/buildlink3.mk"
48.include "../../print/ijs/buildlink3.mk" 48.include "../../print/ijs/buildlink3.mk"
49.include "../../print/poppler-cpp/buildlink3.mk" 49.include "../../print/poppler-cpp/buildlink3.mk"
50.include "../../print/poppler-glib/buildlink3.mk" 50.include "../../print/poppler-glib/buildlink3.mk"
51BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.26.1nb1 51BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.26.1nb1
52.include "../../print/poppler-includes/buildlink3.mk" 52.include "../../print/poppler-includes/buildlink3.mk"
53.include "../../print/qpdf/buildlink3.mk" 53.include "../../print/qpdf/buildlink3.mk"
54.include "../../mk/jpeg.buildlink3.mk" 54.include "../../mk/jpeg.buildlink3.mk"
55.include "../../mk/bsd.pkg.mk" 55.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/print/cups-filters/PLIST (expand / switch to unified diff)

--- pkgsrc/print/cups-filters/PLIST 2014/08/22 09:58:36 1.2
+++ pkgsrc/print/cups-filters/PLIST 2014/08/22 21:58:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2014/08/22 09:58:36 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.3 2014/08/22 21:58:21 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,36 +32,43 @@ libexec/cups/filter/pdftops @@ -32,36 +32,43 @@ 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
45share/cups/banners/form 47share/cups/banners/form
 48share/cups/banners/secret
 49share/cups/banners/standard
 50share/cups/banners/topsecret
 51share/cups/banners/unclassified
46share/cups/charsets/pdf.utf-8 52share/cups/charsets/pdf.utf-8
47share/cups/charsets/pdf.utf-8.heavy 53share/cups/charsets/pdf.utf-8.heavy
48share/cups/charsets/pdf.utf-8.simple 54share/cups/charsets/pdf.utf-8.simple
49share/cups/data/default-testpage.pdf 55share/cups/data/default-testpage.pdf
50share/cups/data/default.pdf 56share/cups/data/default.pdf
51share/cups/data/form_english.pdf 57share/cups/data/form_english.pdf
52share/cups/data/form_english_in.odt 58share/cups/data/form_english_in.odt
53share/cups/data/form_russian.pdf 59share/cups/data/form_russian.pdf
54share/cups/data/form_russian_in.odt 60share/cups/data/form_russian_in.odt
 61share/cups/data/testprint
55share/cups/drv/cupsfilters.drv 62share/cups/drv/cupsfilters.drv
56share/cups/mime/cupsfilters.convs 63share/cups/mime/cupsfilters.convs
57share/cups/mime/cupsfilters.types 64share/cups/mime/cupsfilters.types
58share/cups/ppdc/escp.h 65share/cups/ppdc/escp.h
59share/cups/ppdc/pcl.h 66share/cups/ppdc/pcl.h
60share/doc/cups-filters/AUTHORS 67share/doc/cups-filters/AUTHORS
61share/doc/cups-filters/COPYING 68share/doc/cups-filters/COPYING
62share/doc/cups-filters/INSTALL 69share/doc/cups-filters/INSTALL
63share/doc/cups-filters/NEWS 70share/doc/cups-filters/NEWS
64share/doc/cups-filters/README 71share/doc/cups-filters/README
65share/examples/cups-filters/cups-browsed.conf 72share/examples/cups-filters/cups-browsed.conf
66share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf 73share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf
67share/examples/rc.d/cups-browsed 74share/examples/rc.d/cups-browsed
cvs diff -r1.3 -r1.4 pkgsrc/print/cups-filters/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cups-filters/distinfo 2014/08/22 09:58:36 1.3
+++ pkgsrc/print/cups-filters/distinfo 2014/08/22 21:58:21 1.4
@@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
1$NetBSD: distinfo,v 1.3 2014/08/22 09:58:36 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2014/08/22 21:58:21 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 
7SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb 6SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb
8SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b 7SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b
File Deleted: pkgsrc/print/cups-filters/patches/patch-Makefile.in