Bugfix update to cups-filters-1.0.24.

print/cups-filters/Makefile

@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2012/09/01 18:35:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2012/09/08 07:55:30 ajacoutot Exp $
+
+# XXX remove @exec-update when we branch 5.4-current
 
 COMMENT=	OpenPrinting CUPS filters
 
-DISTNAME=	cups-filters-1.0.23
+DISTNAME=	cups-filters-1.0.24
 CATEGORIES=	print
 
 SHARED_LIBS +=  cupsfilters               0.0 # 1.0
@@ -35,7 +37,7 @@ BUILD_DEPENDS=	print/ghostscript/gnu
 LIB_DEPENDS=	print/cups,-libs \
 		print/ijs \
 		print/poppler \
-		print/qpdf
+		print/qpdf>=3.0.2
 
 # make it easier for users: bring in foomatic-filters, ghostscript
 # (with gstoraster) and allow the regeneration of PPD files from

print/cups-filters/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cups-filters-1.0.23.tar.gz) = olTRzo7CKPkuOXwPoETfe4JkEvPR92AufsPEzXu+FSo=
+SHA256 (cups-filters-1.0.24.tar.gz) = o/ixE9Wh2A2loVizIet9yaXHUdIycJH+1/9BhJahnMU=
-SIZE (cups-filters-1.0.23.tar.gz) = 1262559
+SIZE (cups-filters-1.0.24.tar.gz) = 1264570

print/cups-filters/patches/patch-filter_pdftopdf_intervalset_cc

@@ -1,24 +0,0 @@
-$OpenBSD: patch-filter_pdftopdf_intervalset_cc,v 1.1 2012/09/01 18:35:15 ajacoutot Exp $
-
-https://bugs.linuxfoundation.org/show_bug.cgi?id=1062
-
---- filter/pdftopdf/intervalset.cc.orig	Sat Sep  1 15:35:55 2012
-+++ filter/pdftopdf/intervalset.cc	Sat Sep  1 15:37:38 2012
-@@ -4,7 +4,7 @@
- #include <limits>
- #include <algorithm>
- 
--const key_t IntervalSet::npos=std::numeric_limits<key_t>::max();
-+const IntervalSet::key_t IntervalSet::npos=std::numeric_limits<IntervalSet::key_t>::max();
- 
- void IntervalSet::clear() // {{{
- {
-@@ -56,7 +56,7 @@ bool IntervalSet::contains(key_t val) const // {{{
- }
- // }}}
- 
--key_t IntervalSet::next(key_t val) const // {{{
-+IntervalSet::key_t IntervalSet::next(key_t val) const // {{{
- {
-   val++;
-   data_t::const_iterator it=std::upper_bound(data.begin(),data.end(),std::make_pair(val,npos));

print/cups-filters/pkg/PLIST

@@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/08/04 14:36:09 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.2 2012/09/08 07:55:30 ajacoutot Exp $
 @conflict cups-<1.6.0
+@exec-update [ -h ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf ] && rm -f ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf || true
 %%SHARED%%
 @bin bin/ttfread
 include/cupsfilters/
@@ -18,9 +19,11 @@ lib/libfontembed.la
 lib/pkgconfig/
 lib/pkgconfig/libcupsfilters.pc
 lib/pkgconfig/libfontembed.pc
+libexec/cups/
 libexec/cups/backend/
 @bin libexec/cups/backend/parallel
 @bin libexec/cups/backend/serial
+libexec/cups/filter/
 @bin libexec/cups/filter/bannertopdf
 @bin libexec/cups/filter/commandtoescpx
 @bin libexec/cups/filter/commandtopclx
@@ -38,6 +41,7 @@ libexec/cups/filter/pstopdf
 libexec/cups/filter/textonly
 @bin libexec/cups/filter/texttopdf
 libexec/cups/filter/texttops
+share/cups/
 share/cups/banners/
 share/cups/banners/classified
 share/cups/banners/confidential
@@ -66,13 +70,10 @@ share/doc/cups-filters/NEWS
 share/doc/cups-filters/README
 share/examples/cups-filters/
 share/examples/cups-filters/99pdftoopvp.conf
-@sample ${SYSCONFDIR}/fonts/conf.avail/99-pdftoopvp.conf
+@sample ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf
 share/ppd/
 share/ppd/cupsfilters/
 share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd
 share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd
 share/ppd/cupsfilters/HP-PhotoSmart_Pro_B8300-hpijs-pdftoijs.ppd
 share/ppd/cupsfilters/textonly.ppd
-@comment XXX should be exec-add but since we have a @conflict pkg_add(1) may turn it into an exec-update
-@exec ln -sf ../conf.avail/99-pdftoopvp.conf ${SYSCONFDIR}/fonts/conf.d/
-@unexec-delete rm ${SYSCONFDIR}/fonts/conf.d/99-pdftoopvp.conf