6 files changed, 62 insertions, 17 deletions

diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 47c3488fbe98..6426bbfec29e 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ghostscript8
-PORTVERSION=	8.70
-PORTREVISION=	2
+PORTVERSION=	8.71
 CATEGORIES=	print
-MASTER_SITES=	SF/ghostscript/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
+MASTER_SITES=	http://ghostscript.com/releases/:gs_srcs \
+		SF/ghostscript/files/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
 		http://www.humblesoft.com/pub/:epag
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
@@ -22,12 +22,12 @@ MAINTAINER=	doceng@FreeBSD.org
 COMMENT=	Ghostscript 8.x PostScript interpreter
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		png.6:${PORTSDIR}/graphics/png
+		png.6:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME:S,8,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
 CONFLICTS=	gambc-[0-9]* ghostscript7-[0-9]* ghostscript7-*-[0-9]*
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_LDCONFIG=	yes
@@ -202,6 +202,13 @@ PLIST_SUB+=	FAPI=""
 PLIST_SUB+=	FAPI="@comment "
 .endif
 
+.if defined(WITH_GS_cairo)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+CONFIGURE_ARGS+=	--enable-cairo
+.else
+CONFIGURE_ARGS+=	--disable-cairo
+.endif
+
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 USE_LDCONFIG=	yes
diff --git a/print/ghostscript8/Makefile.drivers b/print/ghostscript8/Makefile.drivers
index 962992bcd72d..0daac3985385 100644
--- a/print/ghostscript8/Makefile.drivers
+++ b/print/ghostscript8/Makefile.drivers
@@ -21,10 +21,17 @@ OPTIONS_ICONV_DEFAULT=	on
 OPTIONS_ICONV_DEFAULT=	off
 .endif
 
+.if !defined(WITH_CAIRO)
+OPTIONS_CAIRO_DEFAULT=	off
+.else
+OPTIONS_CAIRO_DEFAULT=	on
+.endif
+
 .if make(makesum)
 OPTIONS_X11_DEFAULT=	on
 OPTIONS_SVGALIB_DEFAULT=on
 OPTIONS_ICONV_DEFAULT=	on
+OPTIONS_CAIRO_DEFAULT=	on
 OPTIONS_GS_DEFAULT_ON=	on
 OPTIONS_GS_DEFAULT_OFF=	on
 .endif
@@ -50,8 +57,12 @@ OPTIONS_ICONV= \
 GS_oprp		"D: OpenPrinting Raster driver interface"	${OPTIONS_ICONV_DEFAULT} \
 GS_opvp		"D: OpenPrinting Vecter driver interface"	${OPTIONS_ICONV_DEFAULT}
 
+OPTIONS_CAIRO= \
+GS_cairo	"D: cairo driver for PDF, SVG, EPS or PNG files"	${OPTIONS_CAIRO_DEFAULT}
+
 OPTIONS+=	${OPTIONS_X11}
 OPTIONS+=	${OPTIONS_SVGALIB}
+OPTIONS+=	${OPTIONS_CAIRO}
 OPTIONS+=	${OPTIONS_ICONV}
 
 OPTIONS+=	\
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 2d73fde4f430..83f64e26b6cc 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -1,6 +1,6 @@
-MD5 (ghostscript/ghostscript-8.70.tar.bz2) = 526366f8cb4fda0d3d293597cc5b984b
-SHA256 (ghostscript/ghostscript-8.70.tar.bz2) = c889f2a3a27a4dbd3519197ffc0170d66f398da6a8252b2ebe0548d250f4acc8
-SIZE (ghostscript/ghostscript-8.70.tar.bz2) = 17019673
+MD5 (ghostscript/ghostscript-8.71.tar.gz) = 51a522a5b4818bd3dc7c1c0e9dd22bad
+SHA256 (ghostscript/ghostscript-8.71.tar.gz) = 2a22e61b0172f271ebb270a9f127bde501eb661c67c8b4943eafbad57d855aae
+SIZE (ghostscript/ghostscript-8.71.tar.gz) = 25240801
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
 SIZE (ghostscript/epag-3.09.tar.gz) = 12858
