Index: branches/2019Q4/print/cups-filters/Makefile =================================================================== --- branches/2019Q4/print/cups-filters/Makefile (revision 520042) +++ branches/2019Q4/print/cups-filters/Makefile (revision 520043) @@ -1,138 +1,139 @@ # $FreeBSD$ PORTNAME= cups-filters PORTVERSION= 1.25.6 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= https://www.openprinting.org/download/cups-filters/ MAINTAINER= tijl@FreeBSD.org COMMENT= Additional backends, filters and other software for CUPS LICENSE= BSD4CLAUSE GPLv2 GPLv2+ GPLv3 GPLv3+ LGPL20 LGPL21+ MIT LICENSE_COMB= multi LIB_DEPENDS= liblcms2.so:graphics/lcms2 \ libqpdf.so:print/qpdf \ libcupsimage.so:print/cups \ libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig USES= compiler:c++11-lib cpe gmake gnome iconv libtool localbase \ pkgconfig shebangfix tar:xz USE_GNOME= glib20 USE_LDCONFIG= yes USE_RC_SUBR= cups_browsed CONFLICTS= cups-pstoraster-[0-9]* foomatic-filters-[0-9]* CPE_VENDOR= linuxfoundation SHEBANG_FILES= filter/braille/drivers/generic/brftoembosser.in \ filter/braille/drivers/index/imageubrltoindexv3.in \ filter/braille/drivers/index/imageubrltoindexv4.in \ filter/braille/drivers/index/textbrftoindexv3.in \ filter/braille/filters/brftopagedbrf.in \ filter/braille/filters/imagetobrf.in \ filter/braille/filters/liblouis1.defs.gen.in \ filter/braille/filters/musicxmltobrf.in \ filter/braille/filters/texttobrf.in \ filter/braille/filters/vectortobrf.in \ filter/braille/filters/vectortopdf.in GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-shell=/bin/sh --with-pdftops-path=${LOCALBASE}/bin/pdftops INSTALL_TARGET= install-strip OPTIONS_DEFINE= BRAILLE COLORD DOCS OPTIONS_GROUP= FILTERS CUPS_BROWSED OPTIONS_GROUP_FILTERS= GHOSTSCRIPT IMAGES MUPDF POPPLER OPTIONS_GROUP_CUPS_BROWSED= AVAHI LDAP OPTIONS_SINGLE= PDFTOPS OPTIONS_SINGLE_PDFTOPS= PSGHOSTSCRIPT PSHYBRID PSMUPDF PSPOPPLER OPTIONS_DEFAULT= COLORD GHOSTSCRIPT IMAGES AVAHI LDAP PSHYBRID OPTIONS_SUB= yes BRAILLE_CONFIGURE_ENABLE= braille BRAILLE_DESC= Braille embosser support BRAILLE_BUILD_DEPENDS= bash:shells/bash BRAILLE_LIB_DEPENDS= liblouis.so:devel/liblouis \ # liblouisutdml.so:devel/liblouisutdml BRAILLE_RUN_DEPENDS= convert:graphics/ImageMagick6 \ pdftotext:graphics/poppler-utils \ bash:shells/bash COLORD_CONFIGURE_ENABLE= dbus COLORD_DESC= Get ICC color profiles from colord (via D-Bus) COLORD_LIB_DEPENDS= libdbus-1.so:devel/dbus COLORD_RUN_DEPENDS= colord>0:graphics/colord # Filters FILTERS_DESC= Filters GHOSTSCRIPT_CONFIGURE_ENABLE= ghostscript GHOSTSCRIPT_DESC= PS-to-PDF and PS/PDF-to-raster using Ghostscript GHOSTSCRIPT_USES= ghostscript IMAGES_CONFIGURE_ENABLE= imagefilters IMAGES_CONFIGURE_WITH= jpeg png tiff IMAGES_DESC= Accept JPEG, PNG, and TIFF files as input IMAGES_LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png IMAGES_USES= jpeg MUPDF_BUILD_DEPENDS= mutool:graphics/mupdf MUPDF_RUN_DEPENDS= mutool:graphics/mupdf MUPDF_CONFIGURE_ENABLE= mutool MUPDF_DESC= PDF-to-raster using MuPDF POPPLER_CONFIGURE_ENABLE= poppler POPPLER_DESC= PDF-to-raster using Poppler POPPLER_LIB_DEPENDS= libpoppler-cpp.so:graphics/poppler # cups-browsed(8) options CUPS_BROWSED_DESC= cups-browsed(8) options AVAHI_CONFIGURE_ENABLE= avahi AVAHI_CONFIGURE_OFF= --with-browseremoteprotocols=cups AVAHI_CONFIGURE_ON= --with-browseremoteprotocols="dnssd cups" AVAHI_DESC= Discover Zeroconf/Bonjour network printers AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= LDAP_CONFIGURE_ENABLE= ldap LDAP_DESC= Get printer locations from an LDAP server LDAP_USE= OPENLDAP=yes # Default PDF-to-PostScript renderer PDFTOPS_DESC= Default PDF-to-PostScript renderer PSGHOSTSCRIPT_CONFIGURE_ON= --with-pdftops=gs PSGHOSTSCRIPT_DESC= Ghostscript gs(1) PSGHOSTSCRIPT_IMPLIES= GHOSTSCRIPT PSHYBRID_BUILD_DEPENDS= pdftops:graphics/poppler-utils PSHYBRID_RUN_DEPENDS= pdftops:graphics/poppler-utils PSHYBRID_CONFIGURE_ON= --with-pdftops=hybrid PSHYBRID_DESC= Ghostscript or Poppler depending on printer PSHYBRID_IMPLIES= GHOSTSCRIPT PSMUPDF_CONFIGURE_ON= --with-pdftops=mupdf PSMUPDF_DESC= MuPDF mutool(1) PSMUPDF_IMPLIES= MUPDF PSPOPPLER_BUILD_DEPENDS= pdftops:graphics/poppler-utils PSPOPPLER_RUN_DEPENDS= pdftops:graphics/poppler-utils PSPOPPLER_CONFIGURE_ON= --with-pdftops=pdftops PSPOPPLER_DESC= Poppler pdftops(1) post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ -e 's|README.gz|README|' \ ${WRKSRC}/utils/cups-browsed.8 \ ${WRKSRC}/utils/cups-browsed.conf.5 \ ${WRKSRC}/utils/driverless.1 .include Index: branches/2019Q4/print/cups-filters/files/patch-backend-implicitclass.c =================================================================== --- branches/2019Q4/print/cups-filters/files/patch-backend-implicitclass.c (nonexistent) +++ branches/2019Q4/print/cups-filters/files/patch-backend-implicitclass.c (revision 520043) @@ -0,0 +1,29 @@ +--- backend/implicitclass.c.orig 2019-11-29 20:18:29 UTC ++++ backend/implicitclass.c +@@ -98,7 +98,7 @@ main(int argc, /* I - Number of command-line args + ipp_attribute_t *attr; + int bytes; /* Bytes copied */ + char uri[HTTP_MAX_URI]; +- char *argv_nt[7]; ++ char *argv_nt[8]; + int outbuflen,filefd,exit_status,dup_status; + static const char *pattrs[] = + { +@@ -350,6 +350,7 @@ main(int argc, /* I - Number of command-line args + /* We will send the filtered output of the pdftoippprinter.c to + the IPP Backend*/ + argv_nt[6] = tempfile_filter; ++ argv_nt[7] = NULL; + fprintf(stderr, "DEBUG: The filtered output of pdftoippprinter is written to file %s\n", + tempfile_filter); + +@@ -383,7 +384,8 @@ main(int argc, /* I - Number of command-line args + pid_t pid = fork(); + if ( pid == 0 ) { + fprintf(stderr, "DEBUG: Started IPP Backend with pid: %d\n",getpid()); +- execv("/usr/lib/cups/backend/ipp",argv_nt); ++ execv(CUPS_SERVERBIN "/backend/ipp",argv_nt); ++ exit(CUPS_BACKEND_FAILED); + } else { + int status; + waitpid(pid, &status, 0); Property changes on: branches/2019Q4/print/cups-filters/files/patch-backend-implicitclass.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2019Q4 =================================================================== --- branches/2019Q4 (revision 520042) +++ branches/2019Q4 (revision 520043) Property changes on: branches/2019Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r520041