Please test: Prepare print/ghostscript-gpl for seamless
integration with cups-pstoraster
Jose M Rodriguez
josemi at freebsd.jazztel.es
Wed Jun 8 08:09:56 GMT 2005
El Lunes, 6 de Junio de 2005 23:43, Simon Barner escribió:
> 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
espgs-8.15rc3 as base.
As some changes in pstoraster code have take place, please, test this
with gs-gnu and gs-gpl.
This patch uses the new gs ports (I'm using ports/81962 and
ports/81963).
You may test new gs-gpl port with GHOSTSCRIPT_PORT=print/ghostscript-gpl
in your /etc/make.conf
Also, I found cups Makefile.common import not usefull, so I drop it.
Thanks in advance,
--
josemi
--- patch-cups-pstoraster-8.15 begins here ---
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 at 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 at .@GS_VERSION_MINOR0 at .@GS_VERSION_PATCH at ... 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 at .@GS_VERSION_MINOR0 at .@GS_VERSION_PATCH at ... 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
--- patch-cups-pstoraster-8.15 ends here ---
-------------- next part --------------
A non-text attachment was scrubbed...
Name: patch-cups-pstoraster-8.15
Type: text/x-diff
Size: 6754 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20050608/c57dc238/patch-cups-pstoraster-8-0001.bin
More information about the freebsd-ports
mailing list