Index: branches/2014Q2/print/cups-filters/Makefile =================================================================== --- branches/2014Q2/print/cups-filters/Makefile (revision 350256) +++ branches/2014Q2/print/cups-filters/Makefile (revision 350257) @@ -1,49 +1,52 @@ # $FreeBSD$ PORTNAME= cups-filters -PORTVERSION= 1.0.42 +PORTVERSION= 1.0.50 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ MAINTAINER= ports@FreeBSD.org COMMENT= Backends, filters and other software (was part of the core CUPS) LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ libtiff.so:${PORTSDIR}/graphics/tiff \ libpng15.so:${PORTSDIR}/graphics/png \ libijs.so:${PORTSDIR}/print/libijs \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libqpdf.so:${PORTSDIR}/print/qpdf \ libdbus-1.so:${PORTSDIR}/devel/dbus \ libcups.so:${PORTSDIR}/print/cups-client \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libpoppler.so:${PORTSDIR}/graphics/poppler -USES= compiler:c++11-lib pathfix pkgconfig tar:xz +USES= compiler:c++11-lib pathfix pkgconfig shebangfix tar:xz +SHEBANG_FILES= filter/textonly USE_GNOME= glib20 USE_GHOSTSCRIPT= yes GNU_CONFIGURE= yes CUPS_SOCKET= /var/run/cups.sock CONFIGURE_ARGS= --with-domainsocket=${CUPS_SOCKET} CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz" \ LIBQPDF_CFLAGS="-I/usr/local/include" LIBQPDF_LIBS="-lqpdf" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes OPTIONS_DEFINE= AVAHI OPTIONS_DEFAULT= AVAHI AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app post-patch: @${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in post-install: @${RM} -rf ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip \ ${STAGEDIR}${PREFIX}/man/man1/foomatic-rip.1 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupsfilters.so.1 \ + ${STAGEDIR}${PREFIX}/lib/libfontembed.so.1 .include Index: branches/2014Q2/print/cups-filters/distinfo =================================================================== --- branches/2014Q2/print/cups-filters/distinfo (revision 350256) +++ branches/2014Q2/print/cups-filters/distinfo (revision 350257) @@ -1,2 +1,2 @@ -SHA256 (cups-filters-1.0.42.tar.xz) = 3df524207ab24472430cffba7f01407b8adc094ec40094c5f6682d5a88a70dd6 -SIZE (cups-filters-1.0.42.tar.xz) = 1097860 +SHA256 (cups-filters-1.0.50.tar.xz) = 771bdaeaa171cfb3850b229d5d167bde2abcd40b900075ae72d4867acc8adbe7 +SIZE (cups-filters-1.0.50.tar.xz) = 1309912 Index: branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c =================================================================== --- branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c (revision 350256) +++ branches/2014Q2/print/cups-filters/files/patch-utils_cups-browsed.c (revision 350257) @@ -1,18 +1,20 @@ ---- utils/cups-browsed.c.orig 2013-12-27 20:45:55.188455147 +0400 -+++ utils/cups-browsed.c 2013-12-27 20:46:23.397446686 +0400 -@@ -23,7 +23,6 @@ +--- utils/cups-browsed.c.orig 2014-04-05 16:31:42.635763683 +0400 ++++ utils/cups-browsed.c 2014-04-05 16:37:07.384740688 +0400 +@@ -23,8 +23,7 @@ #include #include -#include - #if defined(__OpenBSD__) +-#if defined(__OpenBSD__) ++#if defined(__OpenBSD__) || defined(__FreeBSD__) #include #endif /* __OpenBSD__ */ + #include @@ -33,6 +32,7 @@ #include #include #include +#include #include #include #include Index: branches/2014Q2/print/cups-filters/pkg-plist =================================================================== --- branches/2014Q2/print/cups-filters/pkg-plist (revision 350256) +++ branches/2014Q2/print/cups-filters/pkg-plist (revision 350257) @@ -1,94 +1,100 @@ bin/ttfread etc/cups/cups-browsed.conf etc/fonts/conf.d/99pdftoopvp.conf include/cupsfilters/colord.h include/cupsfilters/driver.h include/cupsfilters/image.h include/cupsfilters/raster.h include/fontembed/bitset.h include/fontembed/embed.h include/fontembed/fontfile.h include/fontembed/iofn.h include/fontembed/sfnt.h lib/libcupsfilters.a lib/libcupsfilters.la lib/libcupsfilters.so lib/libcupsfilters.so.1 lib/libfontembed.a lib/libfontembed.la lib/libfontembed.so lib/libfontembed.so.1 libdata/pkgconfig/libcupsfilters.pc libdata/pkgconfig/libfontembed.pc libexec/cups/backend/parallel libexec/cups/backend/serial libexec/cups/filter/bannertopdf libexec/cups/filter/commandtoescpx libexec/cups/filter/commandtopclx libexec/cups/filter/gstopxl libexec/cups/filter/gstoraster libexec/cups/filter/imagetopdf libexec/cups/filter/imagetops libexec/cups/filter/imagetoraster libexec/cups/filter/pdftoijs libexec/cups/filter/pdftoippprinter libexec/cups/filter/pdftoopvp libexec/cups/filter/pdftopdf libexec/cups/filter/pdftops libexec/cups/filter/pdftoraster libexec/cups/filter/pstopdf libexec/cups/filter/rastertoescpx libexec/cups/filter/rastertopclx libexec/cups/filter/textonly libexec/cups/filter/texttopdf libexec/cups/filter/texttops libexec/cups/filter/urftopdf man/man5/cups-browsed.conf.5.gz man/man8/cups-browsed.8.gz sbin/cups-browsed share/cups/banners/classified share/cups/banners/confidential +share/cups/banners/form share/cups/banners/secret share/cups/banners/standard share/cups/banners/topsecret share/cups/banners/unclassified share/cups/charsets/pdf.utf-8 share/cups/charsets/pdf.utf-8.heavy share/cups/charsets/pdf.utf-8.simple share/cups/data/default-testpage.pdf share/cups/data/default.pdf +share/cups/data/form_english.pdf +share/cups/data/form_english_in.odt +share/cups/data/form_russian.pdf +share/cups/data/form_russian_in.odt share/cups/data/testprint share/cups/drv/cupsfilters.drv share/cups/mime/cupsfilters.convs share/cups/mime/cupsfilters.types share/cups/ppdc/escp.h share/cups/ppdc/pcl.h %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README +share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd 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/pxlcolor.ppd share/ppd/cupsfilters/pxlmono.ppd share/ppd/cupsfilters/textonly.ppd @dirrmtry share/ppd/cupsfilters @dirrmtry share/ppd %%PORTDOCS%%@dirrmtry %%DOCSDIR%% @dirrmtry share/cups/ppdc @dirrmtry share/cups/mime @dirrmtry share/cups/drv @dirrmtry share/cups/data @dirrmtry share/cups/charsets @dirrmtry share/cups/banners @dirrmtry share/cups @dirrmtry libexec/cups/filter @dirrmtry libexec/cups/backend @dirrmtry libexec/cups @dirrmtry include/fontembed @dirrmtry include/cupsfilters @dirrmtry etc/fonts/conf.d @dirrmtry etc/fonts @dirrmtry etc/cups Index: branches/2014Q2 =================================================================== --- branches/2014Q2 (revision 350256) +++ branches/2014Q2 (revision 350257) Property changes on: branches/2014Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r350243