6 files changed, 59 insertions, 67 deletions

diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index 0e34487aafd3..22a4c64572cc 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -6,27 +6,33 @@
 #
 
 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
@@ -70,6 +76,5 @@ do-install:
 	${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 --git a/print/cups-pstoraster/distinfo b/print/cups-pstoraster/distinfo
index 315de42d41fe..e64c40ad22b9 100644
--- a/print/cups-pstoraster/distinfo
+++ b/print/cups-pstoraster/distinfo
@@ -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 --git a/print/cups-pstoraster/files/patch-pstopxl.in b/print/cups-pstoraster/files/patch-pstopxl.in
new file mode 100644
index 000000000000..e272416c3f7f
--- /dev/null
+++ b/print/cups-pstoraster/files/patch-pstopxl.in
@@ -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 --git a/print/cups-pstoraster/files/patch-pstoraster.in b/print/cups-pstoraster/files/patch-pstoraster.in
new file mode 100644
index 000000000000..00fc894a5986
--- /dev/null
+++ b/print/cups-pstoraster/files/patch-pstoraster.in
@@ -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 --git a/print/cups-pstoraster/files/patch-src:genarch.c b/print/cups-pstoraster/files/patch-src:genarch.c
deleted file mode 100644
index a015e69e758a..000000000000
--- a/print/cups-pstoraster/files/patch-src:genarch.c
+++ /dev/null
@@ -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 --git a/print/cups-pstoraster/files/patch-src:gxobj.h b/print/cups-pstoraster/files/patch-src:gxobj.h
deleted file mode 100644
index f0df8565100c..000000000000
--- a/print/cups-pstoraster/files/patch-src:gxobj.h
+++ /dev/null
@@ -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