Index: head/print/cups-pstoraster/Makefile =================================================================== --- head/print/cups-pstoraster/Makefile (revision 137912) +++ head/print/cups-pstoraster/Makefile (revision 137913) @@ -1,75 +1,80 @@ # New ports collection makefile for: cups-pstoraster # Date created: Jul 13 2002 # Whom: ports@FreeBSD.org # # $FreeBSD$ # 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.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 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --without-x --without-ijs --without-gimp-print \ --with-gs=espgs MAKE_ARGS= CFLAGS_STANDARD="${CFLAGS} -DUPD_SIGNAL=0" \ DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev" PLIST_FILES= bin/espgs etc/cups/pstoraster.convs \ libexec/cups/filter/pstopxl libexec/cups/filter/pstoraster \ share/cups/model/pxlcolor.ppd share/cups/model/pxlmono.ppd post-patch: ${LN} -sf ${ESPGS_WRKSRC}/gdevcups.c ${WRKSRC}/src ${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak .for file in pstopxl pstoraster ${SED} -e 's:@prefix@:${PREFIX}:g ; \ s:@exec_prefix@:${PREFIX}:g ; \ s:@bindir@:${PREFIX}/bin:g ; \ s:@GS@:espgs:g' \ ${ESPGS_WRKSRC}/${file}.in > ${ESPGS_WRKSRC}/${file} .endfor ${REINPLACE_CMD} -e 's|^CFLAGS=|CFLAGS=@CPPFLAGS@ |g ; \ s|^LDFLAGS=|LDFLAGS=@LDFLAGS@ |g ; \ s|^DEVICE_DEVS|#DEVICE_DEVS|g' ${WRKSRC}/Makefile.in pre-build: ${MKDIR} ${WRKSRC}/bin ${MKDIR} ${WRKSRC}/obj do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/espgs ${PREFIX}/bin ${INSTALL_DATA} ${ESPGS_WRKSRC}/pstoraster.convs ${PREFIX}/etc/cups .for file in pstopxl pstoraster ${INSTALL_SCRIPT} ${ESPGS_WRKSRC}/${file} ${PREFIX}/libexec/cups/filter .endfor .for file in pxlcolor.ppd pxlmono.ppd ${INSTALL_DATA} ${ESPGS_WRKSRC}/${file} ${PREFIX}/share/cups/model .endfor -.include "${.CURDIR}/../../print/cups/Makefile.common" .include .include Property changes on: head/print/cups-pstoraster/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.19 \ No newline at end of property +1.20 \ No newline at end of property Index: head/print/cups-pstoraster/distinfo =================================================================== --- head/print/cups-pstoraster/distinfo (revision 137912) +++ head/print/cups-pstoraster/distinfo (revision 137913) @@ -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 Property changes on: head/print/cups-pstoraster/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/print/cups-pstoraster/files/patch-src:genarch.c =================================================================== --- head/print/cups-pstoraster/files/patch-src:genarch.c (revision 137912) +++ head/print/cups-pstoraster/files/patch-src:genarch.c (nonexistent) @@ -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"); - Property changes on: head/print/cups-pstoraster/files/patch-src:genarch.c ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/print/cups-pstoraster/files/patch-src:gxobj.h =================================================================== --- head/print/cups-pstoraster/files/patch-src:gxobj.h (revision 137912) +++ head/print/cups-pstoraster/files/patch-src:gxobj.h (nonexistent) @@ -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 Property changes on: head/print/cups-pstoraster/files/patch-src:gxobj.h ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/print/cups-pstoraster/files/patch-pstopxl.in =================================================================== --- head/print/cups-pstoraster/files/patch-pstopxl.in (nonexistent) +++ head/print/cups-pstoraster/files/patch-pstopxl.in (revision 137913) @@ -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... Property changes on: head/print/cups-pstoraster/files/patch-pstopxl.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/print/cups-pstoraster/files/patch-pstoraster.in =================================================================== --- head/print/cups-pstoraster/files/patch-pstoraster.in (nonexistent) +++ head/print/cups-pstoraster/files/patch-pstoraster.in (revision 137913) @@ -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... Property changes on: head/print/cups-pstoraster/files/patch-pstoraster.in ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property