Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Mar 2016 21:16:26 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411031 - in head/print/cups-filters: . files
Message-ID:  <201603132116.u2DLGQRF063855@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sun Mar 13 21:16:26 2016
New Revision: 411031
URL: https://svnweb.freebsd.org/changeset/ports/411031

Log:
  - Let foomatic-rip use /bin/sh instead of /bin/bash.
  - Patch foomatic-rip to reset stdin after replacing the underlying file
    descriptor.
  - Remove a patch for the pdftops filter that is no longer needed.
  
  Submitted by:	Alexander Zagrebin <alex@zagrebin.ru>

Added:
  head/print/cups-filters/files/patch-filter_foomatic-rip_foomaticrip.c   (contents, props changed)
Deleted:
  head/print/cups-filters/files/patch-filter_pdftops.c
Modified:
  head/print/cups-filters/Makefile

Modified: head/print/cups-filters/Makefile
==============================================================================
--- head/print/cups-filters/Makefile	Sun Mar 13 21:04:43 2016	(r411030)
+++ head/print/cups-filters/Makefile	Sun Mar 13 21:16:26 2016	(r411031)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cups-filters
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://www.openprinting.org/download/cups-filters/
 
@@ -36,7 +36,7 @@ SHEBANG_FILES=	filter/braille/drivers/ge
 USE_GNOME=	glib20
 USE_RC_SUBR=	cups_browsed
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
+CONFIGURE_ARGS=	--with-shell=/bin/sh ZLIB_CFLAGS=" " ZLIB_LIBS="-lz"
 INSTALL_TARGET=	install-strip
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -55,8 +55,6 @@ post-patch:
 	@${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} 's|/usr/share/liblouis|${LOCALBASE}/share/liblouis|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		${WRKSRC}/filter/pdftops.c
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		-e 's|README.gz|README|' \
 		${WRKSRC}/utils/cups-browsed.8 \

Added: head/print/cups-filters/files/patch-filter_foomatic-rip_foomaticrip.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/cups-filters/files/patch-filter_foomatic-rip_foomaticrip.c	Sun Mar 13 21:16:26 2016	(r411031)
@@ -0,0 +1,10 @@
+--- filter/foomatic-rip/foomaticrip.c.orig	2015-10-20 14:59:20 UTC
++++ filter/foomatic-rip/foomaticrip.c
+@@ -656,6 +656,7 @@ int print_file(const char *filename, int
+                     rip_die(EXIT_PRNERR_NORETRY_BAD_SETTINGS,
+                             "Couldn't dup stdout of pdf-to-ps\n");
+ 
++                clearerr(stdin);
+                 ret = print_file("<STDIN>", 0);
+ 
+                 wait_for_process(renderer_pid);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603132116.u2DLGQRF063855>