Date: Wed, 8 Jun 2005 10:09:50 +0200 From: Jose M Rodriguez <josemi@freebsd.jazztel.es> To: freebsd-ports@freebsd.org Cc: ports@freebsd.org, Simon Barner <barner@freebsd.org> Subject: Re: Please test: Prepare print/ghostscript-gpl for seamless integration with cups-pstoraster Message-ID: <200506081009.50967.josemi@redesjm.local> In-Reply-To: <20050606214325.GA2198@zi025.glhnet.mhn.de> References: <20050606214325.GA2198@zi025.glhnet.mhn.de>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_OfqpCf70Ta3/xwM
Content-Type: text/plain;
charset="iso-8859-13"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
El Lunes, 6 de Junio de 2005 23:43, Simon Barner escribi=F3:
> Hi,
>
> I am about to commit the following patch to print/ghostscript-gpl in
> order to implement another piece of ports/76731.
>
> I would ask you to
>
> - Update your ports collection in order to get the recent changes of
> the port (pcl3 support).
>
> - Apply the attached patch and see whether there are any
> regressions.
>
> Thanks in advance,
> Simon
I just worked a new version of the cups-pstoraster patch, using=20
espgs-8.15rc3 as base.
As some changes in pstoraster code have take place, please, test this=20
with gs-gnu and gs-gpl.
This patch uses the new gs ports (I'm using ports/81962 and=20
ports/81963).
You may test new gs-gpl port with GHOSTSCRIPT_PORT=3Dprint/ghostscript-gpl=
=20
in your /etc/make.conf
Also, I found cups Makefile.common import not usefull, so I drop it.
Thanks in advance,
=2D-
josemi
=2D-- patch-cups-pstoraster-8.15 begins here ---
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/Makefile=20
print/cups-pstoraster/Makefile
=2D-- /home/josemi/base/ports/print/cups-pstoraster/Makefile Tue Apr 12=20
05:26:23 2005
+++ print/cups-pstoraster/Makefile Wed Jun 8 09:47:02 2005
@@ -6,27 +6,34 @@
#
=20
PORTNAME=3D cups-pstoraster
=2DPORTVERSION=3D 7.07
=2DPORTREVISION=3D 3
+PORTVERSION=3D 8.15
CATEGORIES=3D print
=2DMASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} \
=2D ftp://ftp.easysw.com/pub/ghostscript/
=2DMASTER_SITE_SUBDIR=3D ghostscript espgs
=2DDISTFILES=3D ghostscript-${PORTVERSION}${EXTRACT_SUFX} \
=2D espgs-${ESPGS_VER}-source${EXTRACT_SUFX}
+MASTER_SITES=3D \
+=09
ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/ftp.easysw.com/pub/%SUBDIR%/=
=20
\
+ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ \
+ ftp://ftp2.easysw.com/pub/%SUBDIR%/ \
+ ftp://ftp3.easysw.com/pub/%SUBDIR%/ \
+ http://ftp.easysw.com/pub/%SUBDIR%/ \
+ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR=3D ghostscript/test
DIST_SUBDIR=3D ghostscript
=20
MAINTAINER=3D ports@FreeBSD.org
=2DCOMMENT=3D GNU Postscript interpreter for CUPS printing to non-PS=20
printers
+COMMENT=3D Postscript interpreter for CUPS printing to non-PS printers
=20
+PATCH_DEPENDS=3D ${NONEXISTENT}:${PORTSDIR}/${GHOSTSCRIPT_PORT}:patch
LIB_DEPENDS=3D cups.2:${PORTSDIR}/print/cups-base
=2DRUN_DEPENDS=3D=09
${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps:
${PORTSDIR}/print/ghostscript-gnu
=20
=2DESPGS_VER=3D 7.07.1
+ESPGS_VER=3D ${PORTVERSION}rc3
+
+DISTNAME=3D espgs-${ESPGS_VER}-source
+EXTRACT_AFTER_ARGS=3D | ${TAR} -xf - espgs-${ESPGS_VER}/pstoraster
ESPGS_WRKSRC=3D ${WRKDIR}/espgs-${ESPGS_VER}/pstoraster
=2DWRKSRC=3D ${WRKDIR}/ghostscript-${PORTVERSION}
+WRKSRC=3D =09
${WRKDIRPREFIX}${PORTSDIR}/${GHOSTSCRIPT_PORT}/work/ghostscript
+PATCH_WRKSRC=3D ${ESPGS_WRKSRC}
=20
USE_BZIP2=3D yes
+USE_GHOSTSCRIPT_RUN=3D yes
USE_REINPLACE=3D yes
USE_GMAKE=3D yes
GNU_CONFIGURE=3D yes
@@ -70,6 +77,5 @@
${INSTALL_DATA} ${ESPGS_WRKSRC}/${file} ${PREFIX}/share/cups/model
.endfor
=20
=2D.include "${.CURDIR}/../../print/cups/Makefile.common"
.include <bsd.port.pre.mk>
.include <bsd.port.post.mk>
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/distinfo=20
print/cups-pstoraster/distinfo
=2D-- /home/josemi/base/ports/print/cups-pstoraster/distinfo Mon Nov 15=20
05:19:05 2004
+++ print/cups-pstoraster/distinfo Wed Jun 8 09:04:19 2005
@@ -1,4 +1,2 @@
=2DMD5 (ghostscript/ghostscript-7.07.tar.bz2) =3D=20
85fd16cdc8232e5e3679a3a7e30a3359
=2DSIZE (ghostscript/ghostscript-7.07.tar.bz2) =3D 4138372
=2DMD5 (ghostscript/espgs-7.07.1-source.tar.bz2) =3D=20
d30bf5c09f2c7caa8291f6305cf03044
=2DSIZE (ghostscript/espgs-7.07.1-source.tar.bz2) =3D 5400198
+MD5 (ghostscript/espgs-8.15rc3-source.tar.bz2) =3D=20
e6fb2e581bd2b85368f7664be8d38186
+SIZE (ghostscript/espgs-8.15rc3-source.tar.bz2) =3D 7820124
diff=20
=2DNru /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstopxl.in=
=20
print/cups-pstoraster/files/patch-pstopxl.in
=2D-- /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstopxl.in=
=09
Thu Jan 1 01:00:00 1970
+++ print/cups-pstoraster/files/patch-pstopxl.in Wed Jun 8 09:48:03=20
2005
@@ -0,0 +1,20 @@
+--- pstopxl.in.orig Mon Feb 21 18:13:47 2005
++++ pstopxl.in Wed Jun 8 09:11:00 2005
+@@ -27,7 +27,7 @@
+ bindir=3D@bindir@
+=20
+ # Set the library/font path...
+-GS_LIB=3D"${CUPS_FONTPATH:=3D/usr/share/cups/fonts}"
++GS_LIB=3D"${CUPS_FONTPATH:=3D@prefix@/share/cups/fonts}"
+ export GS_LIB
+=20
+ # Determine the PCL XL/PCL 6 driver to use...
+@@ -56,7 +56,7 @@
+ ifile=3D"$6"
+ fi
+=20
+-echo INFO: Starting ESP Ghostscript=20
@GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
++echo INFO: Starting GNU/GPL Ghostscript... 1>&2
+ echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE=3D"%stdout"=20
"$ifile" 1>&2
+=20
+ # Now run Ghostscript...
diff=20
=2DNru /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstoraster=
=2Ein=20
print/cups-pstoraster/files/patch-pstoraster.in
=2D-- /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstoraster.=
in=09
Thu Jan 1 01:00:00 1970
+++ print/cups-pstoraster/files/patch-pstoraster.in Wed Jun 8 09:47:43=20
2005
@@ -0,0 +1,20 @@
+--- pstoraster.in.orig Wed Jun 8 09:11:26 2005
++++ pstoraster.in Wed Jun 8 09:13:19 2005
+@@ -27,7 +27,7 @@
+ bindir=3D@bindir@
+=20
+ # Set the library/font path...
+-GS_LIB=3D"${CUPS_FONTPATH:=3D/usr/share/cups/fonts}"
++GS_LIB=3D"${CUPS_FONTPATH:=3D@prefix@/share/cups/fonts}"
+ export GS_LIB
+=20
+ # Options we use with Ghostscript...
+@@ -51,7 +51,7 @@
+ ifile=3D"$6"
+ fi
+=20
+-echo INFO: Starting ESP Ghostscript=20
@GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
++echo INFO: Starting GNU/GPL Ghostscript... 1>&2
+ echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE=3D"%stdout"=20
=2Dc"$profile" "$ifile" 1>&2
+=20
+ # Now run Ghostscript...
diff=20
=2DNru /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:genarc=
h.c=20
print/cups-pstoraster/files/patch-src:genarch.c
=2D-- /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:genarch=
=2Ec=09
Thu Jul 25 05:00:17 2002
+++ print/cups-pstoraster/files/patch-src:genarch.c Wed Jun 8 09:05:19=20
2005
@@ -1,34 +0,0 @@
=2D--- src/genarch.c.orig Tue Jun 5 15:38:57 2001
=2D+++ src/genarch.c Wed Jun 20 04:17:42 2001
=2D@@ -41,6 +41,7 @@
=2D fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n",=20
str);
=2D }
=2D=20
=2D+#ifndef __FreeBSD__
=2D private clock_t
=2D time_clear(char *buf, int bsize, int nreps)
=2D {
=2D@@ -51,6 +52,7 @@
=2D memset(buf, 0, bsize);
=2D return clock() - t;
=2D }
=2D+#endif /* __FreeBSD__ */
=2D=20
=2D private void
=2D define(FILE *f, const char *str)
=2D@@ -181,6 +183,7 @@
=2D fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
=2D #undef PRINT_MAX
=2D=20
=2D+#ifndef __FreeBSD__
=2D section(f, "Cache sizes");
=2D=20
=2D /*
=2D@@ -241,6 +244,7 @@
=2D }
=2D define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
=2D }
=2D+#endif /* __FreeBSD__ */
=2D=20
=2D section(f, "Miscellaneous");
=2D=20
diff=20
=2DNru /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:gxobj.=
h=20
print/cups-pstoraster/files/patch-src:gxobj.h
=2D-- /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:gxobj.h=
=09
=46ri Nov 26 22:05:46 2004
+++ print/cups-pstoraster/files/patch-src:gxobj.h Wed Jun 8 09:05:19=20
2005
@@ -1,17 +0,0 @@
=2D--- src/gxobj.h.orig Fri Feb 22 19:45:59 2002
=2D+++ src/gxobj.h Thu Dec 19 00:16:57 2002
=2D@@ -99,10 +99,14 @@
=2D * The final | is because back pointer values are divided by=20
obj_back_scale,
=2D * so objects must be aligned at least 0 mod obj_back_scale.
=2D */
=2D+#if !defined(__ia64__) && !defined(__amd64__)
=2D #define obj_align_mod\
=2D (((arch_align_long_mod - 1) | (arch_align_ptr_mod - 1) |\
=2D (arch_align_double_mod - 1) | (align_bitmap_mod - 1) |\
=2D (obj_back_scale - 1)) + 1)
=2D+#else
=2D+#define obj_align_mod 16
=2D+#endif
=2D /* The only possible values for obj_align_mod are 4, 8, or 16.... */
=2D #if obj_align_mod =3D=3D 4
=2D # define log2_obj_align_mod 2
=2D-- patch-cups-pstoraster-8.15 ends here ---
--Boundary-00=_OfqpCf70Ta3/xwM
Content-Type: text/x-diff; charset="iso-8859-13";
name="patch-cups-pstoraster-8.15"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="patch-cups-pstoraster-8.15"
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/Makefile print/cups-pstoraster/Makefile
--- /home/josemi/base/ports/print/cups-pstoraster/Makefile Tue Apr 12 05:26:23 2005
+++ print/cups-pstoraster/Makefile Wed Jun 8 09:47:02 2005
@@ -6,27 +6,34 @@
#
PORTNAME= cups-pstoraster
-PORTVERSION= 7.07
-PORTREVISION= 3
+PORTVERSION= 8.15
CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
- ftp://ftp.easysw.com/pub/ghostscript/
-MASTER_SITE_SUBDIR= ghostscript espgs
-DISTFILES= ghostscript-${PORTVERSION}${EXTRACT_SUFX} \
- espgs-${ESPGS_VER}-source${EXTRACT_SUFX}
+MASTER_SITES= \
+ ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/ftp.easysw.com/pub/%SUBDIR%/ \
+ ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/ \
+ ftp://ftp2.easysw.com/pub/%SUBDIR%/ \
+ ftp://ftp3.easysw.com/pub/%SUBDIR%/ \
+ http://ftp.easysw.com/pub/%SUBDIR%/ \
+ http://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/%SUBDIR%/
+MASTER_SITE_SUBDIR= ghostscript/test
DIST_SUBDIR= ghostscript
MAINTAINER= ports@FreeBSD.org
-COMMENT= GNU Postscript interpreter for CUPS printing to non-PS printers
+COMMENT= Postscript interpreter for CUPS printing to non-PS printers
+PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/${GHOSTSCRIPT_PORT}:patch
LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
-RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/${PORTVERSION}/lib/gs_init.ps:${PORTSDIR}/print/ghostscript-gnu
-ESPGS_VER= 7.07.1
+ESPGS_VER= ${PORTVERSION}rc3
+
+DISTNAME= espgs-${ESPGS_VER}-source
+EXTRACT_AFTER_ARGS= | ${TAR} -xf - espgs-${ESPGS_VER}/pstoraster
ESPGS_WRKSRC= ${WRKDIR}/espgs-${ESPGS_VER}/pstoraster
-WRKSRC= ${WRKDIR}/ghostscript-${PORTVERSION}
+WRKSRC= ${WRKDIRPREFIX}${PORTSDIR}/${GHOSTSCRIPT_PORT}/work/ghostscript
+PATCH_WRKSRC= ${ESPGS_WRKSRC}
USE_BZIP2= yes
+USE_GHOSTSCRIPT_RUN= yes
USE_REINPLACE= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
@@ -70,6 +77,5 @@
${INSTALL_DATA} ${ESPGS_WRKSRC}/${file} ${PREFIX}/share/cups/model
.endfor
-.include "${.CURDIR}/../../print/cups/Makefile.common"
.include <bsd.port.pre.mk>
.include <bsd.port.post.mk>
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/distinfo print/cups-pstoraster/distinfo
--- /home/josemi/base/ports/print/cups-pstoraster/distinfo Mon Nov 15 05:19:05 2004
+++ print/cups-pstoraster/distinfo Wed Jun 8 09:04:19 2005
@@ -1,4 +1,2 @@
-MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
-SIZE (ghostscript/ghostscript-7.07.tar.bz2) = 4138372
-MD5 (ghostscript/espgs-7.07.1-source.tar.bz2) = d30bf5c09f2c7caa8291f6305cf03044
-SIZE (ghostscript/espgs-7.07.1-source.tar.bz2) = 5400198
+MD5 (ghostscript/espgs-8.15rc3-source.tar.bz2) = e6fb2e581bd2b85368f7664be8d38186
+SIZE (ghostscript/espgs-8.15rc3-source.tar.bz2) = 7820124
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstopxl.in print/cups-pstoraster/files/patch-pstopxl.in
--- /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstopxl.in Thu Jan 1 01:00:00 1970
+++ print/cups-pstoraster/files/patch-pstopxl.in Wed Jun 8 09:48:03 2005
@@ -0,0 +1,20 @@
+--- pstopxl.in.orig Mon Feb 21 18:13:47 2005
++++ pstopxl.in Wed Jun 8 09:11:00 2005
+@@ -27,7 +27,7 @@
+ bindir=@bindir@
+
+ # Set the library/font path...
+-GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
++GS_LIB="${CUPS_FONTPATH:=@prefix@/share/cups/fonts}"
+ export GS_LIB
+
+ # Determine the PCL XL/PCL 6 driver to use...
+@@ -56,7 +56,7 @@
+ ifile="$6"
+ fi
+
+-echo INFO: Starting ESP Ghostscript @GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
++echo INFO: Starting GNU/GPL Ghostscript... 1>&2
+ echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" "$ifile" 1>&2
+
+ # Now run Ghostscript...
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstoraster.in print/cups-pstoraster/files/patch-pstoraster.in
--- /home/josemi/base/ports/print/cups-pstoraster/files/patch-pstoraster.in Thu Jan 1 01:00:00 1970
+++ print/cups-pstoraster/files/patch-pstoraster.in Wed Jun 8 09:47:43 2005
@@ -0,0 +1,20 @@
+--- pstoraster.in.orig Wed Jun 8 09:11:26 2005
++++ pstoraster.in Wed Jun 8 09:13:19 2005
+@@ -27,7 +27,7 @@
+ bindir=@bindir@
+
+ # Set the library/font path...
+-GS_LIB="${CUPS_FONTPATH:=/usr/share/cups/fonts}"
++GS_LIB="${CUPS_FONTPATH:=@prefix@/share/cups/fonts}"
+ export GS_LIB
+
+ # Options we use with Ghostscript...
+@@ -51,7 +51,7 @@
+ ifile="$6"
+ fi
+
+-echo INFO: Starting ESP Ghostscript @GS_VERSION_MAJOR@.@GS_VERSION_MINOR0@.@GS_VERSION_PATCH@... 1>&2
++echo INFO: Starting GNU/GPL Ghostscript... 1>&2
+ echo DEBUG: Running $bindir/@GS@ $gsopts -sOUTPUTFILE="%stdout" -c"$profile" "$ifile" 1>&2
+
+ # Now run Ghostscript...
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:genarch.c print/cups-pstoraster/files/patch-src:genarch.c
--- /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:genarch.c Thu Jul 25 05:00:17 2002
+++ print/cups-pstoraster/files/patch-src:genarch.c Wed Jun 8 09:05:19 2005
@@ -1,34 +0,0 @@
---- src/genarch.c.orig Tue Jun 5 15:38:57 2001
-+++ src/genarch.c Wed Jun 20 04:17:42 2001
-@@ -41,6 +41,7 @@
- fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
- }
-
-+#ifndef __FreeBSD__
- private clock_t
- time_clear(char *buf, int bsize, int nreps)
- {
-@@ -51,6 +52,7 @@
- memset(buf, 0, bsize);
- return clock() - t;
- }
-+#endif /* __FreeBSD__ */
-
- private void
- define(FILE *f, const char *str)
-@@ -181,6 +183,7 @@
- fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
- #undef PRINT_MAX
-
-+#ifndef __FreeBSD__
- section(f, "Cache sizes");
-
- /*
-@@ -241,6 +244,7 @@
- }
- define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
- }
-+#endif /* __FreeBSD__ */
-
- section(f, "Miscellaneous");
-
diff -Nru /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:gxobj.h print/cups-pstoraster/files/patch-src:gxobj.h
--- /home/josemi/base/ports/print/cups-pstoraster/files/patch-src:gxobj.h Fri Nov 26 22:05:46 2004
+++ print/cups-pstoraster/files/patch-src:gxobj.h Wed Jun 8 09:05:19 2005
@@ -1,17 +0,0 @@
---- src/gxobj.h.orig Fri Feb 22 19:45:59 2002
-+++ src/gxobj.h Thu Dec 19 00:16:57 2002
-@@ -99,10 +99,14 @@
- * The final | is because back pointer values are divided by obj_back_scale,
- * so objects must be aligned at least 0 mod obj_back_scale.
- */
-+#if !defined(__ia64__) && !defined(__amd64__)
- #define obj_align_mod\
- (((arch_align_long_mod - 1) | (arch_align_ptr_mod - 1) |\
- (arch_align_double_mod - 1) | (align_bitmap_mod - 1) |\
- (obj_back_scale - 1)) + 1)
-+#else
-+#define obj_align_mod 16
-+#endif
- /* The only possible values for obj_align_mod are 4, 8, or 16.... */
- #if obj_align_mod == 4
- # define log2_obj_align_mod 2
--Boundary-00=_OfqpCf70Ta3/xwM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200506081009.50967.josemi>