diff --git a/print/ghostscript8/files/patch-base-Makefile.in b/print/ghostscript8/files/patch-base-Makefile.in
index 9fa3da2332f3..aa8d8876e596 100644
--- a/print/ghostscript8/files/patch-base-Makefile.in
+++ b/print/ghostscript8/files/patch-base-Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig	2008-06-22 15:43:28.000000000 +0900
-+++ base/Makefile.in	2008-11-03 00:09:12.000000000 +0900
-@@ -46,9 +46,8 @@
+--- base/Makefile.in.orig	2009-12-18 16:04:10.000000000 +0900
++++ base/Makefile.in	2010-03-02 06:21:50.000000000 +0900
+@@ -47,9 +47,8 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -12,7 +12,7 @@
  INSTALL_SHARED = @INSTALL_SHARED@
  
  prefix = @prefix@
-@@ -164,7 +163,7 @@
+@@ -156,7 +155,7 @@
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -21,7 +21,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -172,14 +171,14 @@
+@@ -164,12 +163,12 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -30,6 +30,13 @@
  PNGSRCDIR=@LIBPNGDIR@
  LIBPNG_NAME=png
  
+ # libtiff
+-SHARE_LIBTIFF=@SHARE_LIBTIFF@
++SHARE_LIBTIFF=1
+ TIFFSRCDIR=@LIBTIFFDIR@
+ TIFFPLATFORM=unix
+ TIFFCONFIG_SUFFIX=
+@@ -178,7 +177,7 @@
  # Define the directory where the zlib sources are stored.
  # See zlib.mak for more information.
  
@@ -38,7 +45,7 @@
  ZSRCDIR=@ZLIBDIR@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
-@@ -250,7 +249,7 @@
+@@ -254,7 +253,7 @@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -47,7 +54,7 @@
  CFLAGS_DEBUG=-g -O0
  CFLAGS_PROFILE=-pg @OPT_CFLAGS@
  CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -295,7 +294,7 @@
+@@ -299,7 +298,7 @@
  # Solaris may need -lnsl -lsocket -lposix4.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -56,7 +63,7 @@
  
  # Define the standard libraries to search at the end of linking.
  # Most platforms require -lpthread for the POSIX threads library;
-@@ -339,7 +338,7 @@
+@@ -343,7 +342,7 @@
  # the pthread library. Otherwise use SYNC=nosync
  #SYNC=posync
  #SYNC=nosync
@@ -65,7 +72,7 @@
  
  # programs we use
  RM=rm -f
-@@ -498,6 +497,7 @@
+@@ -490,6 +489,7 @@
  # ---------------- End of platform-specific section ---------------- #
  
  INSTALL_CONTRIB=@INSTALL_CONTRIB@
diff --git a/print/ghostscript8/files/patch-base-unix-dll.mak b/print/ghostscript8/files/patch-base-unix-dll.mak
new file mode 100644
index 000000000000..96876e3bfb15
--- /dev/null
+++ b/print/ghostscript8/files/patch-base-unix-dll.mak
@@ -0,0 +1,17 @@
+--- base/unix-dll.mak.orig	2009-10-20 05:24:53.000000000 +0900
++++ base/unix-dll.mak	2010-04-03 12:22:35.000000000 +0900
+@@ -79,12 +79,11 @@
+ # Build the small Ghostscript loaders, with Gtk+ and without
+ 
+ $(GSSOC_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
+-	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
+-	$(LDFLAGS) -L$(BINDIR) -l$(GS)
++	$(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c -L$(BINDIR) -l$(GS)
+ 
+ $(GSSOX_XE): $(GS_SO) $(PSSRC)$(SOC_LOADER)
+ 	$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
+-	$(LDFLAGS) -L$(BINDIR) -l$(GS) $(SOC_LIBS)
++	-L$(BINDIR) -l$(GS) $(SOC_LIBS)
+ 
+ # ------------------------- Recursive make targets ------------------------- #
+ 
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 2ee712b39b82..0aaab53b08cf 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -70,6 +70,7 @@ lib/libgs.so.%%GS_VERSION%%
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-3
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-4
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-5
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-6
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-B5pc
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-ETenms-B5
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-CID
@@ -287,6 +288,8 @@ lib/libgs.so.%%GS_VERSION%%
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultGray
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultRGB
 %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/TrivialCMYK
+%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/sGray
+%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/sRGB
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/FCO_Dingbats
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/FCO_Symbol
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/FCO_Unicode