aboutsummaryrefslogtreecommitdiffstats
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript9/Makefile19
-rw-r--r--print/ghostscript9/Makefile.drivers24
-rw-r--r--print/ghostscript9/distinfo4
-rw-r--r--print/ghostscript9/files/Makefile.drivers_post8
-rw-r--r--print/ghostscript9/files/Makefile.epag7
-rw-r--r--print/ghostscript9/files/patch-base-Makefile.in26
-rw-r--r--print/ghostscript9/files/patch-base-configure.ac40
-rw-r--r--print/ghostscript9/files/patch-base-gdevperm.c12
-rw-r--r--print/ghostscript9/files/patch-base-gdevplib.c14
-rw-r--r--print/ghostscript9/files/patch-epag-ert.c11
-rw-r--r--print/ghostscript9/pkg-plist84
11 files changed, 105 insertions, 144 deletions
diff --git a/print/ghostscript9/Makefile b/print/ghostscript9/Makefile
index 2289c981eec4..24c3dc71ab1d 100644
--- a/print/ghostscript9/Makefile
+++ b/print/ghostscript9/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= ghostscript9
-PORTVERSION= 9.04
+PORTVERSION= 9.05
CATEGORIES= print
MASTER_SITES= http://downloads.ghostscript.com/public/:gs_srcs \
SF/ghostscript/files/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -23,7 +23,6 @@ MAINTAINER= doceng@FreeBSD.org
COMMENT= Ghostscript 9.x PostScript interpreter
LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
- jasper:${PORTSDIR}/graphics/jasper \
jbig2dec:${PORTSDIR}/graphics/jbig2dec \
jpeg:${PORTSDIR}/graphics/jpeg \
png:${PORTSDIR}/graphics/png \
@@ -32,7 +31,7 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
# XXX: lcms shared lib support is broken
# lcms:${PORTSDIR}/graphics/lcms
-RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME:S,9,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME:S,9$,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
CONFLICTS_INSTALL= gambc-[0-9]* ghostscript[78]-[0-9]* \
ghostscript[78]-*-[0-9]*
@@ -55,18 +54,16 @@ CONFIGURE_ARGS= --disable-compile-inits \
--enable-contrib \
--enable-dynamic \
--with-ijs \
- --with-jasper \
+ --without-jasper \
--with-drivers=""
CPPFLAGS+= -DUPD_SIGNAL=0 -I. \
-I${WRKSRC}/lcms/include \
- -I${WRKSRC}/jasper/src/libjasper/include \
-I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include
XCFLAGS= ${PTHREAD_CFLAGS}
XLDFLAGS= ${PTHREAD_LIBS}
PLIST_SUB= GS_VERSION="${PORTVERSION}" \
- CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}" \
X11BITS=${X11BITS}
SUB_FILES= pkg-message
SUB_LIST= DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
@@ -81,16 +78,17 @@ OPTIONS= A4SIZE "Set A4 (not Letter) as a default paper size" off \
MAN1= dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 \
pdf2dsc.1 pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 \
- ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
+ ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 \
+ wftopfa.1
MLINKS= gslp.1 gsbj.1 \
gslp.1 gsdj.1 \
gslp.1 gsdj500.1 \
gslp.1 gslj.1 \
ps2pdf.1 ps2pdf12.1 \
ps2pdf.1 ps2pdf13.1 \
+ ps2pdf.1 ps2pdf14.1 \
ps2ps.1 eps2eps.1
-CIDFONTDIR= ${DATADIR}/${PORTVERSION}/Resource
EXCLUDE_DIRS= jbig2dec jpeg expat jasper libpng tiff zlib
.include "Makefile.drivers"
@@ -188,7 +186,6 @@ pre-install:
pre-su-install:
${MKDIR} ${DATADIR}
- ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
post-install-docs:
${MKDIR} ${WRKSRC}/contrib/japanese
@@ -199,9 +196,11 @@ post-install-docs:
( cd ${DOCSDIR} && ${TAR} -xof - )
post-install:
+ ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}/${PORTVERSION}
${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
${LN} -sf gsc ${PREFIX}/bin/gs
- ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
+ ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont \
+ ${DATADIR}/${PORTVERSION}/Resource/CIDFont/fonts
@${ECHO_MSG}
@${CAT} ${PKGMESSAGE}
@${ECHO_MSG}
diff --git a/print/ghostscript9/Makefile.drivers b/print/ghostscript9/Makefile.drivers
index 9e7975906316..a728706b35b3 100644
--- a/print/ghostscript9/Makefile.drivers
+++ b/print/ghostscript9/Makefile.drivers
@@ -1,4 +1,4 @@
-# $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/Makefile.drivers,v 1.1 2011-05-23 20:58:46 hrs Exp $
+# $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/Makefile.drivers,v 1.2 2012-02-12 18:10:49 hrs Exp $
OPTIONS_GS_DEFAULT_ON= on
OPTIONS_GS_DEFAULT_OFF= off
@@ -24,15 +24,11 @@ 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_CUPS= \
GS_cups "D: CUPS driver" ${OPTIONS_CUPS_DEFAULT}
OPTIONS+= ${OPTIONS_X11}
OPTIONS+= ${OPTIONS_SVGALIB}
-OPTIONS+= ${OPTIONS_CAIRO}
OPTIONS+= ${OPTIONS_ICONV}
OPTIONS+= ${OPTIONS_CUPS}
@@ -196,7 +192,6 @@ GS_imagen "D: Imagen ImPress printers" ${OPTIONS_GS_DEFAULT_ON} \
GS_fs600 "D: Kyocera FS-600 (600 dpi)" ${OPTIONS_GS_DEFAULT_ON} \
GS_lxm5700m "D: Lexmark 5700 monotone" ${OPTIONS_GS_DEFAULT_ON} \
GS_lxm3200 "D: Lexmark 3200/Z12/Z22/Z31/Z32" ${OPTIONS_GS_DEFAULT_ON} \
-GS_lx5000 "D: Lexmark 5000/Z51/Z82" ${OPTIONS_GS_DEFAULT_ON} \
GS_lex2050 "D: Lexmark 2050" ${OPTIONS_GS_DEFAULT_ON} \
GS_lex3200 "D: Lexmark 3200" ${OPTIONS_GS_DEFAULT_ON} \
GS_lex5700 "D: Lexmark 5700" ${OPTIONS_GS_DEFAULT_ON} \
@@ -236,9 +231,6 @@ GS_bmp32b "D: BMP 32-bit pseudo-.BMP" ${OPTIONS_GS_DEFAULT_ON} \
GS_bmpsep1 "D: BMP Separated 1-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
GS_bmpsep8 "D: BMP Separated 8-bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
GS_ccr "D: CalComp Raster format" ${OPTIONS_GS_DEFAULT_ON} \
-GS_cgmmono "D: CGM Monochrome -- LOW LEVEL OUTPUT ONLY" ${OPTIONS_GS_DEFAULT_ON} \
-GS_cgm8 "D: CGM 8-bit 256-color -- DITTO" ${OPTIONS_GS_DEFAULT_ON} \
-GS_cgm24 "D: CGM 24-bit color -- DITTO" ${OPTIONS_GS_DEFAULT_ON} \
GS_cif "D: CIF file format for VLSI" ${OPTIONS_GS_DEFAULT_ON} \
GS_dfaxhigh "D: DigiBoard, DigiFAX (high res)" ${OPTIONS_GS_DEFAULT_ON} \
GS_dfaxlow "D: DigiFAX (normal res)" ${OPTIONS_GS_DEFAULT_ON} \
@@ -271,6 +263,16 @@ GS_psdcmyk "D: PhotoShop PSD, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
GS_bit "D: Plain bits, monochrome" ${OPTIONS_GS_DEFAULT_ON} \
GS_bitrgb "D: Plain bits, RGB" ${OPTIONS_GS_DEFAULT_ON} \
GS_bitcmyk "D: Plain bits, CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plan "D: PLANar 24 bit RGB (8 bits per channel)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plang "D: PLANar 8 bit Grayscale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_planm "D: PLANar 1 bit Monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_planc "D: PLANar 32 bit CMYK (8 bits per channel)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plank "D: PLANar 4 bit CMYK (1 bit per channel)" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plib "D: PLANar Interlaced Banded 24 bit RGB" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plibg "D: PLANar Interlaced Banded 8 bit Grayscale" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plibm "D: PLANar Interlaced Banded 1 bit Monochrome" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plibc "D: PLANar Interlaced Banded 32 bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
+GS_plibk "D: PLANar Interlaced Banded 4 bit CMYK" ${OPTIONS_GS_DEFAULT_ON} \
GS_plan9bm "D: Plan 9 bitmap format" ${OPTIONS_GS_DEFAULT_ON} \
GS_pam "D: Portable Arbitrary Map file" ${OPTIONS_GS_DEFAULT_ON} \
GS_pbm "D: Portable Bitmap, plain" ${OPTIONS_GS_DEFAULT_ON} \
@@ -319,6 +321,4 @@ GS_bbox "D: Bounding box output" ${OPTIONS_GS_DEFAULT_ON} \
GS_devicen "D: DeviceN process color model device" ${OPTIONS_GS_DEFAULT_ON} \
GS_perm "D: DeviceN which permutes color components" ${OPTIONS_GS_DEFAULT_ON} \
GS_spotcmyk "D: DeviceN with CMYK and spot color support" ${OPTIONS_GS_DEFAULT_ON} \
-GS_imdi "D: IMDI color converting device" ${OPTIONS_GS_DEFAULT_ON} \
-GS_wtsimdi "D: WTS halftoning device" ${OPTIONS_GS_DEFAULT_ON} \
-GS_wtscmyk "D: WTS halftoning CMYK device" ${OPTIONS_GS_DEFAULT_ON}
+GS_inkcov "D: Compute ink coverage" ${OPTIONS_GS_DEFAULT_ON}
diff --git a/print/ghostscript9/distinfo b/print/ghostscript9/distinfo
index ad30df540f79..05f829c4c602 100644
--- a/print/ghostscript9/distinfo
+++ b/print/ghostscript9/distinfo
@@ -1,4 +1,4 @@
-SHA256 (ghostscript/ghostscript-9.04.tar.bz2) = f82c20b44ad3c204e2b78afbcd03a32dd523d26f5e18bf4508f3dfcbbfd30bc4
-SIZE (ghostscript/ghostscript-9.04.tar.bz2) = 29869900
+SHA256 (ghostscript/ghostscript-9.05.tar.bz2) = 0f41212af3a5a552ab2302cd90606dc8245be34490a699726dc95ed3cd89ceac
+SIZE (ghostscript/ghostscript-9.05.tar.bz2) = 28279634
SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
SIZE (ghostscript/epag-3.09.tar.gz) = 12858
diff --git a/print/ghostscript9/files/Makefile.drivers_post b/print/ghostscript9/files/Makefile.drivers_post
index 2513051a847f..ea705fa559a1 100644
--- a/print/ghostscript9/files/Makefile.drivers_post
+++ b/print/ghostscript9/files/Makefile.drivers_post
@@ -9,7 +9,7 @@ OPTIONS_${D}_DEFAULT= on
OPTIONS_${D}_DEFAULT= off
.endif
.endfor
-.for D in SVGALIB CAIRO CUPS GTK
+.for D in SVGALIB CUPS GTK
.if !defined(WITH_${D})
OPTIONS_${D}_DEFAULT= off
.else
@@ -23,7 +23,6 @@ OPTIONS_X11_DEFAULT= on
OPTIONS_GTK_DEFAULT= on
OPTIONS_SVGALIB_DEFAULT=on
OPTIONS_ICONV_DEFAULT= on
-OPTIONS_CAIRO_DEFAULT= on
OPTIONS_CUPS_DEFAULT= on
OPTIONS_GS_DEFAULT_ON= on
OPTIONS_GS_DEFAULT_OFF= on
@@ -170,13 +169,14 @@ DEVICE_DEVS3= deskjet.dev djet500.dev laserjet.dev ljetplus.dev \
lj5mono.dev lj5gray.dev cups.dev
DEVICE_DEVS4= cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev \
pjxl.dev pjxl300.dev ijs.dev
-DEVICE_DEVS5= uniprint.dev omni.dev
+DEVICE_DEVS5= uniprint.dev omni.dev inkcov.dev
DEVICE_DEVS6= bj10e.dev bj200.dev bjc600.dev bjc800.dev png48.dev \
png16m.dev pnggray.dev pngmono.dev png256.dev png16.dev \
pngalpha.dev
DEVICE_DEVS7= faxg3.dev faxg32d.dev faxg4.dev
DEVICE_DEVS8= pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev \
- pcxcmyk.dev svgwrite.dev
+ pcxcmyk.dev svgwrite.dev plan.dev planc.dev plang.dev plank.dev \
+ planm.dev plib.dev plibc.dev plibg.dev plibk.dev plibm.dev
DEVICE_DEVS9= pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev \
pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev \
pkmraw.dev pksm.dev pksmraw.dev
diff --git a/print/ghostscript9/files/Makefile.epag b/print/ghostscript9/files/Makefile.epag
index ad9a7a5c150a..94be6f560194 100644
--- a/print/ghostscript9/files/Makefile.epag
+++ b/print/ghostscript9/files/Makefile.epag
@@ -9,15 +9,12 @@ PORTDOC_FILES+= epag/ert.txt epag/gdevepag.txt epag/ChangeLog \
pre-build-epag:
${LN} -s -f ${WRKSRC}/${EPAG_NAME}/gdevepag.c ${WRKSRC}/base
+ ${MKDIR} ${WRKSRC}/contrib/epag
+ ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/* ${WRKSRC}/contrib/epag
post-build-epag:
cd ${WRKSRC}/${EPAG_NAME} && \
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile
-post-install-docs-epag:
- ${MKDIR} ${WRKSRC}/contrib/epag
- ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/* ${WRKSRC}/contrib/epag
-
pre-build: pre-build-epag
post-build: post-build-epag
-post-install-docs: post-install-docs-epag
diff --git a/print/ghostscript9/files/patch-base-Makefile.in b/print/ghostscript9/files/patch-base-Makefile.in
index b6f3e0d81234..b276f1bd3f27 100644
--- a/print/ghostscript9/files/patch-base-Makefile.in
+++ b/print/ghostscript9/files/patch-base-Makefile.in
@@ -1,6 +1,6 @@
---- base/Makefile.in.orig 2011-03-25 02:26:17.000000000 +0900
-+++ base/Makefile.in 2011-05-17 18:01:52.000000000 +0900
-@@ -47,9 +47,8 @@
+--- base/Makefile.in.orig 2012-02-08 17:48:48.000000000 +0900
++++ base/Makefile.in 2012-02-13 00:28:00.000000000 +0900
+@@ -48,9 +48,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@
-@@ -195,7 +194,7 @@
+@@ -201,7 +200,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,
-@@ -203,12 +202,12 @@
+@@ -209,12 +208,12 @@
# You may need to change this if the libpng version changes.
# See png.mak for more information.
@@ -36,7 +36,7 @@
TIFFSRCDIR=@LIBTIFFDIR@
TIFFPLATFORM=unix
TIFFCONFIG_SUFFIX=
-@@ -217,7 +216,7 @@
+@@ -223,7 +222,7 @@
# Define the directory where the zlib sources are stored.
# See zlib.mak for more information.
@@ -45,7 +45,7 @@
ZSRCDIR=@ZLIBDIR@
#ZLIB_NAME=gz
ZLIB_NAME=z
-@@ -313,7 +312,7 @@
+@@ -330,7 +329,7 @@
# Define the added flags for standard, debugging, profiling
# and shared object builds.
@@ -54,16 +54,16 @@
CFLAGS_DEBUG=@DBG_CFLAGS@
CFLAGS_PROFILE=-pg @OPT_CFLAGS@
CFLAGS_SO=@DYNAMIC_CFLAGS@
-@@ -362,7 +361,7 @@
+@@ -381,7 +380,7 @@
# Solaris may need -lnsl -lsocket -lposix4.
# (Libraries required by individual drivers are handled automatically.)
--EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
-+EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ -Wl,-export-dynamic
+-EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@
++EXTRALIBS=$(XTRALIBS) @LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ @FT_LIBS@ -Wl,-export-dynamic
# Define the standard libraries to search at the end of linking.
# Most platforms require -lpthread for the POSIX threads library;
-@@ -406,7 +405,7 @@
+@@ -425,7 +424,7 @@
# the pthread library. Otherwise use SYNC=nosync
#SYNC=posync
#SYNC=nosync
@@ -72,7 +72,7 @@
# programs we use
RM=rm -f
-@@ -494,27 +493,27 @@
+@@ -513,27 +512,27 @@
#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
#DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
DEVICE_DEVS=$(DISPLAY_DEV) @X11_DEVS@
@@ -121,7 +121,7 @@
# Shared library target to build.
-@@ -550,6 +549,7 @@
+@@ -578,6 +577,7 @@
# ---------------- End of platform-specific section ---------------- #
INSTALL_CONTRIB=@INSTALL_CONTRIB@
diff --git a/print/ghostscript9/files/patch-base-configure.ac b/print/ghostscript9/files/patch-base-configure.ac
index 60be403d058b..1d3d25083f83 100644
--- a/print/ghostscript9/files/patch-base-configure.ac
+++ b/print/ghostscript9/files/patch-base-configure.ac
@@ -1,25 +1,25 @@
---- base/configure.ac.orig 2011-03-30 15:48:01.000000000 +0900
-+++ base/configure.ac 2011-06-10 14:36:19.000000000 +0900
-@@ -1019,7 +1019,7 @@
+--- base/configure.ac.orig 2012-02-08 17:48:48.000000000 +0900
++++ base/configure.ac 2012-02-13 00:31:19.000000000 +0900
+@@ -1244,7 +1244,7 @@
X_DEVS=""
X_LIBS=""
-if test x$no_x != xyes; then
+if test x$with_x != xno; then
- if test "$x_libraries" = "/usr/lib"; then
- echo "Ignoring X library directory \"$x_libraries\" requested by configure."
- x_libraries="NONE"
-@@ -1412,7 +1412,12 @@
- DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
- ;;
- *BSD)
-- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
-+ if test "x$X_DEVS" != x; then
-+ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
-+ INSTALL_SHARED="install-shared"
-+ else
-+ DYNAMIC_DEVS=""
-+ fi
- DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
- X11_DEVS=""
- OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
+ if test "$x_libraries" = "/usr/lib"; then
+ echo "Ignoring X library directory \"$x_libraries\" requested by configure."
+ x_libraries="NONE"
+@@ -1637,7 +1637,12 @@
+ DBG_CFLAGS="$DYNAMIC_CFLAGS $DBG_CFLAGS"
+ ;;
+ *BSD)
+- DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++ if test "x$X_DEVS" != x; then
++ DYNAMIC_DEVS="\$(GLOBJDIR)/X11.so"
++ INSTALL_SHARED="install-shared"
++ else
++ DYNAMIC_DEVS=""
++ fi
+ DYNAMIC_FLAGS="-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\\\"\$(gssharedir)\\\""
+ X11_DEVS=""
+ OPT_CFLAGS="$DYNAMIC_CFLAGS $OPT_CFLAGS"
diff --git a/print/ghostscript9/files/patch-base-gdevperm.c b/print/ghostscript9/files/patch-base-gdevperm.c
index 0937a7b77d9c..07870f314ac4 100644
--- a/print/ghostscript9/files/patch-base-gdevperm.c
+++ b/print/ghostscript9/files/patch-base-gdevperm.c
@@ -1,5 +1,5 @@
---- base/gdevperm.c.orig 2011-12-06 15:37:48.000000000 +0900
-+++ base/gdevperm.c 2011-12-06 15:45:20.000000000 +0900
+--- base/gdevperm.c.orig 2012-02-08 17:48:48.000000000 +0900
++++ base/gdevperm.c 2012-02-13 00:44:23.000000000 +0900
@@ -285,7 +285,7 @@
(strncmp((const char *)name, (const char *)str, name_size) == 0))
@@ -9,3 +9,11 @@
int name_size, int component_type)
{
const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev;
+@@ -332,7 +332,6 @@
+ perm_decode_color(gx_device *dev, gx_color_index color, gx_color_value *out)
+ {
+ int bpc = 8;
+- int drop = sizeof(gx_color_value) * 8 - bpc;
+ int mask = (1 << bpc) - 1;
+ int i = 0;
+ int ncomp = dev->color_info.num_components;
diff --git a/print/ghostscript9/files/patch-base-gdevplib.c b/print/ghostscript9/files/patch-base-gdevplib.c
new file mode 100644
index 000000000000..96a096337dd3
--- /dev/null
+++ b/print/ghostscript9/files/patch-base-gdevplib.c
@@ -0,0 +1,14 @@
+--- base/gdevplib.c.orig 2012-02-08 17:48:47.000000000 +0900
++++ base/gdevplib.c 2012-02-13 01:23:46.000000000 +0900
+@@ -151,7 +151,11 @@
+
+ #ifdef TESTING_WITH_NO_BAND_DONOR
+
++#if !defined(__FreeBSD__)
+ #include <malloc.h>
++#else
++#include <stdlib.h>
++#endif
+
+ static void *my_buffer;
+
diff --git a/print/ghostscript9/files/patch-epag-ert.c b/print/ghostscript9/files/patch-epag-ert.c
new file mode 100644
index 000000000000..6a6dd2540b8a
--- /dev/null
+++ b/print/ghostscript9/files/patch-epag-ert.c
@@ -0,0 +1,11 @@
+--- epag-3.09/ert.c.orig 2000-07-08 13:33:09.000000000 +0900
++++ epag-3.09/ert.c 2012-02-13 01:28:55.000000000 +0900
+@@ -1,6 +1,8 @@
+ /* $Id: ert.c,v 1.3 1998/11/20 10:51:12 nari Exp $ */
+
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+
+ /*
+ * EPSON Remoteのコマンドを出力するコマンド
diff --git a/print/ghostscript9/pkg-plist b/print/ghostscript9/pkg-plist
index 11d14dc5a833..ffde94d21915 100644
--- a/print/ghostscript9/pkg-plist
+++ b/print/ghostscript9/pkg-plist
@@ -1,4 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/pkg-plist,v 1.4 2012-01-15 08:02:25 hrs Exp $
+@comment $FreeBSD: /tmp/pcvs/ports/print/ghostscript9/pkg-plist,v 1.5 2012-02-12 18:10:49 hrs Exp $
bin/dumphint
bin/dvipdf
bin/eps2eps
@@ -53,13 +53,10 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/83pv-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90ms-RKSJ-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90msp-RKSJ-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-UCS2C
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/90pv-RKSJ-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-H
@@ -72,24 +69,12 @@ lib/libgs.so.%%GS_VERSION%%
%%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
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-0
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-1
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-3
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-4
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-5
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBK-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-GBpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-GB1-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-0
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-1
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-2
@@ -97,48 +82,22 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-4
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-5
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-6
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90ms-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-90pv-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-PS-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan2-0
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-0
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-1
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-CID
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Host
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-H-Mac
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCms-UHC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-KSCpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Korea1-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-UCS2C
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/B5pc-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS01-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS02-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS03-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS04-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS05-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS06-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS07-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS1-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS1-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS15-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/CNS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETHK-B5-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETen-B5-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETenms-B5-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/ETenms-B5-V
@@ -151,10 +110,8 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GB-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBK2K-V
@@ -163,16 +120,12 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBT-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBTpc-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBTpc-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-UCS2C
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBpc-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HK-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdla-B5-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-H
@@ -187,31 +140,20 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hankaku
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hiragana
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hojo-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hojo-EUC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hojo-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hojo-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Hojo-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-UTF16-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Identity-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-Johab-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSC2-RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-HW-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-UCS2
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCms-UHC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-UCS2C
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/KSCpc-EUC-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Katakana
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-H
@@ -219,15 +161,6 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/RKSJ-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Roman
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/TCVN-RKSJ-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90ms-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-90pv-RKSJ
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-B5pc
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-ETen-B5
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBK-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-GBpc-EUC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCms-UHC
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UCS2-KSCpc-EUC
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UCS2-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF16-H
@@ -245,13 +178,6 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF8-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UCS2-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF16-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF16-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF32-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF32-V
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF8-H
-%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniHojo-UTF8-V
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-H
%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-HW-V
@@ -352,6 +278,7 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/doc/Deprecated.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Details.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Details8.htm
+%%DATADIR%%/%%GS_VERSION%%/doc/Details9.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Develop.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Devices.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Drivers.htm
@@ -366,6 +293,7 @@ lib/libgs.so.%%GS_VERSION%%
%%DATADIR%%/%%GS_VERSION%%/doc/History6.htm
%%DATADIR%%/%%GS_VERSION%%/doc/History7.htm
%%DATADIR%%/%%GS_VERSION%%/doc/History8.htm
+%%DATADIR%%/%%GS_VERSION%%/doc/History9.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Install.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Issues.htm
%%DATADIR%%/%%GS_VERSION%%/doc/Language.htm
@@ -680,7 +608,9 @@ lib/libgs.so.%%GS_VERSION%%
%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
-%%CIDFONTDIR%%/CIDFont
+%%DATADIR%%/%%GS_VERSION%%/Resource/CIDFSubst/DroidSansFallback.ttf
+%%DATADIR%%/%%GS_VERSION%%/Resource/CIDFont/fonts
+%%DATADIR%%/%%GS_VERSION%%/Resource/CIDFont/ArtifexBullet
%%GS_pcl3%%@dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
@dirrm %%DATADIR%%/%%GS_VERSION%%/lib
@dirrm %%DATADIR%%/%%GS_VERSION%%/examples/cjk
@@ -692,6 +622,8 @@ lib/libgs.so.%%GS_VERSION%%
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap
+@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CIDFSubst
+@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CIDFont
@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
@dirrmtry %%DATADIR%%/%%GS_VERSION%%
@dirrmtry %%DATADIR%%