Index: head/print/foomatic-db-engine/Makefile =================================================================== --- head/print/foomatic-db-engine/Makefile (revision 468198) +++ head/print/foomatic-db-engine/Makefile (revision 468199) @@ -1,42 +1,41 @@ # Created by: Martin Ranne # $FreeBSD$ PORTNAME= foomatic-db-engine -PORTVERSION= 4.0.12 -PORTREVISION= 1 +PORTVERSION= 4.0.13 PORTEPOCH= 2 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/foomatic/ MAINTAINER= bofh@FreeBSD.org COMMENT= Foomatic database engine LICENSE= GPLv2 LIB_DEPENDS= libcurl.so:ftp/curl -USE_GNOME= libxml2 USES= gmake perl5 +USE_GNOME= libxml2 GNU_CONFIGURE= yes CONFIGURE_ENV= PERL=${PERL} LIBDIR=${PREFIX}/share/foomatic/ \ LIB_CUPS=${LOCALBASE}/libexec/cups \ CUPS_FILTERS=${LOCALBASE}/libexec/cups/filters \ CUPS_BACKENDS=${LOCALBASE}/libexec/cups/backends MAKE_JOBS_UNSAFE= yes post-patch: @${REINPLACE_CMD} -e \ "s,sysconfdir=/etc,sysconfdir=\'${PREFIX}/etc\',g ; \ s,/usr/local/etc:,${PREFIX}/etc:,g" ${WRKSRC}/configure @${REINPLACE_CMD} -e \ "s,/usr/local/bin:,${PREFIX}/bin:,g" ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ "/if \[ -d/ s,LIB_CUPS,PREFIX," ${WRKSRC}/Makefile.in post-install: .for file in foomatic-combo-xml foomatic-perl-data ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor .include Index: head/print/foomatic-db-engine/distinfo =================================================================== --- head/print/foomatic-db-engine/distinfo (revision 468198) +++ head/print/foomatic-db-engine/distinfo (revision 468199) @@ -1,2 +1,3 @@ -SHA256 (foomatic-db-engine-4.0.12.tar.gz) = 66143b76ed5b325b7025e261ad917b543de534c6d0a6e495d5489a20cace7c21 -SIZE (foomatic-db-engine-4.0.12.tar.gz) = 360499 +TIMESTAMP = 1524530260 +SHA256 (foomatic-db-engine-4.0.13.tar.gz) = b5c89027aa26967d2e6db62e2af7db0c4039d2480d4fbf2476a6ddcf609a5faf +SIZE (foomatic-db-engine-4.0.13.tar.gz) = 360631 Index: head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in =================================================================== --- head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in (revision 468198) +++ head/print/foomatic-db-engine/files/patch-foomatic-getpjloptions.in (revision 468199) @@ -1,44 +1,50 @@ Do not require bash -- BSD sh(1) is perfectly capable of executing this script. While here, replace use of perl in removal of some characters from streams with the much lighter tr(1) invocations. Strip out carriage-returns (\r) characters from remote printer's responses too. Remove useless braces around variable-names. -mi ---- foomatic-getpjloptions.in 2015-02-14 07:21:56.000000000 -0500 -+++ foomatic-getpjloptions.in 2015-02-15 07:36:23.000000000 -0500 -@@ -1,3 +1,3 @@ +--- foomatic-getpjloptions.in.orig 2018-03-02 19:15:50 UTC ++++ foomatic-getpjloptions.in +@@ -1,4 +1,4 @@ -#!@SH@ +#!/bin/sh # # Polls PJL options from local or network printers -@@ -23,6 +23,5 @@ + # +@@ -22,8 +22,7 @@ + NC=@NC@ CAT=@CAT@ -PRINTF=@PRINTF@ -PERL=@PERL@ +PRINTF=printf # sh builtin usage(){ -@@ -63,12 +62,13 @@ + cat </dev/null | ${PERL} -p -e "s/\014//" ++ # as well as the carriage-returns (\r or, in octal, 015) + $NC -w 3 $1 $2 2>/dev/null | tr -d "\015\014" else # We have one argument, do local printer request # Send commands to printer port - ${CAT} > ${1} + $CAT > $1 # Wait ten seconds for the printer to process the request sleep 10 # Poll the printer's answer and filter out the newpage and CR characters - ${CAT} < ${1} | ${PERL} -p -e "s/[\015\014]//" + exec tr -d "\015\014" < $1 fi