On Fri, Apr 25, 2008 at 05:46:36PM +0200, Bernd Ahlers wrote:
> Hey!
>
> Attached is an update to cups-pdf-2.4.7.
>
> I made it install the cups-pdf-dispatch tool which is nice for
> sending the PDFs via email.
>
> Please test and comment.
>
> Thanks,
> Bernd
hey, ok with me. i had the same lying around.
cheers,
jasper
> Makefile | 22 +++++++++++++++++-----
> distinfo | 10 +++++-----
> patches/patch-extra_cups-pdf_conf | 12 ++++++++++++
> patches/patch-src_cups-pdf_c | 8 ++++----
> patches/patch-src_cups-pdf_h | 12 ++++++------
> pkg/PLIST | 6 +++++-
> 6 files changed, 49 insertions(+), 21 deletions(-)
>
> Index: Makefile
> ===================================================================
> RCS file: /home/OpenBSD/cvs/ports/print/cups-pdf/Makefile,v
> retrieving revision 1.6
> diff -u -p -r1.6 Makefile
> --- Makefile 15 Sep 2007 21:36:44 -0000 1.6
> +++ Makefile 25 Apr 2008 15:39:27 -0000
> @@ -2,8 +2,7 @@
>
> COMMENT= PDF backend for CUPS
>
> -DISTNAME= cups-pdf-2.4.2
> -PKGNAME= ${DISTNAME}p1
> +DISTNAME= cups-pdf-2.4.7
> CATEGORIES= print
>
> HOMEPAGE= http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/
> @@ -19,22 +18,35 @@ PERMIT_DISTFILES_FTP= Yes
> WANTLIB= c
>
> RUN_DEPENDS= ::print/cups \
> - ::print/ghostscript/gnu
> + ::print/ghostscript/gnu \
> + ::mail/p5-MIME-Lite \
> + ::mail/p5-MIME-tools
>
> NO_REGRESS= Yes
>
> +SUBST_VARS= LOCALBASE
> +
> do-build:
> ${CC} ${CFLAGS} -o ${WRKDIR}/bin/cups-pdf
> ${WRKDIR}/${DISTNAME}/src/cups-pdf.c
>
> +pre-install:
> + ${SUBST_CMD} ${WRKBUILD}/extra/cups-pdf.conf
> +
> do-install:
> ${INSTALL_PROGRAM_DIR} ${PREFIX}/libexec/cups/backend
> ${INSTALL_DATA_DIR} ${PREFIX}/share/cups/model
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/cups
> ${INSTALL_PROGRAM} ${WRKDIR}/bin/cups-pdf \
> ${PREFIX}/libexec/cups/backend/cups-pdf
> - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/extra/PostscriptColor.ppd \
> - ${PREFIX}/share/cups/model/PostscriptColor.ppd
> + ${INSTALL_SCRIPT}
> ${WRKBUILD}/contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch \
> + ${PREFIX}/bin
> + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/extra/CUPS-PDF.ppd \
> + ${PREFIX}/share/cups/model/
> ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/extra/cups-pdf.conf \
> + ${PREFIX}/share/examples/cups/
> + ${INSTALL_DATA}
> ${WRKBUILD}/contrib/cups-pdf-dispatch-0.1/cups-pdf-dispatch.conf \
> + ${PREFIX}/share/examples/cups/
> + ${INSTALL_DATA}
> ${WRKBUILD}/contrib/cups-pdf-dispatch-0.1/examples/cups-pdf-dispatch-ldap.conf
> \
> ${PREFIX}/share/examples/cups/
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /home/OpenBSD/cvs/ports/print/cups-pdf/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo 5 Apr 2007 16:20:18 -0000 1.2
> +++ distinfo 24 Apr 2008 06:14:11 -0000
> @@ -1,5 +1,5 @@
> -MD5 (cups-pdf_2.4.2.tar.gz) = l7IaudyYZZv84X2pIe4nkA==
> -RMD160 (cups-pdf_2.4.2.tar.gz) = djEmjiCmzmzCVQEa+WmGUFl/Wwg=
> -SHA1 (cups-pdf_2.4.2.tar.gz) = P0XxcPhRsEwujV3Vz19JYKpSdOw=
> -SHA256 (cups-pdf_2.4.2.tar.gz) = HIYgGdC4HER3tzxG8TYTt3Bbx/x3ufZcxHotmguJhII=
> -SIZE (cups-pdf_2.4.2.tar.gz) = 33523
> +MD5 (cups-pdf_2.4.7.tar.gz) = Rvc1UzNoQt1nUh2hF7/Gfg==
> +RMD160 (cups-pdf_2.4.7.tar.gz) = 5CMuFfq7EE+zE9N6Z36jDvvf2dE=
> +SHA1 (cups-pdf_2.4.7.tar.gz) = 0BtP82cOCf5/nAMgfQ0f/8UqZzc=
> +SHA256 (cups-pdf_2.4.7.tar.gz) = EU0rHbSbNxJuL1lkBJs1ngvVrOGRoBk9pKdvYiLjFjQ=
> +SIZE (cups-pdf_2.4.7.tar.gz) = 34243
> Index: patches/patch-extra_cups-pdf_conf
> ===================================================================
> RCS file: patches/patch-extra_cups-pdf_conf
> diff -N patches/patch-extra_cups-pdf_conf
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-extra_cups-pdf_conf 24 Apr 2008 06:31:40 -0000
> @@ -0,0 +1,12 @@
> +$OpenBSD$
> +--- extra/cups-pdf.conf.orig Sun Mar 23 22:37:20 2008
> ++++ extra/cups-pdf.conf Thu Apr 24 08:31:28 2008
> +@@ -241,7 +241,7 @@
> + ## set this to an empty value to use no postprocessing
> + ### Default: <empty>
> +
> +-#PostProcessing
> ++#PostProcessing ${LOCALBASE}/bin/cups-pdf-dispatch
> +
> +
> + ###########################################################################
> Index: patches/patch-src_cups-pdf_c
> ===================================================================
> RCS file:
> /home/OpenBSD/cvs/ports/print/cups-pdf/patches/patch-src_cups-pdf_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-src_cups-pdf_c
> --- patches/patch-src_cups-pdf_c 3 Oct 2006 14:21:42 -0000 1.1.1.1
> +++ patches/patch-src_cups-pdf_c 24 Apr 2008 06:15:32 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-src_cups-pdf_c,v 1.1.1.1 2006/10/03 14:21:42 mbalmer Exp $
> ---- src/cups-pdf.c.orig Sun May 14 14:51:17 2006
> -+++ src/cups-pdf.c Mon May 15 17:16:40 2006
> -@@ -146,11 +146,11 @@ void log_event(char type, char message[4
> +--- src/cups-pdf.c.orig Sun Mar 23 22:47:57 2008
> ++++ src/cups-pdf.c Thu Apr 24 08:14:16 2008
> +@@ -161,11 +161,11 @@ static void log_event(short type, char message[], char
> timestring[strlen(timestring)-1]='\0';
>
> if (type == CPERROR)
> @@ -16,7 +16,7 @@ $OpenBSD: patch-src_cups-pdf_c,v 1.1.1.1
> if (detail != NULL) {
> while (detail[strlen(detail)-1] == '\n')
> detail[strlen(detail)-1]='\0';
> -@@ -568,7 +568,7 @@ int preparespoolfile(FILE *fpsrc, char *
> +@@ -593,7 +593,7 @@ static int preparespoolfile(FILE *fpsrc, char *spoolfi
> }
> else {
> if (conf.label) {
> Index: patches/patch-src_cups-pdf_h
> ===================================================================
> RCS file:
> /home/OpenBSD/cvs/ports/print/cups-pdf/patches/patch-src_cups-pdf_h,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-src_cups-pdf_h
> --- patches/patch-src_cups-pdf_h 3 Oct 2006 14:21:42 -0000 1.1.1.1
> +++ patches/patch-src_cups-pdf_h 24 Apr 2008 06:15:32 -0000
> @@ -1,15 +1,15 @@
> $OpenBSD: patch-src_cups-pdf_h,v 1.1.1.1 2006/10/03 14:21:42 mbalmer Exp $
> ---- src/cups-pdf.h.orig Sun May 14 14:51:10 2006
> -+++ src/cups-pdf.h Mon May 15 15:17:53 2006
> -@@ -67,9 +67,9 @@ struct {
> - void _set_defaults() {
> +--- src/cups-pdf.h.orig Sun Mar 23 22:18:55 2008
> ++++ src/cups-pdf.h Thu Apr 24 08:15:07 2008
> +@@ -67,9 +67,9 @@ static struct {
> + static void _set_defaults() {
> snprintf(conf.anondirname,BUFSIZE,"%s","/var/spool/cups-pdf/ANONYMOUS");
> snprintf(conf.anonuser,BUFSIZE,"%s","nobody");
> - snprintf(conf.ghostscript,BUFSIZE,"/usr/bin/gs");
> + snprintf(conf.ghostscript,BUFSIZE,"/usr/local/bin/gs");
> - snprintf(conf.gscall,BUFSIZE,"%s","%s -q -dCompatibilityLevel=%s
> -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\"
> -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false
> -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c save pop -f %s");
> + snprintf(conf.gscall,BUFSIZE,"%s","%s -q -dCompatibilityLevel=%s
> -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\"
> -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false
> -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f
> %s");
> - snprintf(conf.grp,BUFSIZE,"%s","lp");
> + snprintf(conf.grp,BUFSIZE,"%s","_cups");
> - snprintf(conf.gstmp,BUFSIZE,"%s","/var/tmp");
> + snprintf(conf.gstmp,BUFSIZE,"%s","TMPDIR=/var/tmp");
> snprintf(conf.log,BUFSIZE,"%s","/var/log/cups");
> snprintf(conf.pdfver,BUFSIZE,"%s","1.4");
> Index: pkg/PLIST
> ===================================================================
> RCS file: /home/OpenBSD/cvs/ports/print/cups-pdf/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 3 Jul 2007 23:37:25 -0000 1.2
> +++ pkg/PLIST 24 Apr 2008 06:29:06 -0000
> @@ -1,7 +1,11 @@
> @comment $OpenBSD: PLIST,v 1.2 2007/07/03 23:37:25 jakemsr Exp $
> +bin/cups-pdf-dispatch
> @mode 0700
> libexec/cups/backend/cups-pdf
> @mode
> -share/cups/model/PostscriptColor.ppd
> +share/cups/model/CUPS-PDF.ppd
> +share/examples/cups/cups-pdf-dispatch-ldap.conf
> +share/examples/cups/cups-pdf-dispatch.conf
> [EMAIL PROTECTED] ${SYSCONFDIR}/cups/cups-pdf-dispatch.conf
> share/examples/cups/cups-pdf.conf
> @sample ${SYSCONFDIR}/cups/cups-pdf.conf
>
--
"Intelligence should guide our actions, but in harmony with the
texture of the situation at hand"
-- Francisco Varela
