svn commit: r354566 - in head/print/foomatic-filters: . files

[Kris Moore]

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) {