From owner-svn-ports-head@FreeBSD.ORG Mon May 19 18:06:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B1758F6; Mon, 19 May 2014 18:06:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E39A25A3; Mon, 19 May 2014 18:06:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JI6Ebp021555; Mon, 19 May 2014 18:06:14 GMT (envelope-from kmoore@svn.freebsd.org) Received: (from kmoore@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JI6DtP021553; Mon, 19 May 2014 18:06:13 GMT (envelope-from kmoore@svn.freebsd.org) Message-Id: <201405191806.s4JI6DtP021553@svn.freebsd.org> From: Kris Moore Date: Mon, 19 May 2014 18:06:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354566 - in head/print/foomatic-filters: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 18:06:14 -0000 Author: kmoore Date: Mon May 19 18:06:13 2014 New Revision: 354566 URL: http://svnweb.freebsd.org/changeset/ports/354566 QAT: https://qat.redports.org/buildarchive/r354566/ Log: - Fix foomaticrip to use correct location for pdftops - Bump PORTREV Modified: head/print/foomatic-filters/Makefile head/print/foomatic-filters/files/patch-foomaticrip.c Modified: head/print/foomatic-filters/Makefile ============================================================================== --- head/print/foomatic-filters/Makefile Mon May 19 18:05:21 2014 (r354565) +++ head/print/foomatic-filters/Makefile Mon May 19 18:06:13 2014 (r354566) @@ -3,7 +3,7 @@ PORTNAME= foomatic-filters PORTVERSION= 4.0.17 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/foomatic/ @@ -72,6 +72,7 @@ RUN_DEPENDS+= mpage:${PORTSDIR}/print/mp post-patch: @${REINPLACE_CMD} -e 's|/bin/bash|${SH}|g' ${WRKSRC}/foomaticrip.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/foomaticrip.c @${REINPLACE_CMD} -e '/filter.conf/ s|if|#if|g' ${WRKSRC}/Makefile.in post-install: Modified: head/print/foomatic-filters/files/patch-foomaticrip.c ============================================================================== --- head/print/foomatic-filters/files/patch-foomaticrip.c Mon May 19 18:05:21 2014 (r354565) +++ head/print/foomatic-filters/files/patch-foomaticrip.c Mon May 19 18:06:13 2014 (r354566) @@ -1,6 +1,24 @@ ---- foomaticrip.c.orig 2014-04-26 11:32:42.578342305 +0400 -+++ foomaticrip.c 2014-04-26 11:44:16.016294870 +0400 -@@ -1197,7 +1197,8 @@ int main(int argc, char** argv) +--- foomaticrip.c.orig 2012-07-02 10:50:46.000000000 -0400 ++++ foomaticrip.c 2014-05-19 10:28:46.588515788 -0400 +@@ -180,7 +180,7 @@ + "/opt/cups/filter:" + "/usr/lib/cups/filter"; + +-char modern_shell[64] = "/bin/bash"; ++char modern_shell[64] = "/bin/sh"; + + void config_set_option(const char *key, const char *value) + { +@@ -1061,7 +1061,7 @@ + Ghostscript is not available. */ + if (spooler == SPOOLER_CUPS) + snprintf(pdf2ps_cmd, PATH_MAX, +- "pdftops '%s' '%s' '%s' '%s' '%s' '%s'", ++ "%%LOCALBASE%%/libexec/cups/filter/pdftops '%s' '%s' '%s' '%s' '%s' '%s'", + job->id, job->user, job->title, "1", job->optstr->data, + filename); + else +@@ -1197,7 +1197,8 @@ debug = 1; if (debug) {