Install banners and testprint again, and depend on a cups version that doesn't install them. Bump PKGREVISION.diff -r1.5 -r1.6 pkgsrc/print/cups-filters/Makefile
(wiz)
@@ -1,55 +1,55 @@ | @@ -1,55 +1,55 @@ | |||
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 | |||
3 | DISTNAME= cups-filters-1.0.54 | 3 | DISTNAME= cups-filters-1.0.54 | |
4 | PKGREVISION= 2 | 4 | PKGREVISION= 3 | |
5 | CATEGORIES= print | 5 | CATEGORIES= print | |
6 | MASTER_SITES= http://openprinting.org/download/cups-filters/ | 6 | MASTER_SITES= http://openprinting.org/download/cups-filters/ | |
7 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters | 10 | HOMEPAGE= http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters | |
11 | COMMENT= Backends, filters, and other software for cups | 11 | COMMENT= Backends, filters, and other software for cups | |
12 | #LICENSE= # TODO: (see mk/license.mk) | 12 | #LICENSE= # TODO: (see mk/license.mk) | |
13 | 13 | |||
14 | GNU_CONFIGURE= yes | 14 | GNU_CONFIGURE= yes | |
15 | USE_LIBTOOL= yes | 15 | USE_LIBTOOL= yes | |
16 | USE_TOOLS+= bash:run pkg-config | 16 | USE_TOOLS+= bash:run pkg-config | |
17 | USE_LANGUAGES= c c++ | 17 | USE_LANGUAGES= c c++ | |
18 | 18 | |||
19 | CONFLICTS+= cups<1.6 | 19 | CONFLICTS+= cups<1.6 | |
20 | 20 | |||
21 | PKGCONFIG_OVERRIDE+= libcupsfilters.pc.in | 21 | PKGCONFIG_OVERRIDE+= libcupsfilters.pc.in | |
22 | PKGCONFIG_OVERRIDE+= libfontembed.pc.in | 22 | PKGCONFIG_OVERRIDE+= libfontembed.pc.in | |
23 | 23 | |||
24 | REPLACE_BASH+= filter/textonly | 24 | REPLACE_BASH+= filter/textonly | |
25 | 25 | |||
26 | INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/cups-filters | 26 | INSTALL_MAKE_FLAGS+= sysconfdir=${PREFIX}/share/examples/cups-filters | |
27 | 27 | |||
28 | INSTALLATION_DIRS= share/examples/rc.d | 28 | INSTALLATION_DIRS= share/examples/rc.d | |
29 | 29 | |||
30 | CONF_FILES= ${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fonts/conf.d/99pdftoopvp.conf | 30 | CONF_FILES= ${PREFIX}/share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf ${PKG_SYSCONFDIR}/fonts/conf.d/99pdftoopvp.conf | |
31 | CONF_FILES= ${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf | 31 | CONF_FILES= ${PREFIX}/share/examples/cups-filters/cups-browsed.conf ${PKG_SYSCONFDIR}/cups/cups-browsed.conf | |
32 | 32 | |||
33 | post-install: | 33 | post-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" | |
45 | BUILDLINK_ABI_DEPENDS.cups+= cups>=1.6 | 45 | BUILDLINK_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" | |
51 | BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.26.1nb1 | 51 | BUILDLINK_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" |
@@ -1,74 +1,81 @@ | @@ -1,74 +1,81 @@ | |||
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 $ | |
2 | bin/ttfread | 2 | bin/ttfread | |
3 | include/cupsfilters/colord.h | 3 | include/cupsfilters/colord.h | |
4 | include/cupsfilters/driver.h | 4 | include/cupsfilters/driver.h | |
5 | include/cupsfilters/image.h | 5 | include/cupsfilters/image.h | |
6 | include/cupsfilters/raster.h | 6 | include/cupsfilters/raster.h | |
7 | include/fontembed/bitset.h | 7 | include/fontembed/bitset.h | |
8 | include/fontembed/embed.h | 8 | include/fontembed/embed.h | |
9 | include/fontembed/fontfile.h | 9 | include/fontembed/fontfile.h | |
10 | include/fontembed/iofn.h | 10 | include/fontembed/iofn.h | |
11 | include/fontembed/sfnt.h | 11 | include/fontembed/sfnt.h | |
12 | lib/libcupsfilters.la | 12 | lib/libcupsfilters.la | |
13 | lib/libfontembed.la | 13 | lib/libfontembed.la | |
14 | lib/pkgconfig/libcupsfilters.pc | 14 | lib/pkgconfig/libcupsfilters.pc | |
15 | lib/pkgconfig/libfontembed.pc | 15 | lib/pkgconfig/libfontembed.pc | |
16 | libexec/cups/backend/parallel | 16 | libexec/cups/backend/parallel | |
17 | libexec/cups/backend/serial | 17 | libexec/cups/backend/serial | |
18 | libexec/cups/filter/bannertopdf | 18 | libexec/cups/filter/bannertopdf | |
19 | libexec/cups/filter/commandtoescpx | 19 | libexec/cups/filter/commandtoescpx | |
20 | libexec/cups/filter/commandtopclx | 20 | libexec/cups/filter/commandtopclx | |
21 | libexec/cups/filter/foomatic-rip | 21 | libexec/cups/filter/foomatic-rip | |
22 | libexec/cups/filter/gstopxl | 22 | libexec/cups/filter/gstopxl | |
23 | libexec/cups/filter/gstoraster | 23 | libexec/cups/filter/gstoraster | |
24 | libexec/cups/filter/imagetopdf | 24 | libexec/cups/filter/imagetopdf | |
25 | libexec/cups/filter/imagetops | 25 | libexec/cups/filter/imagetops | |
26 | libexec/cups/filter/imagetoraster | 26 | libexec/cups/filter/imagetoraster | |
27 | libexec/cups/filter/pdftoijs | 27 | libexec/cups/filter/pdftoijs | |
28 | libexec/cups/filter/pdftoippprinter | 28 | libexec/cups/filter/pdftoippprinter | |
29 | libexec/cups/filter/pdftoopvp | 29 | libexec/cups/filter/pdftoopvp | |
30 | libexec/cups/filter/pdftopdf | 30 | libexec/cups/filter/pdftopdf | |
31 | libexec/cups/filter/pdftops | 31 | libexec/cups/filter/pdftops | |
32 | libexec/cups/filter/pdftoraster | 32 | libexec/cups/filter/pdftoraster | |
33 | libexec/cups/filter/pstopdf | 33 | libexec/cups/filter/pstopdf | |
34 | libexec/cups/filter/rastertoescpx | 34 | libexec/cups/filter/rastertoescpx | |
35 | libexec/cups/filter/rastertopclx | 35 | libexec/cups/filter/rastertopclx | |
36 | libexec/cups/filter/rastertopdf | 36 | libexec/cups/filter/rastertopdf | |
37 | libexec/cups/filter/textonly | 37 | libexec/cups/filter/textonly | |
38 | libexec/cups/filter/texttopdf | 38 | libexec/cups/filter/texttopdf | |
39 | libexec/cups/filter/texttops | 39 | libexec/cups/filter/texttops | |
40 | libexec/cups/filter/urftopdf | 40 | libexec/cups/filter/urftopdf | |
41 | man/man1/foomatic-rip.1 | 41 | man/man1/foomatic-rip.1 | |
42 | man/man5/cups-browsed.conf.5 | 42 | man/man5/cups-browsed.conf.5 | |
43 | man/man8/cups-browsed.8 | 43 | man/man8/cups-browsed.8 | |
44 | sbin/cups-browsed | 44 | sbin/cups-browsed | |
45 | share/cups/banners/classified | |||
46 | share/cups/banners/confidential | |||
45 | share/cups/banners/form | 47 | share/cups/banners/form | |
48 | share/cups/banners/secret | |||
49 | share/cups/banners/standard | |||
50 | share/cups/banners/topsecret | |||
51 | share/cups/banners/unclassified | |||
46 | share/cups/charsets/pdf.utf-8 | 52 | share/cups/charsets/pdf.utf-8 | |
47 | share/cups/charsets/pdf.utf-8.heavy | 53 | share/cups/charsets/pdf.utf-8.heavy | |
48 | share/cups/charsets/pdf.utf-8.simple | 54 | share/cups/charsets/pdf.utf-8.simple | |
49 | share/cups/data/default-testpage.pdf | 55 | share/cups/data/default-testpage.pdf | |
50 | share/cups/data/default.pdf | 56 | share/cups/data/default.pdf | |
51 | share/cups/data/form_english.pdf | 57 | share/cups/data/form_english.pdf | |
52 | share/cups/data/form_english_in.odt | 58 | share/cups/data/form_english_in.odt | |
53 | share/cups/data/form_russian.pdf | 59 | share/cups/data/form_russian.pdf | |
54 | share/cups/data/form_russian_in.odt | 60 | share/cups/data/form_russian_in.odt | |
61 | share/cups/data/testprint | |||
55 | share/cups/drv/cupsfilters.drv | 62 | share/cups/drv/cupsfilters.drv | |
56 | share/cups/mime/cupsfilters.convs | 63 | share/cups/mime/cupsfilters.convs | |
57 | share/cups/mime/cupsfilters.types | 64 | share/cups/mime/cupsfilters.types | |
58 | share/cups/ppdc/escp.h | 65 | share/cups/ppdc/escp.h | |
59 | share/cups/ppdc/pcl.h | 66 | share/cups/ppdc/pcl.h | |
60 | share/doc/cups-filters/AUTHORS | 67 | share/doc/cups-filters/AUTHORS | |
61 | share/doc/cups-filters/COPYING | 68 | share/doc/cups-filters/COPYING | |
62 | share/doc/cups-filters/INSTALL | 69 | share/doc/cups-filters/INSTALL | |
63 | share/doc/cups-filters/NEWS | 70 | share/doc/cups-filters/NEWS | |
64 | share/doc/cups-filters/README | 71 | share/doc/cups-filters/README | |
65 | share/examples/cups-filters/cups-browsed.conf | 72 | share/examples/cups-filters/cups-browsed.conf | |
66 | share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf | 73 | share/examples/cups-filters/fonts/conf.d/99pdftoopvp.conf | |
67 | share/examples/rc.d/cups-browsed | 74 | share/examples/rc.d/cups-browsed | |
68 | share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd | 75 | share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd | |
69 | share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd | 76 | share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd | |
70 | share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd | 77 | share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd | |
71 | share/ppd/cupsfilters/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd | 78 | share/ppd/cupsfilters/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd | |
72 | share/ppd/cupsfilters/pxlcolor.ppd | 79 | share/ppd/cupsfilters/pxlcolor.ppd | |
73 | share/ppd/cupsfilters/pxlmono.ppd | 80 | share/ppd/cupsfilters/pxlmono.ppd | |
74 | share/ppd/cupsfilters/textonly.ppd | 81 | share/ppd/cupsfilters/textonly.ppd |
@@ -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 | |||
3 | SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c | 3 | SHA1 (cups-filters-1.0.54.tar.xz) = 5f9e6a7d63406110412d1fc8432bb2415f47622c | |
4 | RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833 | 4 | RMD160 (cups-filters-1.0.54.tar.xz) = 842a08a5846269e7b82153fe955aa3e421370833 | |
5 | Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes | 5 | Size (cups-filters-1.0.54.tar.xz) = 1314324 bytes | |
6 | SHA1 (patch-Makefile.in) = f6f6fc8b7dae389533c714a24855cac535505633 | |||
7 | SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb | 6 | SHA1 (patch-filter_foomatic-rip_foomaticrip.c) = bbacc0502b8de0aaec05ea3bde8f6626f5933afb | |
8 | SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b | 7 | SHA1 (patch-utils_cups-browsed.c) = ad6f4b59016c1384240f1d39214b6792212f509b |