diff options
| author | wiz <wiz> | 2014-08-22 21:54:38 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-08-22 21:54:38 +0000 |
| commit | 1b629cba64e6983205ad046a3f8950e17048412d (patch) | |
| tree | 28061ac3506fb55406c8b18464ba64f71867454c /print | |
| parent | c6f17734e15afc49423ae7f2ef0a225b567af2a5 (diff) | |
| download | pkgsrc-1b629cba64e6983205ad046a3f8950e17048412d.tar.gz | |
Do not install banner files and testprint, to avoid conflict with
cups-filters, which installs them too.
Bump PKGREVISION.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups/Makefile | 3 | ||||
| -rw-r--r-- | print/cups/PLIST | 9 | ||||
| -rw-r--r-- | print/cups/distinfo | 3 | ||||
| -rw-r--r-- | print/cups/patches/patch-data_Makefile | 28 |
4 files changed, 33 insertions, 10 deletions
diff --git a/print/cups/Makefile b/print/cups/Makefile index a6ebbf695b5..14f8a88bc48 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.210 2014/07/29 11:38:40 wiz Exp $ +# $NetBSD: Makefile,v 1.211 2014/08/22 21:54:38 wiz Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -6,6 +6,7 @@ DISTNAME= cups-${DIST_VERS}-source PKGNAME= cups-${DIST_VERS:S/-/./g} +PKGREVISION= 1 BASE_VERS= 1.7.4 DIST_VERS= ${BASE_VERS} CATEGORIES= print diff --git a/print/cups/PLIST b/print/cups/PLIST index 10350ec55f3..d5b09f463dd 100644 --- a/print/cups/PLIST +++ b/print/cups/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.42 2014/06/07 11:54:54 wiz Exp $ +@comment $NetBSD: PLIST,v 1.43 2014/08/22 21:54:38 wiz Exp $ bin/cancel bin/cups-config bin/cupstestdsc @@ -136,13 +136,6 @@ sbin/lpc sbin/lpinfo sbin/lpmove sbin/reject -share/cups/banners/classified -share/cups/banners/confidential -share/cups/banners/secret -share/cups/banners/standard -share/cups/banners/topsecret -share/cups/banners/unclassified -share/cups/data/testprint share/cups/drv/sample.drv share/cups/examples/color.drv share/cups/examples/constraint.drv diff --git a/print/cups/distinfo b/print/cups/distinfo index c96e0a74efd..443fdaa18c3 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.103 2014/07/29 11:38:40 wiz Exp $ +$NetBSD: distinfo,v 1.104 2014/08/22 21:54:38 wiz Exp $ SHA1 (cups-1.7.4-source.tar.bz2) = f6eaf9f5b60992e678868719c8ee81841972a9d0 RMD160 (cups-1.7.4-source.tar.bz2) = 93074532d4051e7a2289c22d38ca8b5b1a86bbee @@ -15,6 +15,7 @@ SHA1 (patch-at) = 66222cb2ab84d5889cd6d42fa08827e1a4e8c178 SHA1 (patch-conf_Makefile) = bb076cc51309477c95940bd437f0892e41337516 SHA1 (patch-config-scripts_cups-gssapi.m4) = 7c8b0dd893b9d21597088062711cc50f13031338 SHA1 (patch-config.h.in) = c18c4afac00eb2c4e03e5886095152091fd217aa +SHA1 (patch-data_Makefile) = 090e240f851dfb062c7f645dcbe0d15d67f283bc SHA1 (patch-ppdc_Makefile) = a45af3310e706dd6433f029c55cf62e492de3448 SHA1 (patch-scheduler_auth.c) = 70f1eda9d6d81eabc080c037fac0c2d4bb229db4 SHA1 (patch-scheduler_dirsvc.c) = 4d1a3945401c03a8f1b557129b73c57459703b69 diff --git a/print/cups/patches/patch-data_Makefile b/print/cups/patches/patch-data_Makefile new file mode 100644 index 00000000000..22209bf303b --- /dev/null +++ b/print/cups/patches/patch-data_Makefile @@ -0,0 +1,28 @@ +$NetBSD: patch-data_Makefile,v 1.1 2014/08/22 21:54:39 wiz Exp $ + +Do not install banner files and testprint to avoid conflict with +cups-filters, which installs them too. + +https://bugs.linuxfoundation.org/show_bug.cgi?id=1222 + +--- data/Makefile.orig 2013-05-29 11:51:34.000000000 +0000 ++++ data/Makefile +@@ -19,16 +19,9 @@ include ../Makedefs + # Data files... + # + +-BANNERS = \ +- classified \ +- confidential \ +- secret \ +- standard \ +- topsecret \ +- unclassified ++BANNERS = + +-DATAFILES = \ +- testprint ++DATAFILES = + + PPDCFILES = \ + epson.h \ |