diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2007-09-24 08:43:49 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2007-09-24 08:43:49 +0000 |
| commit | 9716a77feab1f1403700627bd721c2f1e0b26d9d (patch) | |
| tree | 25148fc53b5a656a27c502b05019a19d22d4c9fe | |
| parent | 6c89c943f9744fb5d7e21f2423823f20d08fc862 (diff) | |
| download | ports-9716a77feab1f1403700627bd721c2f1e0b26d9d.tar.gz ports-9716a77feab1f1403700627bd721c2f1e0b26d9d.zip | |
Notes
110 files changed, 11 insertions, 7083 deletions
@@ -256,7 +256,6 @@ gentoo-linux/stage1-* emulators/linux_base-gentoo-stage1 Binaries licensed under GNU GPL without accompanying source gGo-*.tar.gz games/ggo Redistribution is restricted -ghostscript/* print/ghostscript-afpl Can only be distributed for free gibi-* french/gibi Only free for use in conjunction with french/aster. For any other purpose, you have to acquire a license diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 3a4bb90fe371..35896f593852 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -358,9 +358,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # to specify a version without X11 and/or localized # versions for their nationality. # Default: print/ghostscript-gpl -# WITH_GHOSTSCRIPT_AFPL -# - If set, this port uses the AFPL version of the ghostscript -# software instead of the GPL version, which is used otherwise. # WITH_GHOSTSCRIPT_GNU # - If set, this port uses the GNU version of the ghostscript # software instead of the GPL version, which is used otherwise. @@ -2046,16 +2043,12 @@ CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include .if !defined(WITHOUT_X11) .if defined(WITH_GHOSTSCRIPT_GNU) GHOSTSCRIPT_PORT?= print/ghostscript-gnu -.elif defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl .else GHOSTSCRIPT_PORT?= print/ghostscript-gpl .endif .else .if defined(WITH_GHOSTSCRIPT_GNU) GHOSTSCRIPT_PORT?= print/ghostscript-gnu-nox11 -.elif defined(WITH_GHOSTSCRIPT_AFPL) -GHOSTSCRIPT_PORT?= print/ghostscript-afpl-nox11 .else GHOSTSCRIPT_PORT?= print/ghostscript-gpl-nox11 .endif diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 844cf0c3762c..0fa3438ecd47 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -34,17 +34,8 @@ CFLAGS+= -fPIC MAN1= xcircuit.1 -OPTIONS= GHOSTSCRIPT_AFPL "Use AFPL Postscript interpreter" off - .include <bsd.port.pre.mk> -pre-configure: -.if defined(WITH_GHOSTSCRIPT_AFPL) - @${ECHO_MSG} "===> Using AFPL Postscript interpreter" -.else - @${ECHO_MSG} "===> Using GNU Postscript interpreter" -.endif - post-patch: @${REINPLACE_CMD} -e '/test/s| == | = |g ; \ s|-Wl,-Bshareable,-x|-shared -Wl,-x|g ; \ diff --git a/chinese/enscript/Makefile b/chinese/enscript/Makefile index 54e3fec35a99..b725bc24c6fe 100644 --- a/chinese/enscript/Makefile +++ b/chinese/enscript/Makefile @@ -20,14 +20,6 @@ PKGMESSAGE= ${.CURDIR}/pkg-message USE_GHOSTSCRIPT_RUN= yes -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - post-patch: @${ECHO_CMD} "share/enscript/README.BIG5" > ${WRKDIR}/pkg-plist @${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/pkg-plist diff --git a/chinese/moefonts-cid/Makefile b/chinese/moefonts-cid/Makefile index 493ebdb6e465..60a5ccc3ed39 100644 --- a/chinese/moefonts-cid/Makefile +++ b/chinese/moefonts-cid/Makefile @@ -26,14 +26,6 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall ADOBECMAPDIR= ${LOCALBASE}/share/fonts/adobe-cmaps -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - do-install: @${INSTALL_DATA} ${DISTDIR}/MOEKai-Regular \ ${DISTDIR}/MOESung-Regular \ diff --git a/graphics/epstool/Makefile b/graphics/epstool/Makefile index 84c3a477fada..a1cd17d6a2dc 100644 --- a/graphics/epstool/Makefile +++ b/graphics/epstool/Makefile @@ -33,14 +33,6 @@ PLIST_FILES= bin/epstool PORTDOCS= epstool.htm gsview.css .endif -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/epstool ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/doc/epstool.1 ${MANPREFIX}/man/man1 diff --git a/graphics/ipe/Makefile b/graphics/ipe/Makefile index 6fab63f8a822..1f58cad010f8 100644 --- a/graphics/ipe/Makefile +++ b/graphics/ipe/Makefile @@ -35,14 +35,6 @@ MAN1= figtoipe.1 ipe.1 ipe5toxml.1 ipetoipe.1 ipetopng.1 QTDIR?= ${QT_PREFIX} QMAKE?= ${LOCALBASE}/bin/qmake -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - .if !defined(WITH_TEXMF_PREFIX) @${ECHO} "" @${ECHO} " Define WITH_TEXMF_PREFIX=somewhere" diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 5ff80d49ba6b..e5bed1fbd218 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -51,14 +51,6 @@ DOCSDIR= ${PREFIX}/share/doc/ocaml-images PORTDOCS= Announce Announce-2.2 CHANGES INSTALL LICENSE doc .endif -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-install: .if !defined(NOPORTDOCS) @${ECHO_MSG} -n ">> Installing documentation..." diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index c456e0524cdf..58b560ca886c 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -78,14 +78,6 @@ LIB_DEPENDS+= plotter.4:${PORTSDIR}/graphics/plotutils PLIST_SUB+= PLOTUTILS="" .endif -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-patch: @${REINPLACE_CMD} -e 's|CXXFLAGS="-g"|CXXFLAGS="$$CXXFLAGS"|g ; \ s|GCC_OK=no|GCC_OK=yes|g ; \ diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile index e2e259b3a2d5..5ce1377a54fd 100644 --- a/graphics/pstoepsi/Makefile +++ b/graphics/pstoepsi/Makefile @@ -24,14 +24,6 @@ NO_WRKSUBDIR= yes .SILENT: -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - pre-patch: ${CP} ${DISTDIR}/${DIST_SUBDIR}/pstoepsi ${WRKDIR}/pstoepsi.prefix ${CP} ${DISTDIR}/${DIST_SUBDIR}/README.this-site ${WRKDIR} diff --git a/graphics/py-chart/Makefile b/graphics/py-chart/Makefile index a14d49ee6288..4c574301ecbe 100644 --- a/graphics/py-chart/Makefile +++ b/graphics/py-chart/Makefile @@ -23,12 +23,4 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyChart -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - .include <bsd.port.mk> diff --git a/lang/logo/Makefile b/lang/logo/Makefile index 1e0d823360cb..db1024cb3d48 100644 --- a/lang/logo/Makefile +++ b/lang/logo/Makefile @@ -68,10 +68,6 @@ pre-everything:: @${ECHO_MSG} "" @${ECHO_MSG} " Define WITH_FULL_DOCS to build ps, pdf and html docs" @${ECHO_MSG} " This requires teTeX and ghostscript !" -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" -.endif @${ECHO_MSG} "" .endif diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile index a1b4cf4ee682..46cbb8617058 100644 --- a/mbone/wb/Makefile +++ b/mbone/wb/Makefile @@ -23,14 +23,6 @@ STRIP= # ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. USE_GHOSTSCRIPT_RUN= yes -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin .if !defined(NOPORTDOCS) diff --git a/net/wb/Makefile b/net/wb/Makefile index a1b4cf4ee682..46cbb8617058 100644 --- a/net/wb/Makefile +++ b/net/wb/Makefile @@ -23,14 +23,6 @@ STRIP= # ghostscript, ghostscript3, ghostscript4 or ghostscript5 will all do. USE_GHOSTSCRIPT_RUN= yes -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wb ${PREFIX}/bin .if !defined(NOPORTDOCS) diff --git a/ports-mgmt/portupgrade/pkg-message b/ports-mgmt/portupgrade/pkg-message index f4e4dc894cf0..a8570c445d15 100644 --- a/ports-mgmt/portupgrade/pkg-message +++ b/ports-mgmt/portupgrade/pkg-message @@ -4,7 +4,7 @@ E.g. ALT_PKGDEP = { 'www/apache13' => 'www/apache13-modssl', - 'print/ghostscript-afpl' => 'print/ghostscript-gnu', + 'print/ghostscript-gnu' => 'print/ghostscript-gpl', } Note also, portupgrade knows nothing how to handle ports with different diff --git a/print/Makefile b/print/Makefile index 1831933c6181..fd0e3a5231f5 100644 --- a/print/Makefile +++ b/print/Makefile @@ -86,8 +86,6 @@ SUBDIR += ft2demos SUBDIR += gfontview SUBDIR += ggv - SUBDIR += ghostscript-afpl - SUBDIR += ghostscript-afpl-nox11 SUBDIR += ghostscript-gnu SUBDIR += ghostscript-gnu-commfont SUBDIR += ghostscript-gnu-nox11 diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index e339695736b4..7b0005ca7e83 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -33,10 +33,6 @@ NO_X= yes MAKE_ENV+= NO_X=true .endif -# -# define WITH_GHOSTSCRIPT_AFPL=yes for AFPL Postscript interpreter -# instead of GNU one -# USE_GHOSTSCRIPT_RUN= yes # @@ -130,14 +126,6 @@ WRKSRC= ${WRKDIR}/apsfilter SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" GHOSTSCRIPT_PORT="${GHOSTSCRIPT_PORT}" CONFIGURE_ARGS= --prefix=${PREFIX} -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - .if !defined(BATCH) pre-configure: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile index 5eb331be4296..1d676fee3fa5 100644 --- a/print/font2svg/Makefile +++ b/print/font2svg/Makefile @@ -23,14 +23,6 @@ NO_BUILD= yes PLIST_FILES= bin/font2svg %%DATADIR%%/encodings %%DATADIR%%/font2svg.ps PLIST_DIRS= %%DATADIR%% -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-patch: @${REINPLACE_CMD} -e "s|^#!/bin/bash|#!/usr/bin/env bash| ; \ s|^font2svg_home=.*$$|font2svg_home=${DATADIR}|" \ diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 88a783093439..7ea57f479fb2 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -30,14 +30,6 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ GCONF_SCHEMAS= ggv.schemas -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-install: @-update-desktop-database > /dev/null diff --git a/print/ghostscript-afpl-nox11/Makefile b/print/ghostscript-afpl-nox11/Makefile deleted file mode 100644 index 0e12861ce4bc..000000000000 --- a/print/ghostscript-afpl-nox11/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# New ports collection makefile for: ghostscript-afpl-nox11 -# Date created: 23 February 2001 -# Whom: nik -# -# $FreeBSD$ -# - -WITHOUT_X11= yes - -MASTERDIR= ${.CURDIR}/../ghostscript-afpl - -.include "${MASTERDIR}/Makefile" diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile deleted file mode 100644 index 9b0b227576bc..000000000000 --- a/print/ghostscript-afpl/Makefile +++ /dev/null @@ -1,567 +0,0 @@ -# New ports collection makefile for: ghostscript -# Date created: Tue Jun 10 21:58:54 CEST 1997 -# Whom: Andreas Klemm <andreas@klemm.gtn.com> -# -# $FreeBSD$ -# - -PORTNAME= ghostscript -PORTVERSION= ${GS_VERSION} -PORTREVISION= ${GS_REVISION} -PORTEPOCH= ${GS_EPOCH} -CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \ - http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \ - http://www.harsch.net/Download/:dj970 \ - http://www33.ocn.ne.jp/~higamasa/gdevmd2k/:md2k \ - ${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \ - ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \ - http://www.ucatv.ne.jp/~taeko/software/gs/:lips \ - http://www.humblesoft.com/pub/:epag \ - ${MASTER_SITE_LOCAL}:eplaser \ - http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \ - http://www.linuxprinting.org/download/printing/:lxm3200 \ - http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \ - http://www.openprinting.org/download/printing/ghostscript-8.x/drivers/hl1250/:hl1250 \ - ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs -MASTER_SITE_SUBDIR= ghostscript/:gs_srcs,ports_jp_gs \ - bjc250gs/:bjc250 \ - ./:ports_jp \ - arved/:eplaser -PKGNAMESUFFIX= -afpl -DISTFILES= ${GS_SRCS}:gs_srcs \ - ${HP8XX_SRCS}:hp8xx \ - ${DJ970_SRCS}:dj970 \ - ${MD2K_SRCS}:md2k \ - ${ALPS_SRCS}:ports_jp_gs \ - ${BJ10V_SRCS}:ports_jp_gs \ - ${BJC250_SRCS}:bjc250 \ - ${CPCA_SRCS}:cpca \ - ${LIPS_SRCS}:lips \ - ${EPAG_SRCS}:epag \ - ${EPLASER_SRCS}:eplaser \ - ${MJC_SRCS}:ports_jp \ - ${GDI_SRCS}:gdi \ - ${LXM3200_SRCS}:lxm3200 \ - ${LX5000_SRCS}:lx5000 \ - ${LEX7000_SRCS}:lx5000 \ - ${HL1250_SRCS}:hl1250 -DIST_SUBDIR= ghostscript -EXTRACT_ONLY= ${GS_SRCS} - -MAINTAINER= ports@FreeBSD.org -COMMENT= AFPL Postscript interpreter - -LIB_DEPENDS= jasper.4:${PORTSDIR}/graphics/jasper \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png -RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts - -NO_CDROM= Can only be distributed for free - -DEPRECATED= the leading edge of Ghostscript development is now under GPL license, use print/ghostscript-gpl instead -EXPIRATION_DATE= 2007-07-01 - -CONFLICTS= ghostscript-gnu* ghostscript-gpl* -USE_BZIP2= yes -USE_GMAKE= yes -MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ - XCFLAGS="${XCFLAGS}" -PLIST_SUB= GS_VERSION="${GS_VERSION}" \ - CIDFONTDIR=${CIDFONTDIR} - -SCRIPTS_ENV= GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \ - WITHOUT_X11="${WITHOUT_X11}" \ - WITH_SVGALIB="${WITH_SVGALIB}" - -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 -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 \ - ps2ps.1 eps2eps.1 - -XCFLAGS= -DUPD_SIGNAL=0 -DHAVE_HYPOT=1 -DSYS_TYPES_HAS_STDINT_TYPES=1 - -.if defined(A4) -XCFLAGS+= -DA4 -.endif - -.if defined(WITHOUT_X11) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-nox11 -.else -USE_XORG= xt xext -.endif - -.if defined(WITH_SVGALIB) -LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib -.endif - -.if defined(WITH_FT_BRIDGE) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2 -MAKE_ENV+= FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a" -.endif - -.if defined(WITH_SHLIB) -.undef WITHOUT_X11 -USE_GNOME= gtk12 -MAKE_ENV+= GS_SHLIB_VER="${SHLIB_VER}" -ALL_TARGET= so -INSTALL_TARGET= soinstall -USE_LDCONFIG= yes -SHLIB_VER= 1 -PLIST_SUB+= SHLIB="" SHLIB_VER="${SHLIB_VER}" -INCLUDEDIR= ${PREFIX}/include/ghostscript -.else -PLIST_SUB+= SHLIB="@comment " -.endif - -GS_SRCS= ${DISTNAME}${EXTRACT_SUFX} -CIDFONTDIR= ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource - -# Additional Drivers: - -# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C -# http://www.gelhaus.net/hp880c/ -HP8XX= cdj880 -HP8XX_SRCS= gdevcd8.tar.gz - -# DJ970 - additional driver for HP DeskJet 970, supports duplex printing -# http://www.harsch.net/Ghostscript/ghostscript.html -DJ970= gdevdj9 -DJ970_SRCS= ${DJ970}.c.gz - -# MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000 -# http://www33.ocn.ne.jp/~higamasa/gdevmd2k/ -MD2K= md2k -MD2K_VERS= 0.2a -MD2K_NAME= gdevmd2k-${MD2K_VERS} -MD2K_SRCS= ${MD2K_NAME}.tar.gz - -# ALPS - additional driver for Alps MD-5000 -ALPS= alps -ALPS_VERS= 0.2 -ALPS_NAME= gdevalps-${ALPS_VERS} -ALPS_SRCS= gdevalps-0.21.tar.gz - -# BJ10V - additional driver for Canon BJ-10V -BJ10V= bj10v -BJ10V_NAME= gdev10v -BJ10V_SRCS= ${BJ10V_NAME}.tar.gz - -# BJC250 - additional driver for Canon BJC-210/240/250/265/1000 -# http://bjc250gs.sourceforge.net/ -BJC250= bjc250 -BJC250_VERS= 0.756 -BJC250_NAME= ${BJC250}-v${BJC250_VERS} -BJC250_SRCS= gs7.05-${BJC250_NAME}.diff.gz - -# CPCA - additional driver for Canon CPCA printers -# http://cweb.canon.jp/open-mie/technical/index-j.html -CPCA= cpca -CPCA_VERS= 1.0.0 -CPCA_NAME= canon-lips4-${CPCA_VERS} -CPCA_SRCS= ${CPCA_NAME}-651.tgz - -# LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers -# http://www.ucatv.ne.jp/~taeko/software/gs/ -LIPS= lips -LIPS_VERS= 2.4.0 -LIPS_NAME= gdevlips-${LIPS_VERS} -LIPS_SRCS= ${LIPS_NAME}.tar.gz - -# EPAG - additional driver for Epson ESC/Page printers -# http://www.humblesoft.com/gdevepag.html -EPAG= epag -EPAG_VERS= 3.09 -EPAG_NAME= ${EPAG}-${EPAG_VERS} -EPAG_SRCS= ${EPAG_NAME}.tar.gz - -# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp. -# http://www.avasys.jp/english/linux_e/index.html -EPLASER= eplaser -EPLASER_VERS= 3.1.4 -EPLASER_NAME= ${EPLASER}-${EPLASER_VERS} -EPLASER_SRCS= ${EPLASER_NAME}-705.tgz - -# MJC - additional driver for Epson MachJet series -MJC= mjc -MJC_VERS= 0.8 -MJC_NAME= gdevmjc-${MJC_VERS} -MJC_SRCS= ${MJC_NAME}.tar.gz - -# GDI - additional driver for Samsung SmartGDI laser printers -GDI= gdi -GDI_NAME= Samsung-SmartGDI-all-GS -GDI_SRCS= ${GDI_NAME}.orig.tar.gz - -# LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32 -LXM3200= lxm3200 -LXM3200_VERS= 20030501 -LXM3200_NAME= ${LXM3200}-tweaked-${LXM3200_VERS} -LXM3200_SRCS= ${LXM3200_NAME}.tar.gz - -# LX5000 - additional driver for Lexmark 5000/Z51/Z82 -# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html -LX5000= lx5000 -LX5000_SRCS= gdevlx50.c - -# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000 -# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/ -LEX7000= lex7000 -LEX7000_SRCS= gs6.0.lexmark7000.patch - -# HL1250 - additional driver for Brother HL-1050/1070/1250/1270N/1030/1240 -# XXX FIXME -HL1250= hl1250 -HL1250_SRCS= gdevhl12.c - -# contributed uniprint profiles -CONTRIB_UPP= lqx70ch.upp lqx70cl.upp lqx70cm.upp \ - stc740ih.upp stc740p.upp stc740pl.upp - -.include "Makefile.inc" -.include <bsd.port.pre.mk> -.SILENT: - -pre-everything:: -.if !defined(A4) - ${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation." -.else - ${ECHO_MSG} "Using -DA4 for compilation." -.endif - -post-extract: - ${ECHO_MSG} ">>> in post-extract ..." -# ** 3rd party driver ** -# Note: don't forget to add those devices in scripts/configure, -# which update unix-gcc.mak to build gs with these new devices! -# -# for HP8XX driver - ${ECHO_MSG} ">>> extracting ${HP8XX_SRCS} ..." - ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS} -# for DJ970 driver - ${ECHO_MSG} ">>> extracting ${DJ970_SRCS} ..." - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src - ${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS} -# for MD2K driver - ${ECHO_MSG} ">>> extracting ${MD2K_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS} - ${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K} -# for ALPS driver - ${ECHO_MSG} ">>> extracting ${ALPS_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRCS} - ${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS} -# for BJ10V driver - ${ECHO_MSG} ">>> extracting ${BJ10V_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${BJ10V_SRCS} -# for BJC250 driver - ${ECHO_MSG} ">>> extracting ${BJC250_SRCS} ..." - ${MKDIR} ${WRKSRC}/${BJC250_NAME}/src - ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${BJC250_SRCS} | \ - ${PATCH} -d ${WRKSRC}/${BJC250_NAME} -f -s -N -E -p1 \ - 2>/dev/null || ${TRUE} - ${LN} -sf ${BJC250_NAME} ${WRKSRC}/${BJC250} -# for CPCA driver - ${ECHO_MSG} ">>> extracting ${CPCA_SRCS} ..." - ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${CPCA_SRCS} -# for LIPS driver - ${ECHO_MSG} ">>> extracting ${LIPS_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS} - ${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS} -# for EPAG driver - ${ECHO_MSG} ">>> extracting ${EPAG_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS} - ${LN} -sf ${EPAG_NAME} ${WRKSRC}/${EPAG} -# for EPLASER driver - ${ECHO_MSG} ">>> extracting ${EPLASER_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRCS} - ${LN} -sf ${EPLASER_NAME} ${WRKSRC}/${EPLASER} -# for MJC driver - ${ECHO_MSG} ">>> extracting ${MJC_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS} - ${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC} -# for GDI driver - ${ECHO_MSG} ">>> extracting ${GDI_SRCS} ..." - ${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS} -# for LXM3200 driver - ${ECHO_MSG} ">>> extracting ${LXM3200_SRCS} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LXM3200_SRCS} - ${LN} -sf ${LXM3200_NAME} ${WRKSRC}/${LXM3200} -# for LX5000 driver - ${ECHO_MSG} ">>> extracting ${LX5000_SRCS} ..." - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${LX5000_SRCS} ${WRKSRC}/src -# for LEX7000 driver - ${ECHO_MSG} ">>> extracting ${LEX7000_SRCS} ..." - ${MKDIR} ${WRKSRC}/${LEX7000} - ${CAT} ${DISTDIR}/${DIST_SUBDIR}/${LEX7000_SRCS} | \ - ${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \ - 2>/dev/null || ${TRUE} -# for HL1250 driver - ${ECHO_MSG} ">>> extracting ${HL1250_SRCS} ..." - ${MKDIR} ${WRKSRC}/${HL1250} - ${CP} ${DISTDIR}/${DIST_SUBDIR}/${HL1250_SRCS} ${WRKSRC}/src - -post-patch: - ${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \ - ${WRKSRC}/src/unix-gcc.mak - ${REINPLACE_CMD} -e 's|\. de|\.|g' \ - ${WRKSRC}/src/unixinst.mak - -# here we apply the modifications necessary to build the 3rd party drivers -# advantage: you see unmodified makefiles after a pure make extract -pre-configure: - ${ECHO_MSG} ">>> in pre-configure ..." -# for HP8XX driver - ${ECHO_MSG} ">>> adding ${HP8XX} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/cdj850.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for DJ970 driver - ${ECHO_MSG} ">>> adding ${DJ970} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/dj970.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for MD2K driver - ${ECHO_MSG} ">>> adding ${MD2K} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \ - >> ${WRKSRC}/src/contrib.mak -# for ALPS driver - ${ECHO_MSG} ">>> adding ${ALPS} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${ALPS_NAME}/gdevalps.mak-5.50 \ - >> ${WRKSRC}/src/contrib.mak -# for BJ10V driver - ${ECHO_MSG} ">>> adding ${BJ10V} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.mak \ - >> ${WRKSRC}/src/contrib.mak -# for BJC250 driver - ${ECHO_MSG} ">>> adding ${BJC250} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/bjc250.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for CPCA driver - ${ECHO_MSG} ">>> adding ${CPCA} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/src/cpca_gdev.mak \ - >> ${WRKSRC}/src/contrib.mak -# for LIPS driver - ${ECHO_MSG} ">>> adding ${LIPS} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \ - >> ${WRKSRC}/src/contrib.mak -# for EPAG driver - ${ECHO_MSG} ">>> adding ${EPAG} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/epag.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for EPLASER driver - ${ECHO_MSG} ">>> adding ${EPLASER} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv7.mak \ - >> ${WRKSRC}/src/contrib.mak - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv7.mak \ - >> ${WRKSRC}/src/contrib.mak -# for MJC driver - ${ECHO_MSG} ">>> adding ${MJC} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \ - >> ${WRKSRC}/src/contrib.mak -# for GDI driver - ${ECHO_MSG} ">>> adding ${GDI} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for LXM3200 driver - ${ECHO_MSG} ">>> adding ${LXM3200} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/lxm3200.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for LX5000 driver - ${ECHO_MSG} ">>> adding ${LX5000} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/lx5000.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for LEX7000 driver - ${ECHO_MSG} ">>> adding ${LEX7000} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/lex7000.contrib.mak \ - >> ${WRKSRC}/src/contrib.mak -# for HL1250 driver - ${ECHO_MSG} ">>> adding ${HL1250} driver to contrib.mak ..." - ${CAT} ${FILESDIR}/gdevhl12-hl1250.mak \ - >> ${WRKSRC}/src/contrib.mak - -pre-build: - ${ECHO_MSG} ">>> in pre-build ..." - ${ECHO_MSG} ">>> creating directories for compilation ..." - ${MKDIR} ${WRKSRC}/obj - ${MKDIR} ${WRKSRC}/bin -# for MD2K driver - ${ECHO_MSG} ">>> creating symlinks for ${MD2K} ..." -.for i in gdevmd2k.c - ${LN} -sf ${WRKSRC}/${MD2K_NAME}/${i} ${WRKSRC}/src -.endfor -# for ALPS driver - ${ECHO_MSG} ">>> creating symlinks for ${ALPS} ..." -.for i in gdevalps.c - ${LN} -sf ${WRKSRC}/${ALPS_NAME}/${i} ${WRKSRC}/src -.endfor -# for BJ10V driver - ${ECHO_MSG} ">>> creating symlinks for ${BJ10V} ..." -.for i in gdev10v.c - ${LN} -sf ${WRKSRC}/${BJ10V_NAME}/${i} ${WRKSRC}/src -.endfor -# for BJC250 driver - ${ECHO_MSG} ">>> creating symlinks for ${BJC250} ..." -.for i in gdevbjc_.[ch] gdevbjca.c - ${LN} -sf ${WRKSRC}/${BJC250_NAME}/src/${i} ${WRKSRC}/src -.endfor -# for LIPS driver - ${ECHO_MSG} ">>> creating symlinks for ${LIPS} ..." -.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \ - gdevnpdl.c gdevrpdl.c - ${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src -.endfor -# for EPAG driver - ${ECHO_MSG} ">>> building ${EPAG} utility ..." - cd ${WRKSRC}/${EPAG_NAME} ; \ - ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile - ${ECHO_MSG} ">>> creating symlinks for ${EPAG} ..." -.for i in gdevepag.c - ${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src -.endfor -# for EPLASER driver - ${ECHO_MSG} ">>> creating symlinks for ${EPLASER} ..." -.for i in gdevescv.[ch] gdevesmv.c - ${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${i} ${WRKSRC}/src -.endfor -# for MJC driver - ${ECHO_MSG} ">>> creating symlinks for ${MJC} ..." -.for i in gdevmjc.c mjbarrie.c mjbksep.c mjespdtc.c mjespdtm.c mjespdty.c \ - mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c - ${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src -.endfor -# for LXM3200 driver - ${ECHO_MSG} ">>> creating symlinks for ${LXM3200} ..." -.for i in gdevlx32.c - ${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src -.endfor -# for LEX7000 driver - ${ECHO_MSG} ">>> creating symlinks for ${LEX7000} ..." -.for i in gdevlx7.c - ${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src -.endfor -.if defined(WITH_FT_BRIDGE) - ${MKDIR} ${WRKSRC}/freetype/include - ${LN} -sf ${LOCALBASE}/include/ft2build.h \ - ${WRKSRC}/freetype/include/ft2build.h - ${LN} -sf ${LOCALBASE}/include/freetype2/freetype \ - ${WRKSRC}/freetype/include/freetype - ${MKDIR} ${WRKSRC}/freetype/objs - ${LN} -sf ${LOCALBASE}/lib/libfreetype.a \ - ${WRKSRC}/freetype/objs/freetype214MT_D.a -.endif - -pre-su-install: - ${ECHO_MSG} ">>> in pre-install ..." - ${ECHO_MSG} ">>> creating ghostscript destdir ..." - ${MKDIR} ${DATADIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR} -.if defined(WITH_SHLIB) - ${MKDIR} ${INCLUDEDIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR} -.endif - -post-install: - ${ECHO_MSG} ">>> in post-install ..." - ${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont -.if defined(WITH_SHLIB) - ${INSTALL_DATA} ${WRKSRC}/src/iapi.h \ - ${WRKSRC}/src/ierrors.h \ - ${INCLUDEDIR} -.endif - ${ECHO_MSG} ">>> stripping gs ..." -.if defined(WITH_SHLIB) - ${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx - ${LN} -sf gsc ${PREFIX}/bin/gs -.else - ${STRIP_CMD} ${PREFIX}/bin/gs -.endif -# for EPAG driver - ${ECHO_MSG} ">>> installing ${EPAG} utility in bindir ..." - ${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin -# contributed UPP driver - ${ECHO_MSG} ">>> installing contributed UPP profiles ..." -.for i in ${CONTRIB_UPP} - ${INSTALL_DATA} ${FILESDIR}/${i} \ - ${DATADIR}/${GS_VERSION}/lib -.endfor -# -# now NOPORTDOCS dependend stuff -# -.if !defined(NOPORTDOCS) - ${ECHO_MSG} ">>> installing PORTDOC stuff ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION} -# for MD2K driver - ${ECHO_MSG} ">>> installing ${MD2K} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MD2K} -.for i in README.jis - ${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${MD2K} -.endfor -# for ALPS driver - ${ECHO_MSG} ">>> installing ${ALPS} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${ALPS} -.for i in README.gdevalps - ${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${ALPS} -.endfor -# for BJ10V driver - ${ECHO_MSG} ">>> installing ${BJ10V} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${BJ10V} -.for i in gdev10v.jis - ${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${BJ10V} -.endfor -# for LIPS driver - ${ECHO_MSG} ">>> installing ${LIPS} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LIPS} -.for i in Gdevlips.htm - ${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${LIPS} -.endfor -# for EPAG driver - ${ECHO_MSG} ">>> installing ${EPAG} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG} -.for i in ert.txt gdevepag.txt ChangeLog - ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${EPAG} -.endfor -.for i in psprint gsepagif.sh - ${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${EPAG} -.endfor -# for EPLASER driver - ${ECHO_MSG} ">>> installing ${EPLASER} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER} -.for i in readme-eplaser-705.euc - ${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${EPLASER} -.endfor -# for MJC driver - ${ECHO_MSG} ">>> installing ${MJC} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MJC} -.for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc - ${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${MJC} -.endfor -# for GDI driver - ${ECHO_MSG} ">>> installing ${GDI} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI} -.for i in README - ${INSTALL_DATA} ${WRKSRC}/src/${i} \ - ${DOCSDIR}/${GS_VERSION}/${GDI} -.endfor -# for LXM3200 driver - ${ECHO_MSG} ">>> installing ${LXM3200} docs ..." - ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LXM3200} -.for i in README RELEASE_NOTES Z12-Z31-QuickSetup - ${INSTALL_DATA} ${WRKSRC}/${LXM3200_NAME}/${i} \ - ${DOCSDIR}/${GS_VERSION}/${LXM3200} -.endfor -.endif - ${ECHO_MSG} "> post-installation tasks completed." - -.include <bsd.port.post.mk> diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc deleted file mode 100644 index 67d9277aca5e..000000000000 --- a/print/ghostscript-afpl/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# $FreeBSD$ - -GS_VERSION= 8.54 -GS_REVISION= 5 -GS_EPOCH= 1 diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo deleted file mode 100644 index cbbf5cb63e44..000000000000 --- a/print/ghostscript-afpl/distinfo +++ /dev/null @@ -1,54 +0,0 @@ -MD5 (ghostscript/ghostscript-8.54.tar.bz2) = 58f688190dcc5e9e337edad22b23fc0d -SHA256 (ghostscript/ghostscript-8.54.tar.bz2) = 2d363fd56dcebf2f97ce445b0628d3715aa24b4aa386d9f481023c8efacc0fa1 -SIZE (ghostscript/ghostscript-8.54.tar.bz2) = 12385895 -MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0 -SHA256 (ghostscript/gdevcd8.tar.gz) = f52656a951e402f3775fdf09087944dba6f7a58edff17ce350692cee101cccf9 -SIZE (ghostscript/gdevcd8.tar.gz) = 24803 -MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27 -SHA256 (ghostscript/gdevdj9.c.gz) = 7657dece1c2d9af15b7599e92f3170b9aaf927d429d90e4e928d3d7052fb376f -SIZE (ghostscript/gdevdj9.c.gz) = 20139 -MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24 -SHA256 (ghostscript/gdevmd2k-0.2a.tar.gz) = c99d6b4cc026c78729331c99a6d9ced24960c61b356c3a61162d2268274a7e7c -SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955 -MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9 -SHA256 (ghostscript/gdevalps-0.21.tar.gz) = 250f54084bc186237e24233aa3cbffcc192e14b19620876a518b38ffe9b14421 -SIZE (ghostscript/gdevalps-0.21.tar.gz) = 4452 -MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73 -SHA256 (ghostscript/gdev10v.tar.gz) = 99f51fa42c9223e2c6b3658d82c790cffbf146bd8ef60c89ddba56128c7a40d3 -SIZE (ghostscript/gdev10v.tar.gz) = 6099 -MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621d -SHA256 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = aeeaa041a04a3ca95b50c1c1ebc60b7a570668fd110671610c0f21dab07ddd64 -SIZE (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 16501 -MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a -SHA256 (ghostscript/canon-lips4-1.0.0-651.tgz) = e11d11fa9d8645e4102a36d293cdf42498b5fbecc966d0bd104c5aa951c08cae -SIZE (ghostscript/canon-lips4-1.0.0-651.tgz) = 38835 -MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f -SHA256 (ghostscript/gdevlips-2.4.0.tar.gz) = 24164cdc12cb0d03512c2f04ed82fa1e901625504367b8c53cc74134ee9c3047 -SIZE (ghostscript/gdevlips-2.4.0.tar.gz) = 67683 -MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 -SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b -SIZE (ghostscript/epag-3.09.tar.gz) = 12858 -MD5 (ghostscript/eplaser-3.1.4-705.tgz) = 94246b034af171b4336d90198e9f4bd8 -SHA256 (ghostscript/eplaser-3.1.4-705.tgz) = ed1ccdf6ec613eb5e028786ad59cb3060f00c2ffa8ca5792bfd219514dc69f42 -SIZE (ghostscript/eplaser-3.1.4-705.tgz) = 44523 -MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c -SHA256 (ghostscript/gdevmjc-0.8.tar.gz) = cd922677798ce85b7e06d92694bb8b0012bc5d6ed66d6982f20eed471974f05b -SIZE (ghostscript/gdevmjc-0.8.tar.gz) = 102654 -MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b -SHA256 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 2c8c43e2318dd8b143344235ad7ccc203a3a8c4c50419f3967f1a999a92ea430 -SIZE (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 10488 -MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b -SHA256 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 9156ca7948158102938b127b356dfcd778e79a271893f56efe7cb65a41f46380 -SIZE (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 39000 -MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf -SHA256 (ghostscript/gdevlx50.c) = 668de62188819f5c27f00ab04f1b7b58ff9ff52ac16497429a0637f412112117 -SIZE (ghostscript/gdevlx50.c) = 99428 -MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de -SHA256 (ghostscript/gs6.0.lexmark7000.patch) = 509dfc02436639ce6b9f98465ec306dd2e7f9342feded043c78b0c9cf44021df -SIZE (ghostscript/gs6.0.lexmark7000.patch) = 27361 -MD5 (ghostscript/gdevhl12.c) = 277c5ddac9c6fb0e2897e95265eb1ff1 -SHA256 (ghostscript/gdevhl12.c) = 0abaa60cbe950b9c923753a687181b775910ecff0848917641e281737f03527a -SIZE (ghostscript/gdevhl12.c) = 22001 -MD5 (ghostscript/gdevhl12-hl1250.mak) = e5838642567ec2da6660ef2d6a602cff -SHA256 (ghostscript/gdevhl12-hl1250.mak) = 1acde11d9ebd11a590e33b76ec3a1ead12ab775e42b0ebb52d685310380ff7a8 -SIZE (ghostscript/gdevhl12-hl1250.mak) = 678 diff --git a/print/ghostscript-afpl/files/bjc250.contrib.mak b/print/ghostscript-afpl/files/bjc250.contrib.mak deleted file mode 100644 index 5c1ce77e98dc..000000000000 --- a/print/ghostscript-afpl/files/bjc250.contrib.mak +++ /dev/null @@ -1,31 +0,0 @@ -### ----------------- The BJC-210/240/250/250ex/265/1000 ---------------- ### - -### -### For questions about the driver, mailto://szaszg@hu.inter.net -### http://bjc250gs.sourceforge.net -### - -bjc_h=$(GLSRC)gdevbjc_.h - -bjc_=$(GLOBJ)gdevbjc_.$(OBJ) $(GLOBJ)gdevbjca.$(OBJ) - -$(GLOBJ)gdevbjc_.$(OBJ) : $(GLSRC)gdevbjc_.c $(PDEVH) $(bjc_h) - $(GLCC) $(GLO_)gdevbjc_.$(OBJ) $(C_) $(GLSRC)gdevbjc_.c - -$(GLOBJ)gdevbjca.$(OBJ) : $(GLSRC)gdevbjca.c $(PDEVH) $(bjc_h) - $(GLCC) $(GLO_)gdevbjca.$(OBJ) $(C_) $(GLSRC)gdevbjca.c - -$(DD)bjcmono.dev : $(bjc_) $(DD)page.dev - $(SETPDEV) $(DD)bjcmono $(bjc_) - -$(DD)bjcgray.dev : $(bjc_) $(DD)page.dev - $(SETPDEV) $(DD)bjcgray $(bjc_) - -$(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev - $(SETPDEV) $(DD)bjccmyk $(bjc_) - -$(DD)bjccolor.dev : $(bjc_) $(DD)page.dev - $(SETPDEV) $(DD)bjccolor $(bjc_) - -### -------------------- The H-P Color LaserJet 5/5M -------------------- ### - diff --git a/print/ghostscript-afpl/files/cdj850.contrib.mak b/print/ghostscript-afpl/files/cdj850.contrib.mak deleted file mode 100644 index 8faefec5fe4e..000000000000 --- a/print/ghostscript-afpl/files/cdj850.contrib.mak +++ /dev/null @@ -1,21 +0,0 @@ -###- cdj850 - HP 850 Driver under development -------- ### -cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL) - -$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) - -$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) - -$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) - -$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) - -$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) - -$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\ - $(gsparam_h) $(gxlum_h) $(gdevpcl_h) - $(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c diff --git a/print/ghostscript-afpl/files/dj970.contrib.mak b/print/ghostscript-afpl/files/dj970.contrib.mak deleted file mode 100644 index 8227012da41a..000000000000 --- a/print/ghostscript-afpl/files/dj970.contrib.mak +++ /dev/null @@ -1,9 +0,0 @@ -###- cdj970 - HP 970Cxi Driver under development -------- ### -cdeskjet9_=$(GLOBJ)gdevdj9.$(OBJ) $(HPPCL) - -$(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev - $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) - -$(GLOBJ)gdevdj9.$(OBJ) : $(GLSRC)gdevdj9.c $(PDEVH) $(math__h) \ - $(gsparam_h) $(gxlum_h) $(gdevpcl_h) - $(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(GLSRC)gdevdj9.c diff --git a/print/ghostscript-afpl/files/epag.contrib.mak b/print/ghostscript-afpl/files/epag.contrib.mak deleted file mode 100644 index 2e6117ad4b51..000000000000 --- a/print/ghostscript-afpl/files/epag.contrib.mak +++ /dev/null @@ -1,8 +0,0 @@ -### ------- Epson ESC/Page printer device ----------------- ### -epag_=$(GLOBJ)gdevepag.$(OBJ) - -$(DD)epag.dev : $(epag_) $(DD)page.dev - $(SETPDEV) $(DD)epag $(epag_) - -$(GLOBJ)gdevepag.$(OBJ): $(GLSRC)gdevepag.c $(gdevprn_h) $(PDEVH) - $(GLCC) $(GLO_)gdevepag.$(OBJ) $(C_) $(GLSRC)gdevepag.c diff --git a/print/ghostscript-afpl/files/gdevhl12-hl1250.mak b/print/ghostscript-afpl/files/gdevhl12-hl1250.mak deleted file mode 100644 index 8e1421ad1f03..000000000000 --- a/print/ghostscript-afpl/files/gdevhl12-hl1250.mak +++ /dev/null @@ -1,16 +0,0 @@ -### -------------------- The Brother HL-1250 printer -------------------- ### -### This printer is ljet4-compatible, plus support for source tray ### -### selection and special 1200x600 dpi mode. ### - -hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM) -$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev - $(SETPDEV) $(DD)hl1250 $(hl1250_) - -$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev - $(SETPDEV) $(DD)hl1240 $(hl1250_) - -# Author: Marek Michalkiewicz <marekm@linux.org.pl> -# Printer: Brother HL-1250 (may work with some other models too) -$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) - $(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c - diff --git a/print/ghostscript-afpl/files/lex7000.contrib.mak b/print/ghostscript-afpl/files/lex7000.contrib.mak deleted file mode 100644 index a5f1a162b785..000000000000 --- a/print/ghostscript-afpl/files/lex7000.contrib.mak +++ /dev/null @@ -1,21 +0,0 @@ -# ------ The Lexmark 5700 and 7000 devices ------ # - -lex7000_=$(GLOBJ)gdevlx7.$(OBJ) -$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev - $(SETPDEV) $(DD)lex7000 $(lex7000_) - -lex5700_=$(GLOBJ)gdevlx7.$(OBJ) -$(DD)lex5700.dev: $(lex5700_) $(DD)page.dev - $(SETPDEV) $(DD)lex5700 $(lex5700_) - -lex3200_=$(GLOBJ)gdevlx7.$(OBJ) -$(DD)lex3200.dev: $(lex3200_) $(DD)page.dev - $(SETPDEV) $(DD)lex3200 $(lex3200_) - -lex2050_=$(GLOBJ)gdevlx7.$(OBJ) -$(DD)lex2050.dev: $(lex2050_) $(DD)page.dev - $(SETPDEV) $(DD)lex2050 $(lex2050_) - -$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH) - $(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c - diff --git a/print/ghostscript-afpl/files/lqx70ch.upp b/print/ghostscript-afpl/files/lqx70ch.upp deleted file mode 100644 index b5d3cd49e912..000000000000 --- a/print/ghostscript-afpl/files/lqx70ch.upp +++ /dev/null @@ -1,26 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/lqx70ch.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $ -# --supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x360DpI, Plain Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/ErrorDiffusion --dupOutputFormat=/EscP2 --r360x360 --dupMargins="{ 9.0 0.0 9.0 24.0}" --dupOutputPins=24 --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2869 0100 01 - 1b2855 0100 0A - 1b5501 - 1b2865 0200 0002 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupEndPageCommand="(\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/files/lqx70cl.upp b/print/ghostscript-afpl/files/lqx70cl.upp deleted file mode 100644 index 91fb1aa89906..000000000000 --- a/print/ghostscript-afpl/files/lqx70cl.upp +++ /dev/null @@ -1,26 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/lqx70cl.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $ -# --supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 180x180DpI, Plain Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/ErrorDiffusion --dupOutputFormat=/EscP2 --r180x180 --dupMargins="{ 9.0 0.0 9.0 24.0}" --dupOutputPins=24 --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2869 0100 01 - 1b2855 0100 14 - 1b5500 - 1b2865 0200 0002 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupEndPageCommand="(\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/files/lqx70cm.upp b/print/ghostscript-afpl/files/lqx70cm.upp deleted file mode 100644 index 895af73aa8d8..000000000000 --- a/print/ghostscript-afpl/files/lqx70cm.upp +++ /dev/null @@ -1,25 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/lqx70cm.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $ -# --supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x180DpI, Plain Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/ErrorDiffusion --dupOutputFormat=/EscP2 --r360x180 --dupMargins="{ 9.0 24.0 9.0 24.0}" --dupOutputPins=24 --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2869 0100 01 - 1b2855 0100 14 - 1b5501 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupEndPageCommand="(\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/files/lx5000.contrib.mak b/print/ghostscript-afpl/files/lx5000.contrib.mak deleted file mode 100644 index f22c1dbb904c..000000000000 --- a/print/ghostscript-afpl/files/lx5000.contrib.mak +++ /dev/null @@ -1,11 +0,0 @@ -### ----------------- LexMark 5000 printer ----------------------------- ### -### Note: this driver was contributed by users. Please contact: ### -### Peter B. West <p.west@uq.net.au> ### - -lx5000_=$(GLOBJ)gdevlx50.$(OBJ) -$(DD)lx5000.dev: $(lx5000_) - $(SETPDEV) $(DD)lx5000 $(lx5000_) - -$(GLOBJ)gdevlx50.$(OBJ): $(GLSRC)gdevlx50.c $(PDEVH) - $(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c - diff --git a/print/ghostscript-afpl/files/lxm3200.contrib.mak b/print/ghostscript-afpl/files/lxm3200.contrib.mak deleted file mode 100644 index c670f6de111c..000000000000 --- a/print/ghostscript-afpl/files/lxm3200.contrib.mak +++ /dev/null @@ -1,10 +0,0 @@ -### ---------------- Lexmark 3200 device ----------------- ### - -lxm3200_=$(GLOBJ)gdevlx32.$(OBJ) - -$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev - $(SETPDEV) $(DD)lxm3200 $(lxm3200_) - -$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h) - $(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c - diff --git a/print/ghostscript-afpl/files/patch-alps:gdevalps.c b/print/ghostscript-afpl/files/patch-alps:gdevalps.c deleted file mode 100644 index ad77a9e9af10..000000000000 --- a/print/ghostscript-afpl/files/patch-alps:gdevalps.c +++ /dev/null @@ -1,22 +0,0 @@ ---- alps/gdevalps.c.orig Wed Nov 24 09:28:35 1999 -+++ alps/gdevalps.c Fri Dec 17 19:12:35 2004 -@@ -173,7 +173,7 @@ - { - int lnum; - int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev); -- byte *data = (byte *)gs_malloc(8, line_size, "md50_print_page(data)" ); -+ byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md50_print_page(data)" ); - int skipping = 0; - int nbyte; - int nskip; -@@ -232,8 +232,8 @@ - { - int lnum; - int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev); -- byte *data = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)"); -- byte *out_start = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)"); -+ byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)"); -+ byte *out_start = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)"); - int skipping = 0; - int nbyte; - diff --git a/print/ghostscript-afpl/files/patch-alps:gdevalps.mak b/print/ghostscript-afpl/files/patch-alps:gdevalps.mak deleted file mode 100644 index 45144eaadcfd..000000000000 --- a/print/ghostscript-afpl/files/patch-alps:gdevalps.mak +++ /dev/null @@ -1,25 +0,0 @@ ---- alps/gdevalps.mak-5.50.orig Sat Jan 12 13:21:12 2002 -+++ alps/gdevalps.mak-5.50 Sat Jan 12 13:23:45 2002 -@@ -2,15 +2,15 @@ - - alps_=$(GLOBJ)gdevalps.$(OBJ) - --md50Mono.dev: $(alps_) page.dev -- $(SETPDEV) md50Mono $(alps_) -+$(DD)md50Mono.dev: $(alps_) $(DD)page.dev -+ $(SETPDEV) $(DD)md50Mono $(alps_) - --md50Eco.dev: $(alps_) page.dev -- $(SETPDEV) md50Eco $(alps_) -+$(DD)md50Eco.dev: $(alps_) $(DD)page.dev -+ $(SETPDEV) $(DD)md50Eco $(alps_) - --md1xMono.dev: $(alps_) page.dev -- $(SETPDEV) md1xMono $(alps_) -+$(DD)md1xMono.dev: $(alps_) $(DD)page.dev -+ $(SETPDEV) $(DD)md1xMono $(alps_) - --$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(PDEVH) -+$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(gdevprn_h) $(PDEVH) - $(GLCC) $(GLO_)gdevalps.$(OBJ) $(C_) $(GLSRC)gdevalps.c - diff --git a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.c b/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.c deleted file mode 100644 index 8eaf44e181c0..000000000000 --- a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.c +++ /dev/null @@ -1,14 +0,0 @@ ---- bjc250/src/gdevbjc_.c.orig Fri Nov 8 06:15:15 2002 -+++ bjc250/src/gdevbjc_.c Fri Nov 8 07:43:31 2002 -@@ -54,9 +54,9 @@ - private dev_proc_put_params(gdev_bjc_put_params); - private dev_proc_get_params(gdev_bjc_get_params); - const stringParamDescription * -- paramValueToParam(P2(const stringParamDescription *, int)); -+ paramValueToParam(const stringParamDescription *, int); - const stringParamDescription * -- paramStringToParam(P3(const stringParamDescription *, const char *, uint)); -+ paramStringToParam(const stringParamDescription *, const char *, uint); - - BJL_command BJL_command_set[] = { - { "@Cleaning=1", BJC_BJL_CLEANING, 11}, diff --git a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.h b/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.h deleted file mode 100644 index 26af2028cebc..000000000000 --- a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjc_.h +++ /dev/null @@ -1,93 +0,0 @@ ---- bjc250/src/gdevbjc_.h.orig Fri Nov 8 06:15:15 2002 -+++ bjc250/src/gdevbjc_.h Fri Nov 8 07:44:18 2002 -@@ -183,48 +183,48 @@ - - /* Put a BJL command to stream */ - --void bjc_put_bjl_command(P2(FILE * file, int bjl_command)); -+void bjc_put_bjl_command(FILE * file, int bjl_command); - --void bjc_put_LF(P1(FILE *file)); --void bjc_put_FF(P1(FILE *file)); --void bjc_put_CR(P1(FILE *file)); --void bjc_put_initialize(P1(FILE *file)); --void bjc_put_set_initial(P1(FILE *file)); --void bjc_put_set_compression(P2(FILE *file, char compression)); --void bjc_put_print_method_short(P2(FILE *file, char color)); --void bjc_put_print_method(P5(FILE *file, char color, char media, char quality, char density)); --void bjc_put_raster_resolution(P3(FILE *file, int x_resolution, int y_resolution)); --void bjc_put_raster_skip(P2(FILE *file, int skip)); --void bjc_put_page_margins(P5(FILE *file, int length, int lm, int rm, int top)); --void bjc_put_media_supply(P3(FILE *file, char supply, char type)); --void bjc_put_cmyk_image(P4(FILE *file, char component, const char *data, int count)); --void bjc_put_move_lines(P2(FILE *file, int lines)); --void bjc_put_move_lines_unit(P2(FILE *file, int unit)); --void bjc_put_extended_margins(P5(FILE *file, int length, int lm, int rm, int top)); --void bjc_put_image_format(P4(FILE *file, char depth, char format, char ink)); --void bjc_put_page_id(P2(FILE *file, int id)); --void bjc_put_continue_image(P3(FILE *file, const char *data, int count)); --void bjc_put_indexed_image(P4(FILE *file, int dot_rows, int dot_cols, int layers)); -- --bool bjc_invert_bytes(P4(byte *row, uint raster, bool inverse, byte lastmask)); --bool bjc_invert_cmyk_bytes(P8(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster, -- bool inverse, byte lastmask, skip_t *skip)); --uint bjc_compress(P3(const byte *row, uint raster, byte *compressed)); -- --int FloydSteinbergInitG(P1(gx_device_printer * pdev)); --void FloydSteinbergDitheringG(P5(byte *row, byte *dithered, uint width, uint raster, bool limit_extr)); --void FloydSteinbergCloseG(P1(gx_device_printer *pdev)); -- --int FloydSteinbergForwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask)); --int FloydSteinbergBckwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask)); --int FloydSteinbergInitC(P1(gx_device_printer * pdev)); --void FloydSteinbergDitheringC(P6(byte *row, byte *dithered, uint width, uint raster, -- bool limit_extr, bool composeK)); --void FloydSteinbergCloseC(P1(gx_device_printer *pdev)); -- --void bjc_build_gamma_table(P2(float gamma, char color)); --void bjc_rgb_to_cmy (P6(byte r, byte g, byte b, int *c, int *m, int *y)); --void bjc_rgb_to_gray(P4(byte r, byte g, byte b, int *k)); -+void bjc_put_LF(FILE *file); -+void bjc_put_FF(FILE *file); -+void bjc_put_CR(FILE *file); -+void bjc_put_initialize(FILE *file); -+void bjc_put_set_initial(FILE *file); -+void bjc_put_set_compression(FILE *file, char compression); -+void bjc_put_print_method_short(FILE *file, char color); -+void bjc_put_print_method(FILE *file, char color, char media, char quality, char density); -+void bjc_put_raster_resolution(FILE *file, int x_resolution, int y_resolution); -+void bjc_put_raster_skip(FILE *file, int skip); -+void bjc_put_page_margins(FILE *file, int length, int lm, int rm, int top); -+void bjc_put_media_supply(FILE *file, char supply, char type); -+void bjc_put_cmyk_image(FILE *file, char component, const char *data, int count); -+void bjc_put_move_lines(FILE *file, int lines); -+void bjc_put_move_lines_unit(FILE *file, int unit); -+void bjc_put_extended_margins(FILE *file, int length, int lm, int rm, int top); -+void bjc_put_image_format(FILE *file, char depth, char format, char ink); -+void bjc_put_page_id(FILE *file, int id); -+void bjc_put_continue_image(FILE *file, const char *data, int count); -+void bjc_put_indexed_image(FILE *file, int dot_rows, int dot_cols, int layers); -+ -+bool bjc_invert_bytes(byte *row, uint raster, bool inverse, byte lastmask); -+bool bjc_invert_cmyk_bytes(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster, -+ bool inverse, byte lastmask, skip_t *skip); -+uint bjc_compress(const byte *row, uint raster, byte *compressed); -+ -+int FloydSteinbergInitG(gx_device_printer * pdev); -+void FloydSteinbergDitheringG(byte *row, byte *dithered, uint width, uint raster, bool limit_extr); -+void FloydSteinbergCloseG(gx_device_printer *pdev); -+ -+int FloydSteinbergForwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask); -+int FloydSteinbergBckwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask); -+int FloydSteinbergInitC(gx_device_printer * pdev); -+void FloydSteinbergDitheringC(byte *row, byte *dithered, uint width, uint raster, -+ bool limit_extr, bool composeK); -+void FloydSteinbergCloseC(gx_device_printer *pdev); -+ -+void bjc_build_gamma_table(float gamma, char color); -+void bjc_rgb_to_cmy (byte r, byte g, byte b, int *c, int *m, int *y); -+void bjc_rgb_to_gray(byte r, byte g, byte b, int *k); - uint bjc_rand(void); --void bjc_init_tresh(P1(int rnd)); -+void bjc_init_tresh(int rnd); - #endif /* gdevbjc_INCLUDED */ diff --git a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjca.c b/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjca.c deleted file mode 100644 index 37f525bfeb42..000000000000 --- a/print/ghostscript-afpl/files/patch-bjc250:src:gdevbjca.c +++ /dev/null @@ -1,17 +0,0 @@ ---- bjc250/src/gdevbjca.c.orig Fri Nov 8 06:15:15 2002 -+++ bjc250/src/gdevbjca.c Fri Nov 8 07:47:41 2002 -@@ -46,10 +46,10 @@ - #include <math.h> - #include <time.h> - --private void bjc_put_bytes(P3(FILE *file, const char *data, int count)); --private void bjc_put_hi_lo(P2(FILE *file, int value)); --private void bjc_put_lo_hi(P2(FILE *file, int value)); --private void bjc_put_command(P3(FILE *file, char command, int count)); -+private void bjc_put_bytes(FILE *file, const char *data, int count); -+private void bjc_put_hi_lo(FILE *file, int value); -+private void bjc_put_lo_hi(FILE *file, int value); -+private void bjc_put_command(FILE *file, char command, int count); - - /* ---------------- Utilities ---------------- */ - diff --git a/print/ghostscript-afpl/files/patch-epag:gdevepag.c b/print/ghostscript-afpl/files/patch-epag:gdevepag.c deleted file mode 100644 index f3823f24998b..000000000000 --- a/print/ghostscript-afpl/files/patch-epag:gdevepag.c +++ /dev/null @@ -1,37 +0,0 @@ ---- epag/gdevepag.c.orig Sat Jul 8 13:33:09 2000 -+++ epag/gdevepag.c Thu May 26 00:12:48 2005 -@@ -417,15 +417,15 @@ - cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ; - if(cont->maxY < cont->bh) cont->maxY = cont->bh; - -- cont->bp = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)"); -- cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); -+ cont->bp = gs_malloc(pdev->memory, bpl , cont->maxY, "epag_skip_blank_init(bp)"); -+ cont->bp2 = gs_malloc(pdev->memory, bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)"); - - cont->h = cont->r = 0; - -- cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); -+ cont->bubbleTbl=gs_malloc(pdev->memory, sizeof(EpagBubble *),cont->maxBx,"bubbleTbl"); - for(i=0;i<cont->maxBx;i++) - cont->bubbleTbl[i] = NULL; -- cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); -+ cont->bubbleBuffer=gs_malloc(pdev->memory, sizeof(EpagBubble),cont->maxBx,"bubbleBuffer"); - bbtbl = (EpagBubble *)cont->bubbleBuffer; - for(i=0;i<cont->maxBx-1;i++) - bbtbl[i].next = &bbtbl[i+1]; -@@ -436,9 +436,11 @@ - private void - epag_page_close(EpagPageCont *cont) - { -- gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); -- gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); -- gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); -+ gx_device* pdev; -+ -+ gs_free(pdev->memory, cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)"); -+ gs_free(pdev->memory, cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)"); -+ gs_free(pdev->memory, cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer"); - } - - private int diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c deleted file mode 100644 index e9f51746ab22..000000000000 --- a/print/ghostscript-afpl/files/patch-eplaser:gdevescv.c +++ /dev/null @@ -1,100 +0,0 @@ ---- eplaser/gdevescv.c.orig Mon May 17 14:25:19 2004 -+++ eplaser/gdevescv.c Mon Aug 2 14:04:30 2004 -@@ -37,10 +37,6 @@ - - */ - --#include <stdlib.h> --#include <unistd.h> --#include <string.h> -- - #include "math_.h" - #include "gx.h" - #include "gserrors.h" -@@ -62,6 +58,10 @@ - #include "gspath.h" - #include "gzpath.h" - -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+ - /* ---------------- Device definition ---------------- */ - - /* Device procedures */ -@@ -342,6 +342,16 @@ - }; - - /* Vector device implementation */ -+#if GS_VERSION_MAJOR >= 8 -+private int escv_beginpage(gx_device_vector * vdev); -+private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); -+private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); -+private int escv_setdash(gx_device_vector * vdev, const float *pattern, -+ uint count, floatp offset); -+private int escv_setflat(gx_device_vector * vdev, floatp flatness); -+private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, -+ gs_logical_operation_t diff); -+#else - private int escv_beginpage(P1(gx_device_vector * vdev)); - private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); - private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); -@@ -350,10 +360,25 @@ - private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness)); - private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, - gs_logical_operation_t diff)); -+#endif - private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, - fixed y1, gx_path_type_t type); - private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, - gx_path_type_t type); -+#if GS_VERSION_MAJOR >= 8 -+private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type); -+private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x, floatp y, gx_path_type_t type); -+private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x, floatp y, gx_path_type_t type); -+private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x1, floatp y1, floatp x2, floatp y2, -+ floatp x3, floatp y3, gx_path_type_t type); -+private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y, -+ floatp x_start, floatp y_start, gx_path_type_t type); -+ -+private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type); -+#else - private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); - private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, - floatp x, floatp y, gx_path_type_t type)); -@@ -366,6 +391,7 @@ - floatp x_start, floatp y_start, gx_path_type_t type)); - - private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+#endif - private int escv_setlinewidth(gx_device_vector * vdev, floatp width); - private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); - private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join); -@@ -1578,7 +1604,7 @@ - pdev->MaskState = 1; - } - color_set_pure(&color, one); -- code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color); -+ code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color); - - /* ¤³¤³¤òÄ̲ᤷ¤¿¤é°Ê²¼¤Î¿§ÀßÄê¤Ï̵°ÕÌ£¡© */ - } -@@ -1671,13 +1697,13 @@ - gs_logical_operation_t lop, const gx_clip_path * pcpath) - { - gx_device_vector const *vdev = (gx_device_vector *) dev; -- gx_device_escv const *pdev = (gx_device_escv *) dev; -+ gx_device_escv *pdev = (gx_device_escv *) dev; - stream *s = gdev_vector_stream(vdev); - - if (w <= 0 || h <= 0) return 0; - - if (depth > 1 || -- gdev_vector_update_fill_color(vdev, pdcolor) < 0 || -+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 || - gdev_vector_update_clip_path(vdev, pcpath) < 0 || - gdev_vector_update_log_op(vdev, lop) < 0 - ) diff --git a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c b/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c deleted file mode 100644 index 0d56322a5eb8..000000000000 --- a/print/ghostscript-afpl/files/patch-eplaser:gdevesmv.c +++ /dev/null @@ -1,102 +0,0 @@ ---- eplaser/gdevesmv.c.orig Mon May 17 14:25:19 2004 -+++ eplaser/gdevesmv.c Mon Aug 2 14:05:21 2004 -@@ -34,10 +34,6 @@ - - */ - --#include <stdlib.h> --#include <unistd.h> --#include <string.h> -- - #include "math_.h" - #include "gx.h" - #include "gserrors.h" -@@ -59,6 +55,10 @@ - #include "gspath.h" - #include "gzpath.h" - -+#include <stdlib.h> -+#include <unistd.h> -+#include <string.h> -+ - /* ---------------- Device definition ---------------- */ - - /* Device procedures */ -@@ -428,6 +428,16 @@ - - - /* Vector device implementation */ -+#if GS_VERSION_MAJOR >= 8 -+private int esmv_beginpage(gx_device_vector * vdev); -+private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); -+private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); -+private int esmv_setdash(gx_device_vector * vdev, const float *pattern, -+ uint count, floatp offset); -+private int esmv_setflat(gx_device_vector * vdev, floatp flatness); -+private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, -+ gs_logical_operation_t diff); -+#else - private int esmv_beginpage(P1(gx_device_vector * vdev)); - private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); - private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); -@@ -436,10 +446,25 @@ - private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness)); - private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, - gs_logical_operation_t diff)); -+#endif - private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, - fixed y1, gx_path_type_t type); - private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, - gx_path_type_t type); -+#if GS_VERSION_MAJOR >= 8 -+private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type); -+private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x, floatp y, gx_path_type_t type); -+private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x, floatp y, gx_path_type_t type); -+private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, -+ floatp x1, floatp y1, floatp x2, floatp y2, -+ floatp x3, floatp y3, gx_path_type_t type); -+private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y, -+ floatp x_start, floatp y_start, gx_path_type_t type); -+ -+private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type); -+#else - private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); - private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, - floatp x, floatp y, gx_path_type_t type)); -@@ -452,6 +477,7 @@ - floatp x_start, floatp y_start, gx_path_type_t type)); - - private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+#endif - private int esmv_setlinewidth(gx_device_vector * vdev, floatp width); - private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); - private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join); -@@ -1688,7 +1714,7 @@ - pdev->MaskState = 1; - } - color_set_pure(&color, one); -- code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color); -+ code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color); - - /* ¤³¤³¤òÄ̲ᤷ¤¿¤é°Ê²¼¤Î¿§ÀßÄê¤Ï̵°ÕÌ£¡© */ - } -@@ -1771,7 +1797,7 @@ - gs_logical_operation_t lop, const gx_clip_path * pcpath) - { - gx_device_vector const *vdev = (gx_device_vector *) dev; -- gx_device_esmv const *pdev = (gx_device_esmv *) dev; -+ gx_device_esmv *pdev = (gx_device_esmv *) dev; - stream *s = gdev_vector_stream(vdev); - gx_color_index color = gx_dc_pure_color(pdcolor); - char obuf[64]; -@@ -1779,7 +1805,7 @@ - if (w <= 0 || h <= 0) return 0; - - if (depth > 1 || -- gdev_vector_update_fill_color(vdev, pdcolor) < 0 || -+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 || - gdev_vector_update_clip_path(vdev, pcpath) < 0 || - gdev_vector_update_log_op(vdev, lop) < 0 - ) diff --git a/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c b/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c deleted file mode 100644 index 46887cfad39c..000000000000 --- a/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.c +++ /dev/null @@ -1,23 +0,0 @@ ---- gdev10v/gdev10v.c.orig Sat Dec 11 04:10:45 1993 -+++ gdev10v/gdev10v.c Fri Dec 17 19:15:49 2004 -@@ -152,8 +152,8 @@ - int bytes_per_column = bits_per_column / 8; - int x_skip_unit = bytes_per_column * (xres / 180); - int y_skip_unit = (yres / 180); -- byte *in = (byte *)gs_malloc(8, line_size, "bj10v_print_page(in)"); -- byte *out = (byte *)gs_malloc(bits_per_column, line_size, "bj10v_print_page(out)"); -+ byte *in = (byte *)gs_malloc(pdev->memory, 8, line_size, "bj10v_print_page(in)"); -+ byte *out = (byte *)gs_malloc(pdev->memory, bits_per_column, line_size, "bj10v_print_page(out)"); - int lnum = 0; - int y_skip = 0; - int code = 0; -@@ -275,7 +275,7 @@ - /* Eject the page */ - xit: prn_putc(pdev, 014); /* form feed */ - prn_flush(pdev); -- gs_free((char *)out, bits_per_column, line_size, "bj10v_print_page(out)"); -- gs_free((char *)in, 8, line_size, "bj10v_print_page(in)"); -+ gs_free(pdev->memory, (char *)out, bits_per_column, line_size, "bj10v_print_page(out)"); -+ gs_free(pdev->memory, (char *)in, 8, line_size, "bj10v_print_page(in)"); - return code; - } diff --git a/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.mak b/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.mak deleted file mode 100644 index 25a8317379b8..000000000000 --- a/print/ghostscript-afpl/files/patch-gdev10v:gdev10v.mak +++ /dev/null @@ -1,22 +0,0 @@ ---- gdev10v/gdev10v.mak.orig Thu Oct 12 11:17:50 2000 -+++ gdev10v/gdev10v.mak Thu Oct 12 11:21:12 2000 -@@ -1,12 +1,13 @@ - ### ----------------- The Canon BubbleJet BJ10v device ----------------- ### - --bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ) --bj10v.dev: $(bj10v_) -- $(SHP)gssetdev bj10v $(bj10v_) --bj10vh.dev: $(bj10v_) -- $(SHP)gssetdev bj10vh $(bj10v_) -+bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ) -+$(DD)bj10v.dev: $(bj10v_) $(DD)page.dev -+ $(SETPDEV) $(DD)bj10v $(bj10v_) -+$(DD)bj10vh.dev: $(bj10v_) $(DD)page.dev -+ $(SETPDEV) $(DD)bj10vh $(bj10v_) - - # Uncomment the following line if you are using MS-DOS on PC9801 series. - --gdev10v.$(OBJ): gdevbj10.c $(PDEVH) -+$(GLOBJ)gdev10v.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH) -+ $(GLCC) $(GLO_)gdev10v.$(OBJ) $(C_) $(GLSRC)gdev10v.c - # $(CCC) -DPC9801 gdev10v.c diff --git a/print/ghostscript-afpl/files/patch-jbig2dec__os_types.h b/print/ghostscript-afpl/files/patch-jbig2dec__os_types.h deleted file mode 100644 index 4ce75024cc04..000000000000 --- a/print/ghostscript-afpl/files/patch-jbig2dec__os_types.h +++ /dev/null @@ -1,11 +0,0 @@ ---- jbig2dec/os_types.h.orig Thu Dec 29 04:56:24 2005 -+++ jbig2dec/os_types.h Sun May 28 01:10:59 2006 -@@ -47,7 +47,7 @@ - - #if defined(HAVE_STDINT_H) || defined(__MACOS__) - # include <stdint.h> --#elif defined(__VMS) -+#elif defined(__VMS) || defined(__FreeBSD__) - # include <inttypes.h> - #endif - diff --git a/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c b/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c deleted file mode 100644 index d3a72fa97dd3..000000000000 --- a/print/ghostscript-afpl/files/patch-lex7000:src:gdevlx7.c +++ /dev/null @@ -1,31 +0,0 @@ ---- lex7000/src/gdevlx7.c.orig Fri Dec 31 17:22:48 2004 -+++ lex7000/src/gdevlx7.c Fri Dec 31 17:24:39 2004 -@@ -615,14 +615,14 @@ - dprintf2("Current resolution is %f width x %f height dpi\n", - pdev->x_pixels_per_inch, pdev->y_pixels_per_inch ); - #endif -- pbuf = (byte *)gs_malloc(rpbufsize, 1, "lxmgen_print_page(pbuf)"); -+ pbuf = (byte *)gs_malloc(pdev->memory, rpbufsize, 1, "lxmgen_print_page(pbuf)"); - if (pbuf == NULL) - return_error(gs_error_VMerror); - -- outbuf = (byte *)gs_malloc(OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)"); -+ outbuf = (byte *)gs_malloc(pdev->memory, OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)"); - if (outbuf == NULL) - { -- gs_free((char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)"); -+ gs_free(pdev->memory, (char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)"); - return_error(gs_error_VMerror); - } - /* initialize begin of outbuf ... */ -@@ -799,8 +799,8 @@ - - /* eject page */ - lex_eject(prn_stream); -- gs_free((char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)"); -- gs_free((char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)"); -+ gs_free(pdev->memory, (char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)"); -+ gs_free(pdev->memory, (char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)"); - - #ifdef DEBUG - dprintf1("[%s] print_page() end\n",pdev->dname); diff --git a/print/ghostscript-afpl/files/patch-lib::cidfmap b/print/ghostscript-afpl/files/patch-lib::cidfmap deleted file mode 100644 index 78c204e203e1..000000000000 --- a/print/ghostscript-afpl/files/patch-lib::cidfmap +++ /dev/null @@ -1,41 +0,0 @@ ---- lib/cidfmap.orig Fri Feb 7 09:31:11 2003 -+++ lib/cidfmap Sun Jun 13 23:58:08 2004 -@@ -26,3 +26,38 @@ - % /ShinGo-Bold /HeiseiKakuGo-W5 ; - % /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ; - % -+/Ryumin-Light << -+/FileType /TrueType -+/Path (kochi-mincho-subst.ttf) -+/SubfontID 0 -+/CSI [(Japan1) 3] -+>> ; -+ -+/GothicBBB-Medium << -+/FileType /TrueType -+/Path (kochi-gothic-subst.ttf) -+/SubfontID 0 -+/CSI [(Japan1) 3] -+>> ; -+ -+/HeiseiMin-W3 /Ryumin-Light ; -+%/HeiseiMin-W3 /WadaMin-Regular ; -+/HeiseiKakuGo-W5 /GothicBBB-Medium ; -+%/HeiseiKakuGo-W5 /WadaGo-Bold ; -+/FutoMinA101-Bold /Ryumin-Light ; -+%/FutoMinA101-Bold /WadaMin-Regular ; -+/FutoGoB101-Bold /GothicBBB-Medium ; -+%/FutoGoB101-Bold /WadaGo-Bold ; -+/Jun101-Light /Ryumin-Light ; -+%/Jun101-Light /WadaMin-Regular ; -+/MidashiGo-MB31 /GothicBBB-Medium ; -+%/MidashiGo-MB31 /WadaGo-Bold ; -+ -+%/Munhwa-Regular /Munhwa-Regular ; -+%/MunhwaGothic-Regular /MunhwaGothic-Regular ; -+%/Munhwa-Bold /Munhwa-Bold ; -+%/MunhwaGothic-Bold /MunhwaGothic-Bold ; -+ -+/HYGoThic-Medium /MunhwaGothic-Regular ; -+/HYSMyeongJo-Medium /Munhwa-Regular ; -+/HYRGoThic-Medium /MunhwaGothic-Bold ; diff --git a/print/ghostscript-afpl/files/patch-lib:gs_init.ps b/print/ghostscript-afpl/files/patch-lib:gs_init.ps deleted file mode 100644 index 11ec1bba61cd..000000000000 --- a/print/ghostscript-afpl/files/patch-lib:gs_init.ps +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/gs_init.ps.orig Sat Mar 5 07:02:23 2005 -+++ lib/gs_init.ps Thu Apr 21 13:05:43 2005 -@@ -1440,7 +1440,7 @@ - % Set the default screen and BG/UCR. - /.setdefaultbgucr { - systemdict /setblackgeneration known { -- { pop 0 } dup setblackgeneration setundercolorremoval -+ {} dup setblackgeneration setundercolorremoval - } if - } bind def - /.useloresscreen { % - .useloresscreen <bool> -@@ -2241,3 +2241,7 @@ - ifelse - - % The interpreter will run the initial procedure (start). -+ -+% unofficial patch: -+% make it possible to print from within acroread pdf viewer -+/Default currenthalftone /Halftone defineresource pop diff --git a/print/ghostscript-afpl/files/patch-lib:gs_statd.ps b/print/ghostscript-afpl/files/patch-lib:gs_statd.ps deleted file mode 100644 index 0ec417a12f2f..000000000000 --- a/print/ghostscript-afpl/files/patch-lib:gs_statd.ps +++ /dev/null @@ -1,23 +0,0 @@ ---- lib/gs_statd.ps.orig Sat Feb 14 04:19:59 2004 -+++ lib/gs_statd.ps Sat Feb 21 23:01:09 2004 -@@ -109,6 +109,12 @@ - /halfletter {396 612 //.setpagesize exec} bind def - % minimum of a4 and letter (a4 width, letter length) - /pa4 {595 792 //.setpagesize exec} bind def -+ /postcard {284 419 //.setpagesize exec} bind def -+ /dbl_postcard {419 568 //.setpagesize exec} bind def -+ /Executive {522 756 //.setpagesize exec} bind def -+ /jenv_you4 {298 666 //.setpagesize exec} bind def -+ /jenv_you2 {324 460 //.setpagesize exec} bind def -+ /jenv_kaku2 {682 942 //.setpagesize exec} bind def - % /tabloid {792 1224 //.setpagesize exec} bind def % 11x17 portrait - % /csheet {1224 1584 //.setpagesize exec} bind def % ANSI C 17x22 - % /dsheet {1584 2448 //.setpagesize exec} bind def % ANSI D 22x34 -@@ -125,6 +131,7 @@ - [ /letter /note %do not change this line, needed by 'setpagetype' - /legal /lettersmall - /11x17 /ledger -+ /postcard /dbl_postcard /Executive /jenv_you4 /jenv_you2 /jenv_kaku2 - /a4small /a3 /a4 - STRICT { (%END SIZES) .skipeof } if - /a0 /a1 /a2 /a5 /a6 /a7 /a8 /a9 /a10 diff --git a/print/ghostscript-afpl/files/patch-lib:pdf_font.ps b/print/ghostscript-afpl/files/patch-lib:pdf_font.ps deleted file mode 100644 index 7bc2569e0704..000000000000 --- a/print/ghostscript-afpl/files/patch-lib:pdf_font.ps +++ /dev/null @@ -1,15 +0,0 @@ ---- lib/pdf_font.ps.orig Mon Aug 30 21:03:30 2004 -+++ lib/pdf_font.ps Wed Dec 29 17:17:19 2004 -@@ -1114,10 +1114,12 @@ - - /buildCIDType0 { % <CIDFontType0-font-resource> buildCIDType0 <font> - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bdef - - /buildCIDType2 { % <CIDFontType2-font-resource> buildCIDType2 <font> - dup /BaseFont get findCIDFont exch pop -+ addCIDmetrics /CIDFont defineresource - } bdef - - /processCIDToGIDMap { % <fontres> <cidfont> processCIDToGIDMap <fontres> <cidfont> diff --git a/print/ghostscript-afpl/files/patch-lib:ps2epsi.CAN-2004-0967 b/print/ghostscript-afpl/files/patch-lib:ps2epsi.CAN-2004-0967 deleted file mode 100644 index 11ac3e324a00..000000000000 --- a/print/ghostscript-afpl/files/patch-lib:ps2epsi.CAN-2004-0967 +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/ps2epsi.orig Sat Jan 28 06:58:27 2006 -+++ lib/ps2epsi Sat May 27 12:37:07 2006 -@@ -5,14 +5,8 @@ - # executable name set in the makefile - GS_EXECUTABLE=gs - --# try to create a temporary file securely --tmpdir=/tmp/ps2epsi.$$ --(umask 077 && mkdir $tmpdir) --if ! test -d $tmpdir; then -- echo "failed: could not create temporary file" -- exit 1 --fi --tmpfile=$tmpdir/ps2epsi$$ -+tmpfile=`mktemp -t ps2epsi.XXXXXX || exit 1` -+trap "rm -rf $tmpfile" 0 1 2 3 7 13 15 - - export outfile - diff --git a/print/ghostscript-afpl/files/patch-lib:pv.sh.CAN-2004-0967 b/print/ghostscript-afpl/files/patch-lib:pv.sh.CAN-2004-0967 deleted file mode 100644 index a37fc43aada9..000000000000 --- a/print/ghostscript-afpl/files/patch-lib:pv.sh.CAN-2004-0967 +++ /dev/null @@ -1,16 +0,0 @@ ---- lib/pv.sh.orig Mon Nov 28 02:18:26 2005 -+++ lib/pv.sh Mon Nov 28 02:18:59 2005 -@@ -29,9 +29,10 @@ - PAGE=$1 - shift - FILE=$1 -+TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1 - shift --trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15 -+trap "rm -rf $TEMPFILE" 0 1 2 15 - #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv --dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv --gs $FILE.$$.pv -+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE -+gs $TEMPFILE - exit 0 diff --git a/print/ghostscript-afpl/files/patch-lips:gdevespg.c b/print/ghostscript-afpl/files/patch-lips:gdevespg.c deleted file mode 100644 index ae28dffd626e..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevespg.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lips/gdevespg.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevespg.c Fri Dec 17 19:39:57 2004 -@@ -142,7 +142,7 @@ - if (pdev->PageCount == 0) - escpage_printer_initialize(pdev, fp, num_coipes); - -- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)"))) -+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)"))) - return_error(gs_error_VMerror); - - if (lprn->NegativePrint) { -@@ -154,7 +154,7 @@ - if (code < 0) - return code; - -- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)"); -+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)"); - - if (pdev->Duplex) - fprintf(fp, "%c0dpsE", GS); diff --git a/print/ghostscript-afpl/files/patch-lips:gdevl4r.c b/print/ghostscript-afpl/files/patch-lips:gdevl4r.c deleted file mode 100644 index e7ab9d0ecbe2..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevl4r.c +++ /dev/null @@ -1,176 +0,0 @@ ---- lips/gdevl4r.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevl4r.c Fri Dec 17 19:19:02 2004 -@@ -53,8 +53,8 @@ - #define lips_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\ - print_page_copies, image_out, cassetFeed, username)\ - { std_device_std_color_full_body(dtype, &procs, dname,\ -- (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\ -- (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\ -+ (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\ -+ (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\ - xdpi, ydpi, color_bits,\ - -(lm) * (xdpi), -(tm) * (ydpi),\ - (lm) * 72.0, (bm) * 72.0,\ -@@ -68,8 +68,8 @@ - #define lips4_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\ - print_page_copies, image_out, cassetFeed, username)\ - { std_device_std_color_full_body(dtype, &procs, dname,\ -- (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\ -- (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\ -+ (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\ -+ (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\ - xdpi, ydpi, color_bits,\ - -(lm) * (xdpi), -(tm) * (ydpi),\ - (lm) * 72.0, (bm) * 72.0,\ -@@ -178,8 +178,13 @@ - private int lips4c_output_page(gx_device_printer * pdev, FILE * prn_stream); - private int lips_delta_encode(byte * inBuff, byte * prevBuff, byte * outBuff, byte * diffBuff, int Length); - private int lips_byte_cat(byte * TotalBuff, byte * Buff, int TotalLen, int Len); -+#if GS_VERSION_MAJOR >= 8 -+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies); -+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies); -+#else - private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies)); - private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies)); -+#endif - private int lips4type_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, int num_copies, int ptype); - - private int -@@ -597,7 +602,7 @@ - /* Initialize printer. */ - lips_job_start(pdev, ptype, prn_stream, num_copies); - -- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)"))) -+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)"))) - return_error(gs_error_VMerror); - - -@@ -607,7 +612,7 @@ - if (code < 0) - return code; - -- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)"); -+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)"); - - /* eject page */ - lips_job_end(pdev, prn_stream); -@@ -641,9 +646,9 @@ - - if (pdev->color_info.depth == 1) - { -- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)"))) -+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)"))) - return_error(gs_error_VMerror); -- if (!(lprn->CompBuf2 = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf2)"))) -+ if (!(lprn->CompBuf2 = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf2)"))) - return_error(gs_error_VMerror); - - if (lprn->NegativePrint) { -@@ -663,8 +668,8 @@ - if (code < 0) - return code; - -- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)"); -- gs_free(lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)"); -+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)"); -+ gs_free(pdev->memory, lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)"); - } - else - { -@@ -903,15 +908,15 @@ - int lnum = 0; - - /* Memory Allocate */ -- if (!(pBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)"))) -+ if (!(pBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)"))) - return_error(gs_error_VMerror); -- if (!(prevBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)"))) -+ if (!(prevBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)"))) - return_error(gs_error_VMerror); -- if (!(ComBuff = (byte *) gs_malloc(Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)"))) -+ if (!(ComBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)"))) - return_error(gs_error_VMerror); -- if (!(TotalBuff = (byte *) gs_malloc((Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)"))) -+ if (!(TotalBuff = (byte *) gs_malloc(pdev->memory, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)"))) - return_error(gs_error_VMerror); -- if (!(diffBuff = (byte *) gs_malloc(Xpixel * num_components * 2, sizeof(byte), "lips_print_page"))) -+ if (!(diffBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components * 2, sizeof(byte), "lips_print_page"))) - return_error(gs_error_VMerror); - - /* make output data */ -@@ -927,11 +932,11 @@ - pdev->height - (lnum - NUM_LINES_4C)); - } - /* Free Memory */ -- gs_free(pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)"); -- gs_free(prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)"); -- gs_free(ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)"); -- gs_free(TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)"); -- gs_free(diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page"); -+ gs_free(pdev->memory, pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)"); -+ gs_free(pdev->memory, prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)"); -+ gs_free(pdev->memory, ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)"); -+ gs_free(pdev->memory, TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)"); -+ gs_free(pdev->memory, diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page"); - - return 0; - } -@@ -1065,11 +1070,25 @@ - if (paper_size == USER_SIZE) { - fprintf(prn_stream, "%c2 I", LIPS_CSI); - fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI, -- width * 10, height * 10); -+ /* modified by shige 06/27 2003 -+ width * 10, height * 10); */ -+ /* modified by shige 11/09 2003 -+ height * 10, width * 10); */ -+ (height * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (height * 10), -+ (width * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (width * 10)); - } else if (paper_size == USER_SIZE + LANDSCAPE) { - fprintf(prn_stream, "%c2 I", LIPS_CSI); - fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI, -- height * 10, width * 10); -+ /* modified by shige 06/27 2003 -+ width * 10, height * 10); */ -+ /* modified by shige 11/09 2003 -+ width * 10, height * 10); */ -+ (width * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (width * 10), -+ (height * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (height * 10)); - } else { - fprintf(prn_stream, "%c%dp", LIPS_CSI, paper_size); - } -@@ -1078,14 +1097,28 @@ - prev_paper_height != height) { - fprintf(prn_stream, "%c2 I", LIPS_CSI); - fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI, -- width * 10, height * 10); -+ /* modified by shige 06/27 2003 -+ width * 10, height * 10); */ -+ /* modified by shige 11/09 2003 -+ height * 10, width * 10); */ -+ (height * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (height * 10), -+ (width * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (width * 10)); - } - } else if (paper_size == USER_SIZE + LANDSCAPE) { - if (prev_paper_width != width || - prev_paper_height != height) { - fprintf(prn_stream, "%c2 I", LIPS_CSI); - fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI, -- height * 10, width * 10); -+ /* modified by shige 06/27 2003 -+ height * 10, width * 10); */ -+ /* modified by shige 11/09 2003 -+ width * 10, height * 10); */ -+ (width * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (width * 10), -+ (height * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (height * 10)); - } - } - /* desired number of copies */ diff --git a/print/ghostscript-afpl/files/patch-lips:gdevl4v.c b/print/ghostscript-afpl/files/patch-lips:gdevl4v.c deleted file mode 100644 index 8713a1469f3c..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevl4v.c +++ /dev/null @@ -1,173 +0,0 @@ ---- lips/gdevl4v.c.orig Thu Nov 2 05:09:18 2000 -+++ lips/gdevl4v.c Sun Jun 11 15:57:43 2006 -@@ -230,41 +230,67 @@ - }; - - /* Vector device implementation */ --private int lips4v_beginpage(P1(gx_device_vector * vdev)); --private int lips4v_setfillcolor(P2(gx_device_vector * vdev, -- const gx_drawing_color * pdc)); --private int lips4v_setstrokecolor(P2(gx_device_vector * vdev, -- const gx_drawing_color * pdc)); --private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern, -- uint count, floatp offset)); --private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness)); -+#if GS_VERSION_MAJOR >= 8 -+private int lips4v_beginpage(gx_device_vector * vdev); -+private int lips4v_setfillcolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setstrokecolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern, -+ uint count, floatp offset); -+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness); -+private int -+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, -+ gs_logical_operation_t diff); -+private int -+ -+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type); -+private int -+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); -+private int -+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); - private int --lips4v_setlogop(P3 -+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1, -+ floatp y1, floatp x2, floatp y2, floatp x3, floatp y3, -+ gx_path_type_t type); -+private int -+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start, -+ floatp y_start, gx_path_type_t type); - -- (gx_device_vector * vdev, gs_logical_operation_t lop, -- gs_logical_operation_t diff)); -+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type); -+#else -+private int lips4v_beginpage(P1(gx_device_vector * vdev)); -+private int lips4v_setfillcolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setstrokecolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern, -+ uint count, floatp offset); -+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness); -+private int -+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, -+ gs_logical_operation_t diff); - private int - --lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type); - private int --lips4v_moveto(P6 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -- floatp y, gx_path_type_t type)); -+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); - private int --lips4v_lineto(P6 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -- floatp y, gx_path_type_t type)); -+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); - private int --lips4v_curveto(P10 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1, -+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1, - floatp y1, floatp x2, floatp y2, floatp x3, floatp y3, -- gx_path_type_t type)); -+ gx_path_type_t type); - private int --lips4v_closepath(P6 -- (gx_device_vector * vdev, floatp x, floatp y, floatp x_start, -- floatp y_start, gx_path_type_t type)); -+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start, -+ floatp y_start, gx_path_type_t type); - --private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type); -+#endif - private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width); - private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap); - private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join); -@@ -758,10 +784,26 @@ - /* Íѻ極¥¤¥º */ - if (pdev->prev_paper_size != paper_size) { - if (paper_size == USER_SIZE) { -- sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); -+ /* modified by shige 06/27 2003 -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */ -+ /* modified by shige 11/09 2003 -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */ -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, -+ (height * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (height * 10), -+ (width * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (width * 10)); - lputs(s, paper); - } else if (paper_size == USER_SIZE + LANDSCAPE) { -- sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); -+ /* modified by shige 06/27 2003 -+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */ -+ /* modified by shige 11/09 2003 -+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */ -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, -+ (width * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (width * 10), -+ (height * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (height * 10)); - lputs(s, paper); - } else { - sprintf(paper, "%c%dp", LIPS_CSI, paper_size); -@@ -770,12 +812,28 @@ - } else if (paper_size == USER_SIZE) { - if (pdev->prev_paper_width != width || - pdev->prev_paper_height != height) -- sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); -+ /* modified by shige 06/27 2003 -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */ -+ /* modified by shige 11/09 2003 -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */ -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, -+ (height * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (height * 10), -+ (width * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (width * 10)); - lputs(s, paper); - } else if (paper_size == USER_SIZE + LANDSCAPE) { - if (pdev->prev_paper_width != width || - pdev->prev_paper_height != height) -- sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); -+ /* modified by shige 06/27 2003 -+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */ -+ /* modified by shige 11/09 2003 -+ sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */ -+ sprintf(paper, "%c80;%d;%dp", LIPS_CSI, -+ (width * 10 > LIPS_HEIGHT_MAX_720)? -+ LIPS_HEIGHT_MAX_720 : (width * 10), -+ (height * 10 > LIPS_WIDTH_MAX_720)? -+ LIPS_WIDTH_MAX_720 : (height * 10)); - lputs(s, paper); - } - pdev->prev_paper_size = paper_size; -@@ -1881,7 +1939,7 @@ - } - color_set_pure(&color, one); - code = gdev_vector_update_fill_color((gx_device_vector *) pdev, -- &color); -+ NULL, &color); - } - if (code < 0) - return 0; -@@ -2026,7 +2084,7 @@ - if (w <= 0 || h <= 0) - return 0; - if (depth > 1 || -- gdev_vector_update_fill_color(vdev, pdcolor) < 0 || -+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 || - gdev_vector_update_clip_path(vdev, pcpath) < 0 || - gdev_vector_update_log_op(vdev, lop) < 0) - return gx_default_fill_mask(dev, data, data_x, raster, id, diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlips.c b/print/ghostscript-afpl/files/patch-lips:gdevlips.c deleted file mode 100644 index 143fed14f0a1..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevlips.c +++ /dev/null @@ -1,18 +0,0 @@ ---- lips/gdevlips.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevlips.c Tue Jan 13 01:23:47 2004 -@@ -62,7 +62,15 @@ - height = tmp; - } - for (pt = lips_paper_table; pt->num_unit < 80; pt++) -+/* add by shige 11/06 2003 */ -+#ifdef USE_LIPS_SIZE_ERROR -+ if(pt->width+LIPS_SIZE_ERROR_VALUE>=width -+ && pt->width-LIPS_SIZE_ERROR_VALUE<=width -+ && pt->height+LIPS_SIZE_ERROR_VALUE>=height -+ && pt->height-LIPS_SIZE_ERROR_VALUE<=height) -+#else - if (pt->width == width && pt->height == height) -+#endif - break; - - return pt->num_unit + landscape; diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlips.h b/print/ghostscript-afpl/files/patch-lips:gdevlips.h deleted file mode 100644 index eebce89cc054..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevlips.h +++ /dev/null @@ -1,17 +0,0 @@ ---- lips/gdevlips.h.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevlips.h Tue Jan 13 01:23:47 2004 -@@ -188,6 +188,14 @@ - bool faceup;\ - char mediaType[LIPS_MEDIACHAR_MAX]; - -+/* added by shige 11/06 2003 */ -+#define USE_LIPS_SIZE_ERROR -+#define LIPS_SIZE_ERROR_VALUE 2 -+ -+/* added by shige 11/09 2003 */ -+#define LIPS_HEIGHT_MAX_720 11906 -+#define LIPS_WIDTH_MAX_720 8419 -+ - int lips_media_selection(int width, int height); - int lips_packbits_encode(byte * inBuff, byte * outBuff, int Length); - int lips_mode3format_encode(byte * inBuff, byte * outBuff, int Length); diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlips.mak b/print/ghostscript-afpl/files/patch-lips:gdevlips.mak deleted file mode 100644 index a434f739a5fa..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevlips.mak +++ /dev/null @@ -1,59 +0,0 @@ ---- lips/gdevlips.mak.orig Thu Nov 2 12:12:13 2000 -+++ lips/gdevlips.mak Sat Sep 27 22:16:20 2003 -@@ -1,17 +1,19 @@ - # ---------------- Laser Printer devices ---------------- # - # $Id: gdevlips.mak $ - -+lips_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -+ - $(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\ - $(gdevprn_h) $(PDEVH) -- $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c -+ $(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlprn.c - - ### --- The Canon LIPS II+/III/IVc/IV printer device --- ### - - lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ) - $(GLOBJ)gdevl4r.$(OBJ): $(GLSRC)gdevl4r.c $(GLSRC)gdevlips.h $(PDEVH) -- $(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(GLSRC)gdevl4r.c -+ $(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4r.c - $(GLOBJ)gdevlips.$(OBJ): $(GLSRC)gdevlips.c -- $(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(GLSRC)gdevlips.c -+ $(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlips.c - $(DD)lips2p.dev: $(lipsr_) $(DD)page.dev - $(SETPDEV) $(DD)lips2p $(lipsr_) - $(DD)lips3.dev: $(lipsr_) $(DD)page.dev -@@ -29,13 +31,13 @@ - $(GLOBJ)gdevl4v.$(OBJ): $(GLSRC)gdevl4v.c $(GLSRC)gdevlips.h $(GDEV) $(math__h)\ - $(gscspace_h) $(gsutil_h) $(gsparam_h) $(gsmatrix_h) $(gdevvec_h)\ - $(ghost_h) $(gzstate_h) $(igstate_h) -- $(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(GLSRC)gdevl4v.c -+ $(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4v.c - - ### ------- Epson ESC/Page printer device ----------------- ### - - escpage_=$(GLOBJ)gdevespg.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ) - $(GLOBJ)gdevespg.$(OBJ): $(GLSRC)gdevespg.c $(GLSRC)gdevlprn.h $(PDEVH) -- $(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(GLSRC)gdevespg.c -+ $(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevespg.c - - $(GLOBJ)escpage.dev: $(escpage_) $(DD)page.dev - $(SETPDEV) $(DD)escpage $(escpage_) -@@ -47,7 +49,7 @@ - - npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ) - $(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH) -- $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c -+ $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevnpdl.c - - $(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev - $(SETPDEV) $(DD)npdl $(npdl_) -@@ -56,7 +58,7 @@ - - rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ) - $(GLOBJ)gdevrpdl.$(OBJ): $(GLSRC)gdevrpdl.c $(GLSRC)gdevlprn.h $(PDEVH) -- $(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(GLSRC)gdevrpdl.c -+ $(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevrpdl.c - - $(GLOBJ)rpdl.dev: $(rpdl_) $(DD)page.dev - $(SETPDEV) $(DD)rpdl $(rpdl_) diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlprn.c b/print/ghostscript-afpl/files/patch-lips:gdevlprn.c deleted file mode 100644 index 236cc5a3a8f5..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevlprn.c +++ /dev/null @@ -1,35 +0,0 @@ ---- lips/gdevlprn.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevlprn.c Fri Dec 17 19:21:08 2004 -@@ -219,13 +219,13 @@ - maxBy = (pdev->height + lprn->nBh - 1) / lprn->nBh; - maxY = lprn->BlockLine / lprn->nBh * lprn->nBh; - -- if (!(lprn->ImageBuf = gs_malloc(bpl, maxY, "lprn_print_image(ImageBuf)"))) -+ if (!(lprn->ImageBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_image(ImageBuf)"))) - return_error(gs_error_VMerror); -- if (!(lprn->TmpBuf = gs_malloc(bpl, maxY, "lprn_print_iamge(TmpBuf)"))) -+ if (!(lprn->TmpBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_iamge(TmpBuf)"))) - return_error(gs_error_VMerror); -- if (!(lprn->bubbleTbl = gs_malloc(sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)"))) -+ if (!(lprn->bubbleTbl = gs_malloc(pdev->memory, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)"))) - return_error(gs_error_VMerror); -- if (!(bubbleBuffer = gs_malloc(sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)"))) -+ if (!(bubbleBuffer = gs_malloc(pdev->memory, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)"))) - return_error(gs_error_VMerror); - - for (i = 0; i < maxBx; i++) -@@ -261,10 +261,10 @@ - } - lprn_bubble_flush_all(pdev, fp); /* flush the rest of bubble */ - -- gs_free(lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)"); -- gs_free(lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)"); -- gs_free(lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)"); -- gs_free(bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)"); -+ gs_free(pdev->memory, lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)"); -+ gs_free(pdev->memory, lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)"); -+ gs_free(pdev->memory, lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)"); -+ gs_free(pdev->memory, bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)"); - - return code; - } diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlprn.h b/print/ghostscript-afpl/files/patch-lips:gdevlprn.h deleted file mode 100644 index f692dbe410a2..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevlprn.h +++ /dev/null @@ -1,16 +0,0 @@ ---- lips/gdevlprn.h.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevlprn.h Sat Sep 13 23:06:38 2003 -@@ -28,8 +28,13 @@ - - #include "gdevprn.h" - -+#if GS_VERSION_MAJOR >= 8 -+#define lprn_dev_proc_image_out(proc)\ -+ void proc(gx_device_printer *, FILE *, int, int, int, int) -+#else - #define lprn_dev_proc_image_out(proc)\ - void proc(P6(gx_device_printer *, FILE *, int, int, int, int)) -+#endif - - #define dev_proc_image_out(proc) lprn_dev_proc_image_out(proc) - diff --git a/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c b/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c deleted file mode 100644 index ad237e348f15..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevnpdl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lips/gdevnpdl.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevnpdl.c Fri Dec 31 17:32:52 2004 -@@ -582,7 +582,7 @@ - int code; - int maxY = lprn->BlockLine / lprn->nBh * lprn->nBh; - -- if (!(lprn->CompBuf = gs_malloc(line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)"))) -+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)"))) - return_error(gs_error_VMerror); - - -@@ -680,7 +680,7 @@ - /* Form Feed */ - fputs("\014", prn_stream); - -- gs_free(lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)"); -+ gs_free(pdev->memory, lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)"); - return 0; - } - diff --git a/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c b/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c deleted file mode 100644 index 8673cb716108..000000000000 --- a/print/ghostscript-afpl/files/patch-lips:gdevrpdl.c +++ /dev/null @@ -1,20 +0,0 @@ ---- lips/gdevrpdl.c.orig Thu Nov 2 12:09:18 2000 -+++ lips/gdevrpdl.c Fri Dec 31 17:34:04 2004 -@@ -81,7 +81,7 @@ - if (pdev->PageCount == 0) - rpdl_printer_initialize(pdev, prn_stream, num_coipes); - -- if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)"))) -+ if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)"))) - return_error(gs_error_VMerror); - - lprn->NegativePrint = false; /* Not Support */ -@@ -90,7 +90,7 @@ - if (code < 0) - return code; - -- gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)"); -+ gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)"); - - fprintf(prn_stream, "\014"); /* Form Feed */ - diff --git a/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c b/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c deleted file mode 100644 index e4b45a4bece2..000000000000 --- a/print/ghostscript-afpl/files/patch-lxm3200:gdevlx32.c +++ /dev/null @@ -1,55 +0,0 @@ ---- lxm3200/gdevlx32.c.orig Wed Apr 23 01:06:20 2003 -+++ lxm3200/gdevlx32.c Thu May 26 00:11:50 2005 -@@ -422,9 +422,11 @@ - * of the nearest color. - */ - private gx_color_index --lxm3200_map_rgb_color(gx_device *dev, gx_color_value r, -- gx_color_value g, gx_color_value b) -+lxm3200_map_rgb_color(gx_device *dev, const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - gx_color_index col; - int c, m, y; - -@@ -479,7 +481,7 @@ - break; - - default: -- col = gdev_prn_map_rgb_color(dev, r, g, b); -+ col = gdev_prn_map_rgb_color(dev, cv); - break; - } - -@@ -732,10 +734,10 @@ - /* Allocate memory for the buffers and - * verify that the allocation was done properly. - */ -- gendata.scanbuf = (byte *)gs_malloc(gendata.numbytes, gendata.numblines, -+ gendata.scanbuf = (byte *)gs_malloc(pdev->memory, gendata.numbytes, gendata.numblines, - "lxm3200_print_page(scanbuf)"); - -- gendata.outdata = (byte *)gs_malloc(gendata.numbytes, 30, -+ gendata.outdata = (byte *)gs_malloc(pdev->memory, gendata.numbytes, 30, - "lxm3200_print_page(outdata)"); - - if(gendata.scanbuf == NULL || -@@ -943,12 +945,14 @@ - private void - freeresources(void) - { -+ gx_device *pdev; -+ - if(gendata.scanbuf) -- gs_free((char *)gendata.scanbuf, gendata.numbytes, gendata.numblines, -+ gs_free(pdev->memory, (char *)gendata.scanbuf, gendata.numbytes, gendata.numblines, - "lxm3200:freeresources(scanbuf)"); - - if(gendata.outdata) -- gs_free((char *)gendata.outdata, gendata.numbytes, 30, -+ gs_free(pdev->memory, (char *)gendata.outdata, gendata.numbytes, 30, - "lxm3200:freeresources(outdata)"); - } - diff --git a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c b/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c deleted file mode 100644 index 1aeeb74be38f..000000000000 --- a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.c +++ /dev/null @@ -1,68 +0,0 @@ ---- md2k/gdevmd2k.c.orig Sun May 2 14:07:57 1999 -+++ md2k/gdevmd2k.c Fri Dec 17 19:10:22 2004 -@@ -495,7 +495,7 @@ - int i, j; - - /* allocate memory */ -- work = (byte *)gs_malloc(3+sizeof(int), line_size, -+ work = (byte *)gs_malloc(pdev->memory, 3+sizeof(int), line_size, - "alps_print_page(work)"); - if (work == 0) - return_error(gs_error_VMerror); -@@ -597,7 +597,7 @@ - "\033\052\162\103" - "\033\045\0\130", 1, 9, prn_stream); - -- gs_free((char *)work, 3+sizeof(int), line_size, "alps_print_page(work)"); -+ gs_free(pdev->memory, (char *)work, 3+sizeof(int), line_size, "alps_print_page(work)"); - return 0; - } - -@@ -638,11 +638,13 @@ - (k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b)) - - private gx_color_index --alps_map_cmyk_color(gx_device* pdev, -- gx_color_value c, gx_color_value m, -- gx_color_value y, gx_color_value k) -+alps_map_cmyk_color(gx_device* pdev, const gx_color_value cv[]) - { - gx_color_index color; -+ gx_color_value c = cv[0]; -+ gx_color_value m = cv[1]; -+ gx_color_value y = cv[2]; -+ gx_color_value k = cv[3]; - - switch (pdev->color_info.depth) { - case 1: -@@ -675,10 +677,12 @@ - } - - private gx_color_index --alps_map_cmy_color(gx_device* pdev, -- gx_color_value c, gx_color_value m, -- gx_color_value y, gx_color_value k) -+alps_map_cmy_color(gx_device* pdev, const gx_color_value cv[]) - { -+ gx_color_value c = cv[0]; -+ gx_color_value m = cv[1]; -+ gx_color_value y = cv[2]; -+ gx_color_value k = cv[3]; - int nbits = pdev->color_info.depth; - ulong weight = ((gx_max_color_value - k) << 10) / gx_max_color_value; - c = ((c * weight) >> 10) + k; -@@ -694,10 +698,12 @@ - /* Mapping of RGB colors to gray values. */ - - private gx_color_index --alps_map_rgb_color(gx_device *pdev, -- gx_color_value r, gx_color_value g, gx_color_value b) -+alps_map_rgb_color(gx_device *pdev, const gx_color_value cv[]) - { - -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) { - return (gx_color_index) 0; /* White */ - } else { diff --git a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.mak b/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.mak deleted file mode 100644 index b003efb81f7f..000000000000 --- a/print/ghostscript-afpl/files/patch-md2k:gdevmd2k.mak +++ /dev/null @@ -1,19 +0,0 @@ ---- md2k/gdevmd2k.mak-5.50.orig Sun Nov 19 18:42:20 2000 -+++ md2k/gdevmd2k.mak-5.50 Sun Nov 19 18:52:14 2000 -@@ -3,11 +3,11 @@ - - md2k_=$(GLOBJ)gdevmd2k.$(OBJ) - --md2k.dev: $(md2k_) page.dev -- $(SETPDEV) md2k $(md2k_) -+$(DD)md2k.dev: $(md2k_) $(DD)page.dev -+ $(SETPDEV) $(DD)md2k $(md2k_) - --md5k.dev: $(md2k_) page.dev -- $(SETPDEV) md5k $(md2k_) -+$(DD)md5k.dev: $(md2k_) $(DD)page.dev -+ $(SETPDEV) $(DD)md5k $(md2k_) - --$(GLOBJ)gdevmd2k.$(OBJ): gdevmd2k.c $(PDEVH) $(gsparam_h) -+$(GLOBJ)gdevmd2k.$(OBJ): $(GLSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) - $(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(GLSRC)gdevmd2k.c diff --git a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c b/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c deleted file mode 100644 index 862e9f1801c2..000000000000 --- a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.c +++ /dev/null @@ -1,413 +0,0 @@ ---- mjc/gdevmjc.c.orig Sat Nov 2 17:58:50 1996 -+++ mjc/gdevmjc.c Fri Dec 31 16:24:50 2004 -@@ -43,7 +43,8 @@ - #include <limits.h> - #include "gdevprn.h" - #include "gdevpcl.h" --#include "gsprops.h" -+#include "gsparam.h" -+#include "gsstate.h" - - #include "mjmtx2.c" - #include "mjbksep.c" -@@ -150,7 +151,9 @@ - - /* Undefined macros expected to be defined in gdevpcl.h */ - #define PAPER_SIZE_A3_NOBI 28 -+#ifndef PAPER_SIZE_A2 - #define PAPER_SIZE_A2 29 -+#endif - #define PAPER_SIZE_B4 30 - #define PAPER_SIZE_B5 31 - -@@ -190,18 +193,16 @@ - private dev_proc_print_page(mjc720_print_page); - private dev_proc_print_page(mj500c_print_page); - --private dev_proc_get_props(mj_get_props); --private dev_proc_put_props(mj_put_props); -- --private void expand_line(P4(word*, int, int, int)); --private int put_prop_float(P5(gs_prop_item *, float *, float, float, int)); --private int put_prop_int(P5(gs_prop_item *, int *, int, int, int)); -+private dev_proc_get_params(mj_get_params); -+private dev_proc_put_params(mj_put_params); - --private void set_bpp(P2(gx_device *, int)); -+private void expand_line(word*, int, int, int); -+private int mj_put_param_int(gs_param_list *, gs_param_name, int *, int, int, int); -+private void mj_set_bpp(gx_device *, int); - --private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int )); -+private uint gdev_prn_rasterwidth(const gx_device_printer *, int ); - --private gx_color_index mjc_correct_color(P2(gx_device_printer *, gx_color_index)); -+private gx_color_index mjc_correct_color(gx_device_printer *, gx_color_index); - - /* The device descriptors */ - struct gx_device_mj_s { -@@ -224,7 +225,7 @@ - #define mj ((gx_device_mj *) pdev) - - #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\ -- prn_device_body(gx_device_printer, procs, dev_name,\ -+ prn_device_body(gx_device_mj, procs, dev_name,\ - WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\ - bpp, 0, 0, 0, 0, print_page) - -@@ -235,9 +236,9 @@ - } - - --#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\ -+#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\ - proc_colour_open,\ -- gdev_pcl_get_initial_matrix,\ -+ gx_default_get_initial_matrix,\ - gx_default_sync_output,\ - gdev_prn_output_page,\ - gdev_prn_close,\ -@@ -249,15 +250,15 @@ - NULL, /* copy_color */\ - NULL, /* draw_line */\ - gx_default_get_bits,\ -- proc_get_props,\ -- proc_put_props\ -+ proc_get_params,\ -+ proc_put_params\ - } - --private int mjc_open(P1(gx_device *)); --private int mj_colour_open(P1(gx_device *)); -+private int mjc_open(gx_device *); -+private int mj_colour_open(gx_device *); - - private gx_device_procs mj_procs = --mj_colour_procs(mjc_open, mj_get_props, mj_put_props); -+mj_colour_procs(mjc_open, mj_get_params, mj_put_params); - - gx_device_mj far_data gs_mjc180_device = - mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL, -@@ -306,14 +307,14 @@ - static const float mj_b4[4] = { MJ700V2C_MARGINS_B4 }; - static const float mj_b5[4] = { MJ700V2C_MARGINS_B5 }; - static const float mj_letter[4] = { MJ700V2C_MARGINS_LETTER }; -- const float _ds *m; -+ const float *m; - int psize; - - int paper_size; - - /* Set up colour params if put_props has not already done so */ - if (pdev->color_info.num_components == 0) -- set_bpp(pdev, pdev->color_info.depth); -+ mj_set_bpp(pdev, pdev->color_info.depth); - - paper_size = gdev_mjc_paper_size(pdev); - if (paper_size == PAPER_SIZE_A2 ) { -@@ -332,10 +333,7 @@ - m = mj_letter; - } - -- pdev->l_margin = m[0]; -- pdev->b_margin = m[1]; -- pdev->r_margin = m[2]; -- pdev->t_margin = m[3]; -+ gx_device_set_margins(pdev, m, true); - - switch (mj->colorcomp) { - case 1: -@@ -360,84 +358,78 @@ - * and control over the bits-per-pixel used in output rendering */ - /* Added properties for DeskJet 5xxC */ - --private const gs_prop_item props_mj[] = { -- /* Read-write properties. */ -- prop_def("Density", prt_int), -- prop_def("Cyan", prt_int), -- prop_def("Magenta", prt_int), -- prop_def("Yellow", prt_int), -- prop_def("Black", prt_int), -- prop_def("Dither", prt_int), -- prop_def("ColorComponent", prt_int), -- prop_def("Direction", prt_int), -- prop_def("MicroWeave", prt_int), -- prop_def("DotSize", prt_int), --}; -- - private int --mj_get_props(gx_device *pdev, gs_prop_item *plist) --{ int start = gdev_prn_get_props(pdev, plist); -- if ( plist != 0 ) { -- register gs_prop_item *pi = plist + start; -- memcpy(pi, props_mj, sizeof(props_mj)); -- pi[0].value.i = mj->density; -- pi[1].value.i = mj->cyan; -- pi[2].value.i = mj->magenta; -- pi[3].value.i = mj->yellow; -- pi[4].value.i = mj->black; -- pi[5].value.i = mj->dither; -- pi[6].value.i = mj->colorcomp; -- pi[7].value.i = mj->direction; -- pi[8].value.i = mj->microweave; -- pi[9].value.i = mj->dotsize; -- } -- return start + sizeof(props_mj) / sizeof(gs_prop_item); -+mj_get_params(gx_device *pdev, gs_param_list *plist) -+{ int code = gdev_prn_get_params(pdev, plist); -+ if ( code < 0 || -+ (code = param_write_int(plist, "Density", &mj->density)) < 0 || -+ (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 || -+ (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 || -+ (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 || -+ (code = param_write_int(plist, "Black", &mj->black)) < 0 || -+ (code = param_write_int(plist, "Dither", &mj->dither)) < 0 || -+ (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 || -+ (code = param_write_int(plist, "Direction", &mj->direction)) < 0 || -+ (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 || -+ (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0 -+ ) -+ return code; -+ return code; - } - - /* Put properties. */ - private int --mj_put_props(gx_device *pdev, gs_prop_item *plist, int count) -+mj_put_params(gx_device *pdev, gs_param_list *plist) - { -- static const argn = 10; --/* gs_prop_item *known[argn]; */ -- gs_prop_item *known[10]; - int old_bpp = mj->color_info.depth; - int bpp = 0; - int code = 0; -- -- props_extract(plist, count, props_mj, argn, known, 0); -- code = gdev_prn_put_props(pdev, plist, count); -- if ( code < 0 ) return code; -- -- code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code); -- code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code); -- code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code); -- code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code); -- code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code); -- code = put_prop_int(known[5], &mj->dither, 0, 1, code); -- code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code); -- code = put_prop_int(known[7], &mj->direction, 1, 2, code); -- code = put_prop_int(known[8], &mj->microweave, 0, 1, code); -- code = put_prop_int(known[9], &mj->dotsize, 0, 1, code); -- -+ int density = mj->density; -+ int cyan = mj->cyan; -+ int magenta = mj->magenta; -+ int yellow = mj->yellow; -+ int black = mj->black; -+ int dither = mj->dither; -+ int colorcomp = mj->colorcomp; -+ int direction = mj->direction; -+ int microweave = mj->microweave; -+ int dotsize = mj->dotsize; -+ code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code); -+ code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code); -+ code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code); -+ code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code); -+ code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code); -+ code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code); -+ code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code); -+ code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code); -+ code = mj_put_param_int(plist, "MicroWeave", µweave, 0, 1, code); -+ code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code); -+ code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code); - if ( code < 0 ) -- return_error(code); -- -- if (bpp != 0) { -- set_bpp(pdev, bpp); -- -- /* Close the device; gs_putdeviceprops will reopen it. */ -+ return code; -+ mj->density = density; -+ mj->cyan = cyan; -+ mj->magenta = magenta; -+ mj->yellow = yellow; -+ mj->black = black; -+ mj->dither = dither; -+ mj->colorcomp = colorcomp; -+ mj->direction = direction; -+ mj->microweave = microweave; -+ mj->dotsize = dotsize; -+ if ( bpp != 0 ) { -+ mj_set_bpp(pdev, bpp); -+ gdev_prn_put_params(pdev, plist); - if ( bpp != old_bpp && pdev->is_open ) -- { int ccode = gs_closedevice(pdev); -- if ( ccode < 0 ) return ccode; -- } -+ return gs_closedevice(pdev); -+ return 0; - } -- -- return code; -+ else -+ return gdev_prn_put_params(pdev, plist); - } - - /* ------ Internal routines ------ */ --private int mj_colour_print_page(P3(gx_device_printer *, FILE *, int)); -+private int mj_colour_print_page(gx_device_printer *, FILE *, int); - - - private int -@@ -988,7 +980,7 @@ - - /* NOZ */ - xtalbuff_size = plane_size*8 + 64; -- xtalbuff = (short *) gs_malloc( xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier"); -+ xtalbuff = (short *) gs_malloc(pdev->memory, xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier"); - memset(xtalbuff, 0, xtalbuff_size*(16*4+2*4) * W); - { - int i; -@@ -1027,12 +1019,12 @@ - p += xtalbuff_size; - } - -- storage = (word *) gs_malloc(storage_size_words, W, "mj_colour_print_page"); -+ storage = (word *) gs_malloc(pdev->memory, storage_size_words, W, "mj_colour_print_page"); - - /* prepare a temporary buffer for mj_raster_cmd */ - - mj_tmp_buf_size = plane_size; -- mj_tmp_buf = (byte *) gs_malloc(mj_tmp_buf_size, W ,"mj_raster_buffer"); -+ mj_tmp_buf = (byte *) gs_malloc(pdev->memory, mj_tmp_buf_size, W ,"mj_raster_buffer"); - - #if 0 - fprintf(stderr, "storage_size_words :%d\n", storage_size_words); -@@ -1163,7 +1155,8 @@ - - /* Send each scan line in turn */ - { -- long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi; -+ long int lend = pdev->height - -+ (dev_t_margin_points(pdev) + dev_b_margin_points(pdev)); - int cErr, mErr, yErr, kErr; - int this_pass, i; - long int lnum; -@@ -1403,19 +1396,19 @@ - fflush(prn_stream); - } - /* free temporary storage */ -- gs_free((char *) storage, storage_size_words, W, "mj_colour_print_page"); -- gs_free((char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer"); -- gs_free((char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier"); -+ gs_free(pdev->memory, (char *) storage, storage_size_words, W, "mj_colour_print_page"); -+ gs_free(pdev->memory, (char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer"); -+ gs_free(pdev->memory, (char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier"); - - return 0; - } - - void - mj_color_correct(gx_color_value *Rptr ,gx_color_value *Gptr , gx_color_value *Bptr ) -- /* R,G,B : 0`255 */ -+ /* R,G,B : 0)B`255 */ - { -- short R,G,B; /* R,G,B : 0`255 */ -- short C,M,Y; /* C,M,Y : 0`1023 */ -+ short R,G,B; /* R,G,B : 0)B`255 */ -+ short C,M,Y; /* C,M,Y : 0)B`1023 */ - short H,D,Wa; /* ese-HSV */ - long S; /* HSV */ - -@@ -1517,9 +1510,11 @@ - * c, m, y, inks by reducing the cyan component to give a truer black. - */ - private gx_color_index --gdev_mjc_map_rgb_color(gx_device *pdev, gx_color_value r, -- gx_color_value g, gx_color_value b) -+gdev_mjc_map_rgb_color(gx_device *pdev, const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) - return (gx_color_index)0; /* white */ - else { -@@ -1685,39 +1680,25 @@ - } - - private int --put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code) --{ -- if ( pi == 0 ) -- return (code); -- -- if ( pi->value.i < minval || pi->value.i > maxval ) -- { pi->status = pv_rangecheck; -- return (gs_error_rangecheck); -- } -- else -- { *property = pi->value.i; -- return (code ? code : 1); -- } --} -- --private int --put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code) --{ -- if ( pi == 0 ) -- return (code); -- -- if ( pi->value.f < minval || pi->value.f > maxval ) -- { pi->status = pv_rangecheck; -- return (gs_error_rangecheck); -- } -- else -- { *property = pi->value.f; -- return (code ? code : 1); -- } -+mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue, -+ int minval, int maxval, int ecode) -+{ int code, value; -+ switch ( code = param_read_int(plist, pname, &value) ) -+ { -+ default: -+ return code; -+ case 1: -+ return ecode; -+ case 0: -+ if ( value < minval || value > maxval ) -+ param_signal_error(plist, pname, gs_error_rangecheck); -+ *pvalue = value; -+ return (ecode < 0 ? ecode : 1); -+ } - } - - private void --set_bpp(gx_device *pdev, int bits_per_pixel) -+mj_set_bpp(gx_device *pdev, int bits_per_pixel) - { gx_device_color_info *ci = &pdev->color_info; - /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */ - int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : -@@ -1725,9 +1706,9 @@ - ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3); - ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp); - ci->max_gray = (bpp >= 8 ? 255 : 1); -- ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); -- ci->dither_gray = (bpp >= 8 ? 5 : 2); -- ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); -+ ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0); -+ ci->dither_grays = (bpp >= 8 ? 5 : 2); -+ ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0); - } - - /* This returns either the number of pixels in a scan line, or the number -@@ -1736,7 +1717,7 @@ - gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount) - { - word raster_width = -- pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin); -+ pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]); - return (pixelcount ? - (uint)raster_width : - (uint)((raster_width * pdev->color_info.depth + 7) >> 3)); diff --git a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.mak b/print/ghostscript-afpl/files/patch-mjc:gdevmjc.mak deleted file mode 100644 index a094ea08812f..000000000000 --- a/print/ghostscript-afpl/files/patch-mjc:gdevmjc.mak +++ /dev/null @@ -1,43 +0,0 @@ ---- mjc/gdevmjc.mak.orig Tue May 23 19:19:13 2000 -+++ mjc/gdevmjc.mak Tue May 23 19:19:40 2000 -@@ -4,25 +4,22 @@ - # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C - # - ## --# --# Append this file to Makefile --# --## --MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \ -- mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c -+MJCSRC = $(GLSRC)gdevmjc.c $(GLSRC)mjmtx2.c $(GLSRC)mjbksep.c \ -+ $(GLSRC)mjhtocmy.c $(GLSRC)mjvtbl.c $(GLSRC)mjgrnsp.c \ -+ $(GLSRC)mjgrnsp2.c $(GLSRC)mjespdtc.c $(GLSRC)mjespdtm.c \ -+ $(GLSRC)mjespdty.c $(GLSRC)mjbarrie.c - --mj700v2c_=gdevmjc.$(OBJ) $(HPPCL) -+mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL) - - # To make A4 paper the default, change the second line below this to --gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h) -- $(CCC) -DA4 gdevmjc.c -- --mjc180.dev: $(mj700v2c_) -- $(SHP)gssetdev mjc180 $(mj700v2c_) --mjc360.dev: $(mj700v2c_) -- $(SHP)gssetdev mjc360 $(mj700v2c_) --mjc720.dev: $(mj700v2c_) -- $(SHP)gssetdev mjc720 $(mj700v2c_) --mj500c.dev: $(mj700v2c_) -- $(SHP)gssetdev mj500c $(mj700v2c_) -+$(GLOBJ)gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h) -+ $(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c - -+$(GLOBJ)mjc180.dev: $(mj700v2c_) $(DD)page.dev -+ $(SETPDEV) $(DD)mjc180 $(mj700v2c_) -+$(GLOBJ)mjc360.dev: $(mj700v2c_) $(DD)page.dev -+ $(SETPDEV) $(DD)mjc360 $(mj700v2c_) -+$(GLOBJ)mjc720.dev: $(mj700v2c_) $(DD)page.dev -+ $(SETPDEV) $(DD)mjc720 $(mj700v2c_) -+$(GLOBJ)mj500c.dev: $(mj700v2c_) $(DD)page.dev -+ $(SETPDEV) $(DD)mj500c $(mj700v2c_) diff --git a/print/ghostscript-afpl/files/patch-src-gdevijs.c b/print/ghostscript-afpl/files/patch-src-gdevijs.c deleted file mode 100644 index 3788e967996c..000000000000 --- a/print/ghostscript-afpl/files/patch-src-gdevijs.c +++ /dev/null @@ -1,659 +0,0 @@ ---- src/gdevijs.c.orig Thu Mar 10 23:57:23 2005 -+++ src/gdevijs.c Fri May 27 02:56:55 2005 -@@ -27,15 +27,29 @@ - * which is a security risk, since any program can be run. - * You should use -dSAFER which sets .LockSafetyParams to true - * before opening this device. -+ * -+ * 11/26/03 David Suffield -+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP -+ * -+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher. -+ * 2. Added krgb support. -+ * -+ * 02/21/05 David Suffield -+ * 1. Fixed segfault issue with 1-bit color space. -+ * 2. Fixed z-order issue with colored text on black rectangle. -+ * - */ - - #include "unistd_.h" /* for dup() */ - #include <stdlib.h> -+#include <fcntl.h> - #include "gdevprn.h" - #include "gp.h" - #include "ijs.h" - #include "ijs_client.h" - -+//#define KRGB_DEBUG -+ - /* This should go into gdevprn.h, or, better yet, gdevprn should - acquire an API for changing resolution. */ - int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev, -@@ -52,6 +66,14 @@ - private dev_proc_put_params(gsijs_put_params); - private dev_proc_finish_copydevice(gsijs_finish_copydevice);
- -+/* Following definitions are for krgb support. */ -+private dev_proc_create_buf_device(gsijs_create_buf_device); -+private dev_proc_fill_rectangle(gsijs_fill_rectangle); -+private dev_proc_copy_mono(gsijs_copy_mono); -+private dev_proc_fill_mask(gsijs_fill_mask); -+private dev_proc_fill_path(gsijs_fill_path); -+private dev_proc_stroke_path(gsijs_stroke_path); -+ - private const gx_device_procs gsijs_procs = { - gsijs_open,
- NULL, /* get_initial_matrix */
-@@ -126,6 +148,14 @@ - - IjsClientCtx *ctx; - int ijs_version; -+ -+ /* Additional parameters for krgb support. */ -+ int krgb_mode; /* 0=false, 1=true */ -+ int k_path; /* k plane path, 0=false, 1=true */ -+ int k_width; /* k plane width in pixels */ -+ int k_band_size; /* k plane buffer size in bytes, byte aligned */ -+ unsigned char *k_band; /* k plane buffer */ -+ gx_device_procs prn_procs; /* banding playback procedures */ - }; - - #define DEFAULT_DPI 74 /* See gsijs_set_resolution() below. */ -@@ -153,7 +183,12 @@ - FALSE, /* Tumble_set */ - - NULL, /* IjsClient *ctx */ -- 0 /* ijs_version */ -+ 0, /* ijs_version */ -+ 0, /* krgb_mode */ -+ 0, /* k_path */ -+ 0, /* k_width */ -+ 0, /* k_band_size */ -+ NULL /* k_band buffer */ - }; - - -@@ -169,12 +204,254 @@ - - /**************************************************************************/ - --/* ------ Private definitions ------ */ -+/* ---------------- Low-level graphic procedures ---------------- */ -+ -+static unsigned char xmask[] = -+{ -+ 0x80, /* x=0 */ -+ 0x40, /* 1 */ -+ 0x20, /* 2 */ -+ 0x10, /* 3 */ -+ 0x08, /* 4 */ -+ 0x04, /* 5 */ -+ 0x02, /* 6 */ -+ 0x01 /* 7 */ -+}; -+ -+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h, -+ gx_color_index color) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ -+ if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0) -+ { -+ int raster = (ijsdev->k_width+7) >> 3; -+ register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3); -+ int dest_start_bit = x & 7; -+ int i,j,w1; -+ -+ if (h <= 0 || w <= 0) -+ return 0; -+ -+ if ((x+w) > ijsdev->k_width) -+ w1 = ijsdev->k_width - x; -+ else -+ w1 = w; -+ -+ /* Note x,y orgin 0,0 is stored first byte 0 left to right. */ -+ -+ if (color==0x0) -+ { -+ /* Color is black, store in k plane band instead of regular band. */ -+ for (j=0; j<h; j++) -+ { -+ for (i=0; i<w1; i++) -+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7]; -+ dest+=raster; -+ } -+ return 0; -+ } -+ else -+ { -+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ -+ for (j=0; j<h; j++) -+ { -+ for (i=0; i<w1; i++) -+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7]; -+ dest+=raster; -+ } -+ } -+ } -+ -+ return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color); -+} -+ -+private int gsijs_copy_mono(gx_device * dev, const byte * data, -+ int dx, int draster, gx_bitmap_id id, -+ int x, int y, int w, int height, gx_color_index zero, gx_color_index one) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ -+ // if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) -+ if (ijsdev->krgb_mode && ijsdev->k_path) -+ { -+ /* Store in k plane band instead of regular band. */ -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3); -+ register const unsigned char *scan=data+(dx >> 3); -+ int dest_start_bit = x & 7; -+ int scan_start_bit = dx & 7; -+ int i, h=height; -+ -+ if (h <= 0 || w <= 0) -+ return 0; -+ -+ if (one==0x0) -+ { -+ /* Color is black, store in k plane band instead of regular band. */ -+ while (h-- > 0) -+ { -+ for (i=0; i<w; i++) -+ { -+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7]) -+ dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7]; -+ } -+ scan+=draster; -+ dest+=raster; -+ } -+ return 0; -+ } -+ else -+ { -+ /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */ -+ while (h-- > 0) -+ { -+ for (i=0; i<w; i++) -+ { -+ if (scan[(scan_start_bit+i)>>3] & xmask[(scan_start_bit+i)&7]) -+ dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7]; -+ } -+ scan+=draster; -+ dest+=raster; -+ } -+ } -+ } -+ -+ return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id, x, y, w, height, zero, one); -+} -+ -+/* ---------------- High-level graphic procedures ---------------- */ -+ -+private int gsijs_fill_mask(gx_device * dev, -+ const byte * data, int dx, int raster, gx_bitmap_id id, -+ int x, int y, int w, int h, -+ const gx_drawing_color * pdcolor, int depth, -+ gs_logical_operation_t lop, const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; -+ -+ code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id, x, y, w, h, pdcolor, depth, lop, pcpath); -+ -+ ijsdev->k_path = 0; -+ -+ return code; -+} -+ -+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis, -+ gx_path * ppath, const gx_fill_params * params, -+ const gx_drawing_color * pdcolor, -+ const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; -+ -+ code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params, pdcolor, pcpath); -+ -+ ijsdev->k_path = 0; -+ -+ return 0; -+} -+ -+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis, -+ gx_path * ppath, const gx_stroke_params * params, -+ const gx_drawing_color * pdcolor, -+ const gx_clip_path * pcpath) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target; -+ int code; -+ -+ ijsdev->k_path = 1; - --/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and -- require some workarounds. When more up-to-date hpijs versions -- become ubiquitous, all these workarounds should be removed. */ --#define HPIJS_1_0_VERSION 29 -+ code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath); -+ -+ ijsdev->k_path = 0; -+ -+ return code; -+} -+ -+/* ---------------- krgb banding playback procedures ---------------- */ -+ -+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev; -+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ int band_number = y/band_height; -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ int y1=raster*(y-(band_height*band_number)); -+ -+ if (y1 == 0) -+ { -+ /* First raster for band, clear k_band. Banding playback occurs on first raster. */ -+ memset(ijsdev->k_band, 0, ijsdev->k_band_size); -+ } -+ -+ return gdev_prn_get_bits(pdev, y, str, actual_data); /* get raster from regular band */ -+} -+ -+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)pdev; -+ gx_device_clist_common *cdev = (gx_device_clist_common *)pdev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ int band_number = y/band_height; -+ int raster = (ijsdev->k_width+7) >> 3; /* raster width in bytes, byte aligned */ -+ int y1=raster*(y-(band_height*band_number)); -+ -+ *actual_data = ijsdev->k_band+y1; -+ -+ return 0; -+} -+ -+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target, -+ const gx_render_plane_t *render_plane, gs_memory_t *mem, bool for_band) -+{ -+ gx_device_ijs *ijsdev = (gx_device_ijs *)target; -+ int n_chan = ijsdev->color_info.num_components; -+ int code = gx_default_create_buf_device(pbdev, target, render_plane, mem, for_band); -+ if (code < 0 || n_chan != 3) -+ return code; -+ -+ /* Save buffer (vector) procedures so that we can hook them during banding playback. */ -+ ijsdev->prn_procs = (*pbdev)->procs; -+ -+ /* Replace buffer procedures with krgb procedures. */ -+ set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle); -+ set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono); -+ set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask); -+ set_dev_proc(*pbdev, fill_path, gsijs_fill_path); -+ set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path); -+ -+ return code; -+} -+ -+/* See if IJS server supports krgb. Return value: 0=false, 1=true. */ -+private int -+gsijs_set_krgb_mode(gx_device_ijs *ijsdev) -+{ -+ char buf[256]; -+ int n_chan = ijsdev->color_info.num_components; -+ int code; -+ -+ if (n_chan != 3) -+ return 0; /* no krgb support, not RGB colorspace */ -+ -+ buf[0] = 0; -+ code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace", buf, sizeof(buf)-1); -+ if (code >= 0) -+ buf[code] = 0; -+ if (strstr(buf, "KRGB") == NULL) -+ return 0; /* no krgb support */ -+ -+ return 1; /* krgb is supported */ -+} -+ -+/* ------ Private definitions ------ */ - - private int - gsijs_parse_wxh (const char *val, int size, double *pw, double *ph) -@@ -212,34 +489,6 @@ - } - - /** -- * gsijs_set_generic_params_hpijs: Set generic IJS parameters. -- * -- * This version is specialized for hpijs 1.0 through 1.0.2, and -- * accommodates a number of quirks. -- **/ --private int --gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev) --{ -- char buf[256]; -- int code = 0; -- -- /* IjsParams, Duplex, and Tumble get set at this point because -- they may affect margins. */ -- if (ijsdev->IjsParams) { -- code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams); -- } -- -- if (code == 0 && ijsdev->Duplex_set) { -- int duplex_val; -- -- duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0; -- sprintf (buf, "%d", duplex_val); -- code = gsijs_client_set_param(ijsdev, "Duplex", buf); -- } -- return code; --} -- --/** - * gsijs_set_generic_params: Set generic IJS parameters. - **/ - private int -@@ -250,9 +499,6 @@ - int i, j; - char *value; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) -- return gsijs_set_generic_params_hpijs(ijsdev); -- - /* Split IjsParams into separate parameters and send to ijs server */ - value = NULL; - for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -293,68 +539,6 @@ - } - - /** -- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server. -- * -- * This version is specialized for hpijs 1.0 through 1.0.2, and -- * accommodates a number of quirks. -- **/ --private int --gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev) --{ -- char buf[256]; -- int code = 0; -- -- if (code == 0) { -- sprintf(buf, "%d", ijsdev->width); -- code = gsijs_client_set_param(ijsdev, "Width", buf); -- } -- if (code == 0) { -- sprintf(buf, "%d", ijsdev->height); -- code = gsijs_client_set_param(ijsdev, "Height", buf); -- } -- -- if (code == 0) { -- double printable_width, printable_height; -- double printable_left, printable_top; -- float m[4]; -- -- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea", -- buf, sizeof(buf)); -- if (code == IJS_EUNKPARAM) -- /* IJS server doesn't support margin negotiations. -- That's ok. */ -- return 0; -- else if (code >= 0) { -- code = gsijs_parse_wxh(buf, code, -- &printable_width, &printable_height); -- } -- -- if (code == 0) { -- code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft", -- buf, sizeof(buf)); -- if (code == IJS_EUNKPARAM) -- return 0; -- else if (code >= 0) { -- code = gsijs_parse_wxh(buf, code, -- &printable_left, &printable_top); -- } -- } -- -- if (code == 0) { -- m[0] = printable_left; -- m[1] = ijsdev->MediaSize[1] * (1.0 / 72) - -- printable_top - printable_height; -- m[2] = ijsdev->MediaSize[0] * (1.0 / 72) - -- printable_left - printable_width; -- m[3] = printable_top; -- gx_device_set_margins((gx_device *)ijsdev, m, true); -- } -- } -- -- return code; --} -- --/** - * gsijs_set_margin_params: Do margin negotiation with IJS server. - **/ - private int -@@ -365,9 +549,6 @@ - int i, j; - char *value; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) -- return gsijs_set_margin_params_hpijs(ijsdev); -- - /* Split IjsParams into separate parameters and send to ijs server */ - value = NULL; - for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) { -@@ -534,12 +715,18 @@ - char buf[256]; - bool use_outputfd; - int fd = -1; -+ long max_bitmap = ijsdev->space_params.MaxBitmap; - - if (strlen(ijsdev->IjsServer) == 0) { - eprintf("ijs server not specified\n"); - return gs_note_error(gs_error_ioerror); - } - -+ ijsdev->space_params.MaxBitmap = 0; /* force banding */ -+ -+ /* Set create_buf_device in printer device, so that we can hook the banding playback procedures. */ -+ ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device; -+ - /* Decide whether to use OutputFile or OutputFD. Note: how to - determine this is a tricky question, so we just allow the - user to set it. -@@ -554,6 +741,8 @@ - if (code < 0) - return code; - -+ ijsdev->space_params.MaxBitmap = max_bitmap; -+ - if (use_outputfd) { - /* Note: dup() may not be portable to all interesting IJS - platforms. In that case, this branch should be #ifdef'ed out. -@@ -613,6 +802,9 @@ - if (code >= 0) - code = gsijs_set_margin_params(ijsdev); - -+ if (code >= 0) -+ ijsdev->krgb_mode = gsijs_set_krgb_mode(ijsdev); -+ - return code; - } - -@@ -695,21 +887,6 @@ - return min(width, end); - } - --private int ijs_all_white(unsigned char *data, int size) --{ -- int clean = 1; -- int i; -- for (i = 0; i < size; i++) -- { -- if (data[i] != 0xFF) -- { -- clean = 0; -- break; -- } -- } -- return clean; --} -- - /* Print a page. Don't use normal printer gdev_prn_output_page - * because it opens the output file. - */ -@@ -720,8 +897,9 @@ - gx_device_printer *pdev = (gx_device_printer *)dev; - int raster = gdev_prn_raster(pdev); - int ijs_width, ijs_height; -- int row_bytes; -+ int row_bytes, k_row_bytes=0; - int n_chan = pdev->color_info.num_components; -+ int krgb_mode = ijsdev->krgb_mode; - unsigned char *data; - char buf[256]; - double xres = pdev->HWResolution[0]; -@@ -737,13 +915,23 @@ - - /* Determine bitmap width and height */ - ijs_height = gdev_prn_print_scan_lines(dev); -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION) { -- ijs_width = pdev->width; -- } else { - ijs_width = gsijs_raster_width(dev); -- } -+ - row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3; - -+ if (krgb_mode) -+ { -+ gx_device_clist_common *cdev = (gx_device_clist_common *)dev; -+ int band_height = cdev->page_info.band_params.BandHeight; -+ k_row_bytes = (ijs_width + 7) >> 3; -+ -+ /* Create banding buffer for k plane. */ -+ ijsdev->k_width = ijs_width; -+ ijsdev->k_band_size = band_height * k_row_bytes; -+ if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size, 1, "gsijs_output_page")) == (unsigned char *)NULL) -+ return gs_note_error(gs_error_VMerror); -+ } -+ - /* Required page parameters */ - sprintf(buf, "%d", n_chan); - gsijs_client_set_param(ijsdev, "NumChan", buf); -@@ -752,44 +940,71 @@ - - /* This needs to become more sophisticated for DeviceN. */ - strcpy(buf, (n_chan == 4) ? "DeviceCMYK" : -- ((n_chan == 3) ? "DeviceRGB" : "DeviceGray")); -+ ((n_chan == 3) ? (krgb_mode ? "KRGB" : "DeviceRGB") : "DeviceGray")); - gsijs_client_set_param(ijsdev, "ColorSpace", buf); - -- /* If hpijs 1.0, don't set width and height here, because it -- expects them to be the paper size. */ -- if (ijsdev->ijs_version != HPIJS_1_0_VERSION) { -- sprintf(buf, "%d", ijs_width); -- gsijs_client_set_param(ijsdev, "Width", buf); -- sprintf(buf, "%d", ijs_height); -- gsijs_client_set_param(ijsdev, "Height", buf); -- } -+ sprintf(buf, "%d", ijs_width); -+ gsijs_client_set_param(ijsdev, "Width", buf); -+ sprintf(buf, "%d", ijs_height); -+ gsijs_client_set_param(ijsdev, "Height", buf); - - sprintf(buf, "%gx%g", xres, yres); - gsijs_client_set_param(ijsdev, "Dpi", buf); - -+#ifdef KRGB_DEBUG -+ int kfd, rgbfd; -+ char sz[128]; -+ kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644); -+ rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644); -+ snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n", ijs_width, ijs_height); -+ write(kfd, sz, strlen(sz)); -+ snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n", ijs_width, ijs_height); -+ write(rgbfd, sz, strlen(sz)); -+#endif -+ - for (i=0; i<num_copies; i++) { - unsigned char *actual_data; - ijs_client_begin_cmd (ijsdev->ctx, IJS_CMD_BEGIN_PAGE); - status = ijs_client_send_cmd_wait(ijsdev->ctx); - - for (y = 0; y < ijs_height; y++) { -- code = gdev_prn_get_bits(pdev, y, data, &actual_data); -- if (code < 0) -- break; -+ if (krgb_mode) -+ code = gsijs_get_bits(pdev, y, data, &actual_data); -+ else -+ code = gdev_prn_get_bits(pdev, y, data, &actual_data); -+ if (code < 0) -+ break; -+#ifdef KRGB_DEBUG -+ write(rgbfd, actual_data, row_bytes); -+#endif -+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, row_bytes); -+ if (status) -+ break; - -- if (ijsdev->ijs_version == HPIJS_1_0_VERSION && -- ijs_all_white(actual_data, row_bytes)) -- status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0); -- else -- status = ijs_client_send_data_wait(ijsdev->ctx, 0, -- (char *)actual_data, row_bytes); -- if (status) -- break; -+ if (krgb_mode) { -+ code = gsijs_k_get_bits(pdev, y, &actual_data); -+ if (code < 0) -+ break; -+#ifdef KRGB_DEBUG -+ write(kfd, actual_data, k_row_bytes); -+#endif -+ status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, k_row_bytes); -+ if (status) -+ break; -+ } - } - ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE); - status = ijs_client_send_cmd_wait(ijsdev->ctx); - } - -+#ifdef KRGB_DEBUG -+ close(kfd); -+ close(rgbfd); -+#endif -+ -+ if(krgb_mode) -+ gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size, 1, "gsijs_output_page"); -+ - gs_free_object(pdev->memory, data, "gsijs_output_page"); - - endcode = (pdev->buffer_space && !pdev->is_async_renderer ? -@@ -1093,7 +1308,6 @@ - dprintf2("ijs: Can't set parameter %s=%s\n", key, value); - return code; - } -- - - private int - gsijs_set_color_format(gx_device_ijs *ijsdev) diff --git a/print/ghostscript-afpl/files/patch-src-gxfcopy.c b/print/ghostscript-afpl/files/patch-src-gxfcopy.c deleted file mode 100644 index a33419126b19..000000000000 --- a/print/ghostscript-afpl/files/patch-src-gxfcopy.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gxfcopy.c.orig Thu Mar 23 13:39:23 2006 -+++ src/gxfcopy.c Fri Mar 9 15:13:31 2007 -@@ -2391,7 +2391,7 @@ - a[j++] = &cfdata->names[i]; - } - } -- qsort(a, cfdata->num_glyphs, sizeof(int), compare_glyph_names); -+ qsort(a, cfdata->num_glyphs, sizeof(gs_copied_glyph_name_t*), compare_glyph_names); - for (; j >= 0; j--) - cfdata->glyphs[j].order_index = a[j] - cfdata->names; - gs_free_object(memory, a, "order_font_data"); diff --git a/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c b/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c deleted file mode 100644 index 8e7c323a351d..000000000000 --- a/print/ghostscript-afpl/files/patch-src:cpca_gdevl4v.c +++ /dev/null @@ -1,82 +0,0 @@ ---- src/cpca_gdevl4v.c.orig Tue May 7 00:30:00 2002 -+++ src/cpca_gdevl4v.c Wed Dec 10 19:54:46 2003 -@@ -316,41 +316,35 @@ - }; - - /* Vector device implementation */ --private int lips4v_beginpage(P1(gx_device_vector * vdev)); --private int lips4v_setfillcolor(P2(gx_device_vector * vdev, -- const gx_drawing_color * pdc)); --private int lips4v_setstrokecolor(P2(gx_device_vector * vdev, -- const gx_drawing_color * pdc)); --private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern, -- uint count, floatp offset)); --private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness)); -+private int lips4v_beginpage(gx_device_vector * vdev); -+private int lips4v_setfillcolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setstrokecolor(gx_device_vector * vdev, -+ const gx_drawing_color * pdc); -+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern, -+ uint count, floatp offset); -+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness); - private int --lips4v_setlogop(P3 -- -- (gx_device_vector * vdev, gs_logical_operation_t lop, -- gs_logical_operation_t diff)); -+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, -+ gs_logical_operation_t diff); - private int - --lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type); - private int --lips4v_moveto(P6 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -- floatp y, gx_path_type_t type)); -+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); - private int --lips4v_lineto(P6 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -- floatp y, gx_path_type_t type)); -+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x, -+ floatp y, gx_path_type_t type); - private int --lips4v_curveto(P10 -- (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1, -+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1, - floatp y1, floatp x2, floatp y2, floatp x3, floatp y3, -- gx_path_type_t type)); -+ gx_path_type_t type); - private int --lips4v_closepath(P6 -- (gx_device_vector * vdev, floatp x, floatp y, floatp x_start, -- floatp y_start, gx_path_type_t type)); -+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start, -+ floatp y_start, gx_path_type_t type); - --private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); -+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type); - private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width); - private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap); - private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join); -@@ -2296,7 +2290,7 @@ - } - color_set_pure(&color, one); - code = gdev_vector_update_fill_color((gx_device_vector *) pdev, -- &color); -+ NULL, &color); - } - if (code < 0) - return 0; -@@ -2438,7 +2432,7 @@ - if (w <= 0 || h <= 0) - return 0; - if (depth > 1 || -- gdev_vector_update_fill_color(vdev, pdcolor) < 0 || -+ gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 || - gdev_vector_update_clip_path(vdev, pcpath) < 0 || - gdev_vector_update_log_op(vdev, lop) < 0) - return gx_default_fill_mask(dev, data, data_x, raster, id, diff --git a/print/ghostscript-afpl/files/patch-src:fapi_ft.c b/print/ghostscript-afpl/files/patch-src:fapi_ft.c deleted file mode 100644 index 52f28daefcf7..000000000000 --- a/print/ghostscript-afpl/files/patch-src:fapi_ft.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/fapi_ft.c.orig Mon Mar 13 17:18:19 2006 -+++ src/fapi_ft.c Sun Mar 18 16:23:21 2007 -@@ -26,11 +26,14 @@ - #include "math_.h" - - /* FreeType headers */ --#include "freetype/freetype.h" -+#include "ft2build.h" -+#include FT_FREETYPE_H - #include "freetype/ftincrem.h" - #include "freetype/ftglyph.h" - #include "freetype/ftoutln.h" - #include "freetype/fttrigon.h" -+#include "gserrors.h" -+#include "gserror.h" - - /* Note: structure definitions here start with FF_, which stands for 'FAPI FreeType". */ - diff --git a/print/ghostscript-afpl/files/patch-src:gdevcd8.c b/print/ghostscript-afpl/files/patch-src:gdevcd8.c deleted file mode 100644 index b5257edb49de..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevcd8.c +++ /dev/null @@ -1,303 +0,0 @@ ---- src/gdevcd8.c.orig Mon Feb 28 16:01:59 2000 -+++ src/gdevcd8.c Fri Dec 17 19:42:52 2004 -@@ -406,19 +406,19 @@ - }; - - private int -- rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise1x1(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise2x1(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise1x2(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise2x2(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - --private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = { -+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = { - { - rescale_byte_wise1x1, rescale_byte_wise1x2 - }, -@@ -571,16 +571,16 @@ - }; - - /* function pointer typedefs for device driver struct */ --typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size, -- FILE * prn_stream)); --typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev, -+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size, -+ FILE * prn_stream); -+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - --typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream)); -+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream); - - typedef struct gx_device_cdj850_s { - gx_device_common; -@@ -699,52 +699,52 @@ - * functions. - */ - private void -- cdj850_start_raster_mode(P3(gx_device_printer * pdev, -- int papersize, FILE * prn_stream)); -+ cdj850_start_raster_mode(gx_device_printer * pdev, -+ int papersize, FILE * prn_stream); - - private void -- cdj850_print_non_blank_lines(P6(gx_device_printer * pdev, -+ cdj850_print_non_blank_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - - private void -- cdj850_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream)); -+ cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream); - - /* The 880C and siblings need a separate set of functions because they seem - * to require a somewhat different version of PCL3+. - */ - private void -- cdj880_start_raster_mode(P3(gx_device_printer * pdev, -- int papersize, FILE * prn_stream)); -+ cdj880_start_raster_mode(gx_device_printer * pdev, -+ int papersize, FILE * prn_stream); - - private void -- cdj880_print_non_blank_lines(P6(gx_device_printer * pdev, -+ cdj880_print_non_blank_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - - private void -- cdj880_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream)); -+ cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream); - - /* Functions for the 1600C. - */ - private void -- cdj1600_start_raster_mode(P3(gx_device_printer * pdev, -- int papersize, FILE * prn_stream)); -+ cdj1600_start_raster_mode(gx_device_printer * pdev, -+ int papersize, FILE * prn_stream); - private void -- cdj1600_print_non_blank_lines(P6(gx_device_printer * pdev, -+ cdj1600_print_non_blank_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - private void -- cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream)); -+ cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream); - - - -@@ -804,12 +804,12 @@ - cdj1600_terminate_page); - - /* Forward references */ --private int cdj_put_param_int(P6(gs_param_list *, gs_param_name, -- int *, int, int, int)); --private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float -- *, float, float, int)); --private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int)); --private int cdj_set_bpp(P3(gx_device *, int, int)); -+private int cdj_put_param_int(gs_param_list *, gs_param_name, -+ int *, int, int, int); -+private int cdj_put_param_float(gs_param_list *, gs_param_name, float -+ *, float, float, int); -+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int); -+private int cdj_set_bpp(gx_device *, int, int); - - - /* hp_colour_open() -@@ -1028,73 +1028,73 @@ - - /* internal functions */ - private void -- FSDlinebw(P7(int scan, int plane_size, -+ FSDlinebw(int scan, int plane_size, - struct error_val_field *error_values, - byte * kP, -- int n, int *ep, byte * dp)); -+ int n, int *ep, byte * dp); - private void -- FSDlinec2(P9(int scan, int plane_size, -+ FSDlinec2(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, int n, -- byte * dp, int *ep)); -+ byte * dp, int *ep); - private void -- FSDlinec3(P12(int scan, int plane_size, -+ FSDlinec3(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, - byte * cPb, byte * mPb, byte * yPb, -- int n, byte * dp, int *ep)); -+ int n, byte * dp, int *ep); - private void -- FSDlinec4(P12(int scan, int plane_size, -+ FSDlinec4(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, - byte * cPb, byte * mPb, byte * yPb, -- int n, byte * dp, int *ep)); -+ int n, byte * dp, int *ep); - private void - init_error_buffer(struct misc_struct *misc_vars, - struct ptr_arrays *data_ptrs); - private void -- do_floyd_steinberg(P8(int scan, int cscan, int plane_size, -+ do_floyd_steinberg(int scan, int cscan, int plane_size, - int plane_size_c, int n, - struct ptr_arrays *data_ptrs, - gx_device_printer * pdev, -- struct error_val_field *error_values)); -+ struct error_val_field *error_values); - private int -- do_gcr(P8(int bytecount, byte * inbyte, const byte * kvalues, -+ do_gcr(int bytecount, byte * inbyte, const byte * kvalues, - const byte * cvalues, const byte * mvalues, - const byte * yvalues, const int *kcorrect, -- word * inword)); -+ word * inword); - - /* UNUSED - *private int -- *test_scan (P4(int size, -+ *test_scan (int size, - * byte * current, - * byte * last, -- * byte * control)); -+ * byte * control); - *private void -- *save_color_data(P3(int size, -+ *save_color_data(int size, - * byte * current, -- * byte * saved)); -+ * byte * saved); - * - */ - private void -- send_scan_lines(P6(gx_device_printer * pdev, -+ send_scan_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - private void -- do_gamma(P3(float mastergamma, float gammaval, byte * values)); -+ do_gamma(float mastergamma, float gammaval, byte * values); - private void -- do_black_correction(P2(float kvalue, int *kcorrect)); -+ do_black_correction(float kvalue, int *kcorrect); - - private void -- init_data_structure(P3(gx_device_printer * pdev, -+ init_data_structure(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, -- struct misc_struct *misc_vars)); -+ struct misc_struct *misc_vars); - private void -- calculate_memory_size(P2(gx_device_printer * pdev, -- struct misc_struct *misc_vars)); -+ calculate_memory_size(gx_device_printer * pdev, -+ struct misc_struct *misc_vars); - - - private void -@@ -1175,7 +1175,7 @@ - 2bpp feature of the hp850 someday, it is sized like storage. - storagee contains the errors from b/w fs-ditherng */ - -- data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W, -+ data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W, - "cdj850_print_page"); - - /* if we can't allocate working area */ -@@ -1196,7 +1196,7 @@ - (*cdj850->terminate_page) (pdev, prn_stream); - - /* Free Memory */ -- gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W, -+ gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W, - "hp850_print_page"); - - return 0; -@@ -2744,13 +2744,14 @@ - (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b)) - - private gx_color_index --gdev_cmyk_map_cmyk_color(gx_device * pdev, -- gx_color_value cyan, gx_color_value magenta, -- gx_color_value yellow, -- gx_color_value black) -+gdev_cmyk_map_cmyk_color(gx_device * pdev, const gx_color_value cv[]) - { - - gx_color_index color; -+ gx_color_value cyan = cv[0]; -+ gx_color_value magenta = cv[1]; -+ gx_color_value yellow = cv[2]; -+ gx_color_value black = cv[3]; - - switch (pdev->color_info.depth) { - case 1: -@@ -2783,9 +2784,11 @@ - /* Mapping of RGB colors to gray values. */ - - private gx_color_index --gdev_cmyk_map_rgb_color(gx_device * pdev, gx_color_value r, gx_color_value -- g, gx_color_value b) -+gdev_cmyk_map_rgb_color(gx_device * pdev, const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) { - return (gx_color_index) 0; /* White */ - } else { -@@ -2873,9 +2876,11 @@ - } - - private gx_color_index --gdev_pcl_map_rgb_color(gx_device * pdev, gx_color_value r, -- gx_color_value g, gx_color_value b) -+gdev_pcl_map_rgb_color(gx_device * pdev, const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) - return (gx_color_index) 0; /* white */ - else { diff --git a/print/ghostscript-afpl/files/patch-src:gdevdj9.c b/print/ghostscript-afpl/files/patch-src:gdevdj9.c deleted file mode 100644 index ef473318ad07..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevdj9.c +++ /dev/null @@ -1,273 +0,0 @@ ---- src/gdevdj9.c.orig Fri Dec 17 19:31:42 2004 -+++ src/gdevdj9.c Fri Dec 17 19:44:07 2004 -@@ -243,19 +243,19 @@ - }; - - private int -- rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise1x1(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise2x1(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise1x2(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - private int -- rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea, -- const byte * inbyteb, byte * outbyte)); -+ rescale_byte_wise2x2(int bytecount, const byte * inbytea, -+ const byte * inbyteb, byte * outbyte); - --private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = { -+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = { - { - rescale_byte_wise1x1, rescale_byte_wise1x2 - }, -@@ -264,7 +264,7 @@ - } - }; - /* --private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = { -+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = { - { - rescale_byte_wise1x1, rescale_byte_wise1x1 - }, -@@ -273,8 +273,8 @@ - } - }; - */ --private int cdj970_write_header(P2(gx_device *, FILE *)); --private int cdj970_write_trailer(P2(gx_device *, FILE *)); -+private int cdj970_write_header(gx_device *, FILE *); -+private int cdj970_write_trailer(gx_device *, FILE *); - - /* - * Drivers stuff. -@@ -422,16 +422,16 @@ - }; - - /* function pointer typedefs for device driver struct */ --typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size, -- FILE * prn_stream)); --typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev, -+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size, -+ FILE * prn_stream); -+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - --typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream)); -+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream); - - typedef struct gx_device_cdj970_s { - gx_device_common; -@@ -529,18 +529,18 @@ - } - - private void -- cdj970_start_raster_mode(P3(gx_device_printer * pdev, -- int papersize, FILE * prn_stream)); -+ cdj970_start_raster_mode(gx_device_printer * pdev, -+ int papersize, FILE * prn_stream); - - private void -- cdj970_print_non_blank_lines(P6(gx_device_printer * pdev, -+ cdj970_print_non_blank_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - private void -- cdj970_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream)); -+ cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream); - - - private const gx_device_procs cdj970_procs = -@@ -555,12 +555,12 @@ - cdj970_terminate_page); - - /* Forward references */ --private int cdj_put_param_int(P6(gs_param_list *, gs_param_name, -- int *, int, int, int)); --private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float -- *, float, float, int)); --private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int)); --private int cdj_set_bpp(P3(gx_device *, int, int)); -+private int cdj_put_param_int(gs_param_list *, gs_param_name, -+ int *, int, int, int); -+private int cdj_put_param_float(gs_param_list *, gs_param_name, float -+ *, float, float, int); -+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int); -+private int cdj_set_bpp(gx_device *, int, int); - - static int PageCtr = 0; - -@@ -692,70 +692,70 @@ - - /* internal functions */ - private void -- FSDlinebw(P7(int scan, int plane_size, -+ FSDlinebw(int scan, int plane_size, - struct error_val_field *error_values, - byte * kP, -- int n, int *ep, byte * dp)); -+ int n, int *ep, byte * dp); - - private void -- FSDlinec2(P9(int scan, int plane_size, -+ FSDlinec2(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, int n, -- byte * dp, int *ep)); -+ byte * dp, int *ep); - - private void -- FSDlinec3(P12(int scan, int plane_size, -+ FSDlinec3(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, - byte * cPb, byte * mPb, byte * yPb, -- int n, byte * dp, int *ep)); -+ int n, byte * dp, int *ep); - - private void -- FSDlinec4(P12(int scan, int plane_size, -+ FSDlinec4(int scan, int plane_size, - struct error_val_field *error_values, - byte * cPa, byte * mPa, byte * yPa, - byte * cPb, byte * mPb, byte * yPb, -- int n, byte * dp, int *ep)); -+ int n, byte * dp, int *ep); - - private void - init_error_buffer(struct misc_struct *misc_vars, - struct ptr_arrays *data_ptrs); - - private void -- do_floyd_steinberg(P8(int scan, int cscan, int plane_size, -+ do_floyd_steinberg(int scan, int cscan, int plane_size, - int plane_size_c, int n, - struct ptr_arrays *data_ptrs, - gx_device_printer * pdev, -- struct error_val_field *error_values)); -+ struct error_val_field *error_values); - - - private int -- do_gcr(P7(int bytecount, byte * inbyte, const byte * kvalues, -+ do_gcr(int bytecount, byte * inbyte, const byte * kvalues, - const byte * cvalues, const byte * mvalues, -- const byte * yvalues, const int *kcorrect)); -+ const byte * yvalues, const int *kcorrect); - - private void -- send_scan_lines(P6(gx_device_printer * pdev, -+ send_scan_lines(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, - struct misc_struct *misc_vars, - struct error_val_field *error_values, - const Gamma *gamma, -- FILE * prn_stream)); -+ FILE * prn_stream); - - private void -- do_gamma(P3(float mastergamma, float gammaval, byte * values)); -+ do_gamma(float mastergamma, float gammaval, byte * values); - - private void -- do_black_correction(P2(float kvalue, int *kcorrect)); -+ do_black_correction(float kvalue, int *kcorrect); - - private void -- init_data_structure(P3(gx_device_printer * pdev, -+ init_data_structure(gx_device_printer * pdev, - struct ptr_arrays *data_ptrs, -- struct misc_struct *misc_vars)); -+ struct misc_struct *misc_vars); - - private void -- calculate_memory_size(P2(gx_device_printer * pdev, -- struct misc_struct *misc_vars)); -+ calculate_memory_size(gx_device_printer * pdev, -+ struct misc_struct *misc_vars); - - - /* assign_dpi: -@@ -863,7 +863,7 @@ - 2bpp feature of the hp970 someday, it is sized like storage. - storagee contains the errors from b/w fs-ditherng */ - -- data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W, -+ data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W, - "cdj970_print_page"); - - /* if we can't allocate working area */ -@@ -884,7 +884,7 @@ - (*cdj970->terminate_page) (pdev, prn_stream); - - /* Free Memory */ -- gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W, -+ gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W, - "hp970_print_page"); - - PageCtr ++; -@@ -2292,12 +2292,13 @@ - /* gdev_cmyk_map_cmyk_color: - ----------------------------------------------------------------------------------*/ - private gx_color_index gdev_cmyk_map_cmyk_color(gx_device *pdev, -- gx_color_value cyan, -- gx_color_value magenta, -- gx_color_value yellow, -- gx_color_value black) -+ const gx_color_value cv[]) - { - gx_color_index color; -+ gx_color_value cyan = cv[0]; -+ gx_color_value magenta = cv[1]; -+ gx_color_value yellow = cv[2]; -+ gx_color_value black = cv[3]; - - switch (pdev->color_info.depth) { - case 1: -@@ -2331,10 +2332,11 @@ - /* gdev_cmyk_map_rgb_color: Mapping of RGB colors to gray values. - ----------------------------------------------------------------------------------*/ - private gx_color_index gdev_cmyk_map_rgb_color( gx_device *pdev, -- gx_color_value r, -- gx_color_value g, -- gx_color_value b) -+ const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) { - return (gx_color_index) 0; /* White */ - } else { -@@ -2427,10 +2429,11 @@ - /* gdev_pcl_map_rgb_color: - ----------------------------------------------------------------------------------*/ - private gx_color_index gdev_pcl_map_rgb_color( gx_device *pdev, -- gx_color_value r, -- gx_color_value g, -- gx_color_value b) -+ const gx_color_value cv[]) - { -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - if (gx_color_value_to_byte(r & g & b) == 0xff) - return (gx_color_index) 0; /* white */ - else { diff --git a/print/ghostscript-afpl/files/patch-src:gdevgdi.c b/print/ghostscript-afpl/files/patch-src:gdevgdi.c deleted file mode 100644 index 49d575dd8c27..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevgdi.c +++ /dev/null @@ -1,1007 +0,0 @@ ---- src/gdevgdi.c.orig Wed Jun 19 19:32:49 2002 -+++ src/gdevgdi.c Fri Dec 31 17:41:18 2004 -@@ -60,8 +60,8 @@ - #define GDI_REPEAT_LENGTH 2 - #define GDI_BAND_HEIGHT 128 - #define GDI_MAX_BAND 66 --//#define GDI_BAND_WIDTH 4928 --//#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4) -+/*#define GDI_BAND_WIDTH 4928*/ -+/*#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)*/ - - #define GDI_PRE_COMP 2 - #define GDI_REAL_COMP 0 -@@ -74,8 +74,8 @@ - - #define GDI_MARGINS_A4 0.167, 0.167, 0.167, 0.167 - #define GDI_MARGINS_LETTER 0.167, 0.167, 0.167, 0.167 --//#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0 --//#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0 -+/*#define GDI_MARGINS_A4 0.0, 0.0, 0.0, 0.0*/ -+/*#define GDI_MARGINS_LETTER 0.0, 0.0, 0.0, 0.0*/ - - /* The number of blank lines that make it worthwhile to reposition */ - /* the cursor. */ -@@ -86,9 +86,15 @@ - - int GDI_BAND_WIDTH[] = {4768, 4928}; - -+#if GS_VERSION_MAJOR >= 8 -+private int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream); -+private int gdi_open(gx_device *pdev); -+private int gdi_close(gx_device *pdev); -+#else - private int gdi_print_page(P2(gx_device_printer *pdev, FILE *prn_stream)); - private int gdi_open(P1(gx_device *pdev)); - private int gdi_close(P1(gx_device *pdev)); -+#endif - - /* The device descriptors */ - private dev_proc_open_device(gdi_open); -@@ -107,6 +113,14 @@ - 1, /* color bit */ - gdi_print_page); - -+gx_device_printer far_data gs_samsunggdi_device = -+ prn_device(prn_gdi_procs, "samsunggdi", -+ DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */ -+ X_DPI2, Y_DPI2, -+ 0.20, 0.25, 0.25, 0.25, /* margins filled in by gdi_open */ -+ 1, /* color bit */ -+ gdi_print_page); -+ - private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp); - private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo, - unsigned char ubCompMode, unsigned int usBandWidth, -@@ -193,9 +207,9 @@ - } - - ul_band_size = band_width_bytes * band_height; -- ibp = (byte *)gs_malloc(ul_band_size, 1, "gdi_print_page"); -- obp = (byte *)gs_malloc(ul_band_size*13/10, 1, "gdi_print_page"); -- tmp = (byte *)gs_malloc(raster, 1, "gdi_print_page"); -+ ibp = (byte *)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page"); -+ obp = (byte *)gs_malloc(pdev->memory, ul_band_size*13/10, 1, "gdi_print_page"); -+ tmp = (byte *)gs_malloc(pdev->memory, raster, 1, "gdi_print_page"); - - if (!ibp) return_error(gs_error_VMerror); - if (!obp) return_error(gs_error_VMerror); -@@ -220,7 +234,7 @@ - memset(obp, 0x00, ul_band_size*13/10); - for (j=0; j<band_height; j++) { - memset(tmp, 0x00, raster); -- //code = gdev_prn_copy_scan_lines(pdev, i*band_height+j, -+ /*code = gdev_prn_copy_scan_lines(pdev, i*band_height+j, */ - if (y == num_rows) break; - code = gdev_prn_copy_scan_lines(pdev, y++, - (byte*)tmp, raster); -@@ -232,15 +246,71 @@ - - /* Write Band Data - Because of Scanline compression, extract Scanline compression mode */ -- //ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP); -- //ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP); -- //ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size; -+ /*ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/ -+ /*ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/ -+ /*ul_min_size = (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;*/ - ul_min_size = ul_tiff_size; - compression_type = GDI_COMP_MODITIFF; -- //compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE; -+ /*compression_type = (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;*/ - switch (compression_type) { - case GDI_COMP_MODITIFF: -+#define FUDGE_BIG_BANDS -+#ifndef FUDGE_BIG_BANDS - ul_comp_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP); -+#else -+ { -+ /* Very ugly. The printer will hose if the compressed -+ band size is over 65536, so we "fudge" the data in -+ this case repeatedly until we get what we want. -+ -+ The fudge algorithm is simple, this is kinda-sorta -+ RLE, so we just round groups of bits in groups of -+ 2, then 3, then 4, etc until the thing works. */ -+#define MAXBAND 0xffff -+#define ASSERT(x) -+ int fudge=0; -+ byte *use_band=ibp; -+ do { -+ ul_comp_size = FrameTiffComp(obp, use_band, -+ band_height, band_width_bytes, -+ GDI_REAL_COMP); -+ if (ul_comp_size > MAXBAND-8) { -+ int f, g, h; -+ if (!fudge) { -+ ASSERT(use_band == ibp); -+ use_band = (byte*)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page/fudge"); -+ fudge=1; -+ } -+ memcpy(use_band, ibp, ul_band_size); -+ fudge++; -+ ASSERT(fudge>=2); -+ { -+#define FUDGE2(x) ( (((((x)>>6)&0x3)?3:0)<<6) \ -+ | (((((x)>>4)&0x3)?3:0)<<4) \ -+ | (((((x)>>2)&0x3)?3:0)<<2) \ -+ | (((((x)>>0)&0x3)?3:0)) ) -+#define FUDGE4(x) ( (((((x)>>4)&0xf)?0xf:0)<<4) \ -+ | (((((x)>>0)&0xf)?0xf:0)) ) -+#define FUDGE8(x) ( (((((x)>>0)&0xff)?0xf:0)) ) -+#define FUDGE(fudge, x) ( (fudge == 2 ? FUDGE2(x) \ -+ : fudge == 3 ? FUDGE4(x) \ -+ : fudge == 4 ? FUDGE8(x) \ -+ : 0 ) ) -+ -+ for(f=0;f<ul_band_size; f++) { -+ use_band[f] = FUDGE(fudge, ibp[f]); -+ } -+ } -+ } -+ } while (ul_comp_size > MAXBAND-8); -+ oh_well: -+ if (fudge > 1) { -+ ASSERT(use_band != ibp); -+ gs_free(pdev->memory, use_band, ul_band_size, 1, "gdi_print_page/fudge"); -+ /*fprintf(stderr, "smartgdi: band %d fudge factor is %d\n", i, fudge);*/ -+ } -+ } -+#endif - break; - case GDI_COMP_SCANLINE: - ul_comp_size = bmp2run(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP); -@@ -253,15 +323,15 @@ - - prn_stream = WriteBandHeader(prn_stream, i, compression_type, (band_width_bytes * 8), - band_height, ul_comp_size); -- //fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size); -+ /*fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);*/ - fwrite(obp, ul_comp_size, 1, prn_stream); - } - - /* Trailer Output */ - WriteTrailerData(prn_stream); -- gs_free(ibp, ul_band_size, 1, "gdi_line_buffer"); -- gs_free(obp, ul_band_size*13/10, 1, "gdi_line_buffer"); -- gs_free(tmp, raster, 1, "gdi_line_buffer"); -+ gs_free(pdev->memory, ibp, ul_band_size, 1, "gdi_line_buffer"); -+ gs_free(pdev->memory, obp, ul_band_size*13/10, 1, "gdi_line_buffer"); -+ gs_free(pdev->memory, tmp, raster, 1, "gdi_line_buffer"); - return code; - } - -@@ -271,50 +341,50 @@ - unsigned char buffer[300]; - int dots_per_inch = (int)pdev->y_pixels_per_inch; - -- strcpy(buffer, "\x1b%-12345X"); -+ strcpy(buffer, "\033%-12345X"); - -- // Paper Type -- strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\x0d\x0a"); -- //Density -- strcat(buffer, "@PJL SET DENSITY = 1\x0d\x0a"); -- // Toner Save -- strcat(buffer, "@PJL SET TONERSAVE = OFF\x0d\x0a"); -- // Enter Language SMART -- strcat(buffer, "@PJL ENTER LANGUAGE = SMART\x0d\x0a"); -- // JobStart -- strcat(buffer, "$PJL JOB START\x0d\x0a"); -+ /* Paper Type*/ -+ strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\015\012"); -+ /*Density*/ -+ strcat(buffer, "@PJL SET DENSITY = 1\015\012"); -+ /* Toner Save*/ -+ strcat(buffer, "@PJL SET TONERSAVE = OFF\015\012"); -+ /* Enter Language SMART*/ -+ strcat(buffer, "@PJL ENTER LANGUAGE = SMART\015\012"); -+ /* JobStart*/ -+ strcat(buffer, "$PJL JOB START\015\012"); - -- // Resolution -+ /* Resolution*/ - if (dots_per_inch == 600) -- strcat(buffer, "$PJL RESOLUTION = 600\x0d\x0a"); -+ strcat(buffer, "$PJL RESOLUTION = 600\015\012"); - else -- strcat(buffer, "$PJL RESOLUTION = 300\x0d\x0a"); -+ strcat(buffer, "$PJL RESOLUTION = 300\015\012"); - -- // Copies -- strcat(buffer, "$PJL COPIES = 1\x0d\x0a"); -- // Paper Size -+ /* Copies*/ -+ strcat(buffer, "$PJL COPIES = 1\015\012"); -+ /* Paper Size*/ - switch (gdev_pcl_paper_size((gx_device*)pdev)) - { - case PAPER_SIZE_A4: -- strcat(buffer, "$PJL PAGE A4 AUTO\x0d\x0a"); -+ strcat(buffer, "$PJL PAGE A4 AUTO\015\012"); - break; - case PAPER_SIZE_LETTER: -- strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a"); -+ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012"); - break; - case PAPER_SIZE_LEGAL: -- strcat(buffer, "$PJL PAGE LEGAL AUTO\x0d\x0a"); -+ strcat(buffer, "$PJL PAGE LEGAL AUTO\015\012"); - break; - default: -- strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a"); -+ strcat(buffer, "$PJL PAGE LETTER AUTO\015\012"); - break; - } -- // bitmap start -- strcat(buffer, "$PJL BITMAP START\x0d\x0a"); -- // write buffer to file. -+ /* bitmap start*/ -+ strcat(buffer, "$PJL BITMAP START\015\012"); -+ /* write buffer to file.*/ - ulSize = strlen(buffer); - fwrite(buffer, 1, ulSize, fp ); - return(fp); --} // WritePJLHeaderData() -+} /* WritePJLHeaderData() */ - - - FILE *WriteBandHeader -@@ -335,33 +405,33 @@ - - ulBandSize += 8; - -- // bandsize -+ /* bandsize*/ - buf[i++] = (unsigned char)((ulBandSize >> 24) & 0xff); - buf[i++] = (unsigned char)((ulBandSize >> 16) & 0xff); - buf[i++] = (unsigned char)((ulBandSize >> 8) & 0xff); - buf[i++] = (unsigned char)(ulBandSize & 0xff); - -- // id -+ /* id */ - buf[i++] = (unsigned char)((usBandNo >> 8) & 0xff); - buf[i++] = (unsigned char)(usBandNo & 0xff); - -- // compress mode -+ /* compress mode */ - buf[i++] = (unsigned char)(ubCompMode & 0xff); - -- // ubLeft -+ /* ubLeft */ - buf[i++] = (unsigned char)(ubLeft & 0xff); - -- // height -+ /* height*/ - buf[i++] = (unsigned char)((usBandHeight >> 8) & 0xff); - buf[i++] = (unsigned char)(usBandHeight & 0xff); - -- // width -+ /* width */ - buf[i++] = (unsigned char)((usBandWidth >> 8) & 0xff); - buf[i++] = (unsigned char)(usBandWidth & 0xff); - - fwrite(buf, 1, i, fp); - return(fp); --} // end of WriteBandHeader() -+} /* end of WriteBandHeader()*/ - - FILE *WriteTrailerData(FILE *fp) - { -@@ -369,18 +439,18 @@ - unsigned long buffer[200]; - - memset((char*)buffer, 0x00, 200); -- strcpy((char*)buffer, "$PJL PRINT 4\x0d\x0a"); -- strcat((char*)buffer, "$PJL EOJ\x0d\x0a"); -- strcat((char*)buffer, "$PJL SYNC\x0d\x0a"); -- strcat((char*)buffer, "$PJL RELEASE 0 2047\x0d\x0a"); -- strcat((char*)buffer, "$PJL GARBAGE\x0d\x0a"); -- strcat((char*)buffer, "\x1b%-12345X\x0d\x0a"); -+ strcpy((char*)buffer, "$PJL PRINT 4\015\012"); -+ strcat((char*)buffer, "$PJL EOJ\015\012"); -+ strcat((char*)buffer, "$PJL SYNC\015\012"); -+ strcat((char*)buffer, "$PJL RELEASE 0 2047\015\012"); -+ strcat((char*)buffer, "$PJL GARBAGE\015\012"); -+ strcat((char*)buffer, "\033%-12345X\015\012"); - - ulSize = strlen((char*)buffer); - fwrite(buffer, 1, ulSize, fp); - - return(fp); --} // WriteTrailerData() -+} /* WriteTrailerData()*/ - - unsigned long FrameTiffComp(unsigned char *pubDest, - unsigned char *pubSrc, -@@ -399,7 +469,7 @@ - - for (i = 0; i < usTotalLines; i++) - { -- if (!(ubMode & 0x02)) // -+ if (!(ubMode & 0x02)) - { - usLineSize = FrameTiff_Comp(SrcPtr, TgtPtr, usBytesPerLine); - } -@@ -416,7 +486,7 @@ - ulret += usLineSize; - } - -- if (!(ubMode & 0x02)) // -+ if (!(ubMode & 0x02)) - { - switch (ulret%4) - { -@@ -448,7 +518,7 @@ - } - } - return(ulret); --} // FrameTiffComp() -+} /* FrameTiffComp()*/ - - unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf, unsigned int nSrcBytes) - { -@@ -528,13 +598,13 @@ - usEndCnt = 16384; - } - usEndCnt = usCount - 2; -- // usEndCnt = usCount - 2; original -- // 19990824 by LSM : for end file while (usEndCnt--) -+ /* usEndCnt = usCount - 2; original*/ -+ /* 19990824 by LSM : for end file while (usEndCnt--)*/ - while (usEndCnt--) - { - /* read next data */ - ubFirst = ubSecond; -- ubSecond = *pubSrc++; // read 3rd Data -+ ubSecond = *pubSrc++; /* read 3rd Data*/ - if (ubFirst == ubSecond) - { - if (usEndCnt <= 1) -@@ -544,7 +614,7 @@ - } - else - { -- ubSecond = *pubSrc++; // read 4th Data -+ ubSecond = *pubSrc++; /* read 4th Data*/ - usEndCnt--; - if (ubFirst == ubSecond) - { -@@ -660,14 +730,14 @@ - { - usEndCnt = 16384; - } -- // usEndCnt = usCount - 2; -+ /* usEndCnt = usCount - 2;*/ - usEndCnt = usCount - 2; -- // 19990824 by LSM : for Last file while (usEndCnt--) -+ /* 19990824 by LSM : for Last file while (usEndCnt--)*/ - while (usEndCnt--) - { - /* read next data */ - ubFirst = ubSecond; -- ubSecond = *pubSrc++; // read 3rd Data -+ ubSecond = *pubSrc++; /* read 3rd Data*/ - if (ubFirst == ubSecond) - { - if (usEndCnt <= 1) -@@ -677,8 +747,8 @@ - } - else - { -- ubSecond = *pubSrc++; // read 4th Data -- usEndCnt--; // 19990824 by LSM -+ ubSecond = *pubSrc++; /* read 4th Data*/ -+ usEndCnt--; /* 19990824 by LSM*/ - if (ubFirst == ubSecond) - { - ubMisCnt = 3; -@@ -691,7 +761,7 @@ - /* save data */ - usControl = (unsigned int) (pubSrc - pubOrg); - usControl -= ubMisCnt; -- // 19990824 by LSM : for fixing GPF on Photoshop -+ /* 19990824 by LSM : for fixing GPF on Photoshop*/ - if (usControl > usCount) - { - usControl = usCount; -@@ -728,77 +798,77 @@ - } sc_tbl; - - static sc_tbl gdi_ScanTbl[256] = { --{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, // 0x00 -+{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 }, /* 0x00*/ - { 5, 1, 0 }, { 0, 0, 1 }, { 5, 2, 0 }, { 5, 3, 1 }, - { 4, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 4, 2, 0 }, { 0, 0, 1 }, { 4, 3, 0 }, { 4, 4, 1 }, --{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x10 -+{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x10*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 3, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 3, 3, 0 }, { 0, 0, 1 }, { 3, 4, 0 }, { 3, 5, 1 }, --{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x20 -+{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x20*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x30 -+{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x30*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 2, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 2, 4, 0 }, { 0, 0, 1 }, { 2, 5, 0 }, { 2, 6, 1 }, --{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x40 -+{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x40*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x50 -+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x50*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x60 -+{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x60*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x70 -+{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x70*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 1, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 1, 5, 0 }, { 0, 0, 1 }, { 1, 6, 0 }, { 1, 7, 1 }, --{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x80 -+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x80*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x90 -+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x90*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xa0 -+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xa0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xb0 -+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xb0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xc0 -+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xc0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xd0 -+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xd0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xe0 -+{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xe0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, --{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0xf0 -+{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0xf0*/ - { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 5, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, - { 0, 6, 0 }, { 0, 0, 1 }, { 0, 7, 0 }, { 0, 8, 1 }, - }; - - static sc_tbl gdi_ScanTbl4[16] = { --{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, // 0x00 --{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, // 0x04 --{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, // 0x08 --{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } // 0x0c -+{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 }, /* 0x00*/ -+{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 }, /* 0x04*/ -+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, /* 0x08*/ -+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 } /* 0x0c*/ - }; - - long SaveScanData( unsigned char *, unsigned short, unsigned short, unsigned short, unsigned short, unsigned short ); -@@ -816,32 +886,32 @@ - lWarp = (long)(usWarp << 3); - lDis = ((long)usDy * lWarp) + (long)sDx; - -- // 1st, 2nd, 3rd & 4th byte -- ultmp_dat = 0xc0000000; -+ /* 1st, 2nd, 3rd & 4th byte*/ -+ ultmp_dat = 0xc0000000ul; - if (lDis < 0) - { -- ultmp_dat |= 0x20000000; -+ ultmp_dat |= 0x20000000ul; - } -- ultmp_dat |= (lDis & 0x1fffffff); -- *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000) >> 24); -- *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000) >> 16); -- *out_buf++ = (unsigned char)((ultmp_dat & 0xff00) >> 8); -- *out_buf++ = (unsigned char)(ultmp_dat & 0xff); -+ ultmp_dat |= (lDis & 0x1ffffffful); -+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000ul) >> 24); -+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000ul) >> 16); -+ *out_buf++ = (unsigned char)((ultmp_dat & 0xff00ul) >> 8); -+ *out_buf++ = (unsigned char)(ultmp_dat & 0xfful); - -- // 5th & 6th byte -+ /* 5th & 6th byte*/ - ustmp_dat = 0xc000; - ustmp_dat |= (usRl & 0x3fff); - *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8); - *out_buf++ = (unsigned char)(ustmp_dat & 0xff); - - return(6); --} // Save6Bytes() -+} /* Save6Bytes()*/ - - long Save4Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx) - { - unsigned short ustmp_dat; - -- // 1st & 2nd byte -+ /* 1st & 2nd byte*/ - ustmp_dat = 0x8000; - if (sDx < 0) - { -@@ -851,7 +921,7 @@ - *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8); - *out_buf++ = (unsigned char)(ustmp_dat & 0xff); - -- // 3rd & 4th byte -+ /* 3rd & 4th byte*/ - ustmp_dat = 0x8000; - ustmp_dat |= ((usDy & 0x03) << 12); - ustmp_dat |= (usRl & 0xfff); -@@ -859,13 +929,13 @@ - *out_buf++ = (unsigned char)(ustmp_dat & 0xff); - - return(4); --} // end of Save4Bytes() -+} /* end of Save4Bytes()*/ - - long Save2Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx) - { - unsigned char ubtmp_dat; - -- // 1st byte -+ /* 1st byte*/ - ubtmp_dat = 0x00; - if (usDy == 1) - { -@@ -874,7 +944,7 @@ - ubtmp_dat |= (usRl & 0x3f); - *out_buf++ = ubtmp_dat; - -- // 2nd byte -+ /* 2nd byte*/ - if (sDx < 0) - { - ubtmp_dat = 0x80; -@@ -886,7 +956,7 @@ - ubtmp_dat |= ((unsigned char)sDx & 0x7f); - *out_buf++ = ubtmp_dat; - return(2); --} // end of Save2Bytes() -+} /* end of Save2Bytes()*/ - - long SaveScanData (unsigned char *out_buf, - unsigned short us1Cnt, -@@ -900,26 +970,26 @@ - - sDisX = (int)usPosX01 - (int)usPosX10; - -- // 48 bit -+ /* 48 bit*/ - if ( (usDy > 3) || (us1Cnt > 4095) ) - { - Save6Bytes(out_buf, usDy, us1Cnt, sDisX, usWarp); - lRet = 6; - } -- // 32 bit -+ /* 32 bit*/ - else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) ) - { - Save4Bytes(out_buf, usDy, us1Cnt, sDisX); - lRet = 4; - } -- // 16 bit -+ /* 16 bit*/ - else - { - Save2Bytes(out_buf, usDy, us1Cnt, sDisX); - lRet = 2; - } - return(lRet); --} // end of SaveScanData() -+} /* end of SaveScanData()*/ - - - long UpdateScanSize (unsigned char *out_buf, -@@ -934,23 +1004,23 @@ - - sDisX = usPosX01 - usPosX10; - -- // 48 bit -+ /* 48 bit*/ - if ( (usDy > 3) || (us1Cnt > 4095) ) - { - lRet = 6; - } -- // 32 bit -+ /* 32 bit*/ - else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) ) - { - lRet = 4; - } -- // 16 bit -+ /* 16 bit*/ - else - { - lRet = 2; - } - return(lRet); --} // end of UpdateScanSize() by bglee 19981224 -+} /* end of UpdateScanSize() by bglee 19981224*/ - - long GetSimpleScan(unsigned char *out_buf, - unsigned char ubSizeMode, -@@ -983,10 +1053,10 @@ - } - - -- // 1 X 1 X -+ /* 1 X 1 X*/ - if (ubPreBit) - { -- // 1 0 1 X -+ /* 1 0 1 X*/ - if (ubDx) - { - lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth); -@@ -994,23 +1064,23 @@ - *usPosX01 = usBytePos + ubDx; - *us1Count = ubRl; - *usDy = 0; -- // 1 0 1 0 -+ /* 1 0 1 0*/ - if (!ubLastBit) - { -- // 19990330 by bglee -+ /* 19990330 by bglee*/ - out_buf = out_buf + lScanSize; - - lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth); - *usPosX10 = *usPosX01 ; - *us1Count = 0; - } -- // 1 0 1 1 -+ /* 1 0 1 1*/ - } -- // 1 1 1 X -+ /* 1 1 1 X*/ - else - { - *us1Count += ubRl; -- // 1 1 1 0 -+ /* 1 1 1 0*/ - if (!ubLastBit) - { - lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth); -@@ -1018,16 +1088,16 @@ - *us1Count = 0; - *usDy = 0; - } -- // 1 1 1 1 -+ /* 1 1 1 1*/ - } - } -- // 0 X 1 X -+ /* 0 X 1 X*/ - else - { -- // 0 X 1 X -+ /* 0 X 1 X*/ - *usPosX01 = usBytePos + ubDx; - *us1Count += ubRl; -- // 0 X 1 0 -+ /* 0 X 1 0*/ - if (!ubLastBit) - { - lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth); -@@ -1035,11 +1105,11 @@ - *us1Count = 0; - *usDy = 0; - } -- // 0 X 1 1 -+ /* 0 X 1 1*/ - } - - return(lScanSize); --} // end of GetSimpleScan() -+} /* end of GetSimpleScan() */ - - - long scan_map (unsigned char *in_buf, -@@ -1049,7 +1119,7 @@ - unsigned char ubMode) - { - unsigned int i, j, k; -- unsigned char ubPreBit, ubCrtByte;//, ubLastBit; -+ unsigned char ubPreBit, ubCrtByte;/*, ubLastBit;*/ - long lScanSize, lTmp; - long lCrtSize; - unsigned short us1Count; -@@ -1078,7 +1148,7 @@ - switch (ubCrtByte) - { - case 0x00: -- // 1 0 -+ /* 1 0 */ - if (ubPreBit) - { - lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth); -@@ -1088,16 +1158,16 @@ - us1Count = 0; - usDy = 0; - } -- // 0 0 -+ /* 0 0*/ - break; - - case 0xff: -- // 1 1 -+ /* 1 1*/ - if (ubPreBit) - { - us1Count += 8; - } -- // 0 1 -+ /* 0 1*/ - else - { - us1Count = 8; -@@ -1106,7 +1176,7 @@ - break; - - default: -- // X X 1 X -+ /* X X 1 X*/ - if (gdi_ScanTbl[ubCrtByte].ubRl) - { - usBytePos = (j << 3); -@@ -1114,7 +1184,7 @@ - out_buf = out_buf + lTmp; - lScanSize += lTmp; - } -- // complex pattern -+ /* complex pattern*/ - else - { - for (k = 0; k < 2; k++) -@@ -1124,7 +1194,7 @@ - switch (ubTemp) - { - case 0x00: -- // 1 0 -+ /* 1 0*/ - if (ubPreBit) - { - lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth); -@@ -1134,16 +1204,16 @@ - us1Count = 0; - usDy = 0; - } -- // 0 0 -+ /* 0 0*/ - break; - - case 0x0f: -- // 1 1 -+ /* 1 1*/ - if (ubPreBit) - { - us1Count += 4; - } -- // 0 1 -+ /* 0 1*/ - else - { - us1Count = 4; -@@ -1152,7 +1222,7 @@ - break; - - case 0x05: -- // 1 0101 -+ /* 1 0101*/ - if (ubPreBit) - { - lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth); -@@ -1162,13 +1232,13 @@ - usPosX10 = usBytePos - us1Count; - usDy = 0; - } -- // 0 0101 -+ /* 0 0101*/ - usPosX01 = usBytePos + 1; - lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, usDy, usPosX10, usPosX01, usWidth); - out_buf = out_buf + lTmp; - lScanSize += lTmp; - -- // next -+ /* next*/ - usPosX10 = 0; - usPosX01 = 2; - usDy = 0; -@@ -1176,12 +1246,12 @@ - break; - - case 0x09: -- // 1 1001 -+ /* 1 1001*/ - if (ubPreBit) - { - us1Count++; - } -- // 0 1001 -+ /* 0 1001*/ - else - { - usPosX01 = usBytePos; -@@ -1191,7 +1261,7 @@ - out_buf = out_buf + lTmp; - lScanSize += lTmp; - -- // next -+ /* next*/ - if (ubPreBit) - { - usPosX10 = usBytePos - us1Count + 1; -@@ -1207,12 +1277,12 @@ - break; - - case 0x0a: -- // 1 1010 -+ /* 1 1010*/ - if (ubPreBit) - { - us1Count++; - } -- // 0 1010 -+ /* 0 1010*/ - else - { - us1Count = 1; -@@ -1222,25 +1292,25 @@ - out_buf = out_buf + lTmp; - lScanSize += lTmp; - -- // next -+ /* next*/ - usPosX10 = usBytePos - us1Count + 1; - usPosX01 = usBytePos + 2; - lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, 0, usPosX10, usPosX01, usWidth); - out_buf = out_buf + lTmp; - lScanSize += lTmp; -- // next -+ /* next*/ - usPosX10 = usBytePos + 2; - usDy = 0; - us1Count = 0; - break; - - case 0x0b: -- // 1 1011 -+ /* 1 1011*/ - if (ubPreBit) - { - us1Count++; - } -- // 0 1011 -+ /* 0 1011*/ - else - { - us1Count = 1; -@@ -1250,7 +1320,7 @@ - out_buf = out_buf + lTmp; - lScanSize += lTmp; - -- // next -+ /* next*/ - if (ubPreBit) - { - usPosX10 = usBytePos - us1Count + 1; -@@ -1267,12 +1337,12 @@ - break; - - case 0x0d: -- // 1 1101 -+ /* 1 1101*/ - if (ubPreBit) - { - us1Count += 2; - } -- // 0 1101 -+ /* 0 1101*/ - else - { - us1Count = 2; -@@ -1282,7 +1352,7 @@ - out_buf = out_buf + lTmp; - lScanSize += lTmp; - -- // next -+ /* next*/ - if (ubPreBit) - { - usPosX10 = usBytePos - us1Count + 2; -@@ -1298,17 +1368,17 @@ - break; - - default: -- // X X 1 X -+ /* X X 1 X*/ - lTmp = GetSimpleScan(out_buf, ubSizeMode, &us1Count, &usDy, &usPosX10, &usPosX01, usBytePos, ubTemp, 4, ubPreBit, usWidth); - out_buf = out_buf + lTmp; - lScanSize += lTmp; - break; -- } // end of switch() -+ } /* end of switch()*/ - ubPreBit = ubTemp & 0x01; -- } // end of k-loop -+ } /* end of k-loop*/ - } - break; -- } // end of switch() -+ } /* end of switch()*/ - - ubPreBit = ubCrtByte & 0x01; - } /*for usWidth */ -@@ -1326,7 +1396,7 @@ - } - usDy++; - -- // check size over -+ /* check size over*/ - if ( (i % 5) == 4 ) - { - lCrtSize = (long)((long)usWidth * (long)(i + 1)); -@@ -1342,7 +1412,7 @@ - lScanSize = -1; - } - return(lScanSize); --} // end of scan_map() -+} /* end of scan_map() */ - - /***************************************************************** - * H : bmp2run -@@ -1362,7 +1432,7 @@ - unsigned char *tmp_buf1, *tmp_buf2; - long scan_size; - -- //return(-1); // 19990323 by bglee - request from SM Lee -+ /*return(-1);*/ /* 19990323 by bglee - request from SM Lee*/ - - tmp_buf1 = in_buf; - tmp_buf2 = out_buf; -@@ -1372,7 +1442,7 @@ - return(-1); - } - -- if ( !(ubMode & 0x02) ) // real compression //--- -+ if ( !(ubMode & 0x02) ) /* real compression */ - { - out_buf = tmp_buf2 + scan_size; - *out_buf++ = 0x00; -@@ -1385,7 +1455,7 @@ - scan_size += 2; - } - } -- else // pre-compression -+ else /* pre-compression*/ - { - scan_size += 2; - if (scan_size % 4) diff --git a/print/ghostscript-afpl/files/patch-src:gdevhl12.c b/print/ghostscript-afpl/files/patch-src:gdevhl12.c deleted file mode 100644 index 45c0472a983d..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevhl12.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gdevhl12.c.orig Wed Mar 28 14:10:35 2007 -+++ src/gdevhl12.c Wed Mar 28 14:13:21 2007 -@@ -472,7 +472,7 @@ - for (y = ytop; y < ybottom; y++) { - if (hl1250_compress_line(s, y)) - continue; --#if 1 -+#if 0 - /* XXX - please report if you ever see this, then change to #if 0 */ - fprintf(stderr, - "hl1250: compression failed (y=%u), doing 1200x300 dpi\n", diff --git a/print/ghostscript-afpl/files/patch-src:gdevl256.c b/print/ghostscript-afpl/files/patch-src:gdevl256.c deleted file mode 100644 index 3102abf74716..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevl256.c +++ /dev/null @@ -1,17 +0,0 @@ ---- src/gdevl256.c.orig Fri Feb 22 07:24:51 2002 -+++ src/gdevl256.c Tue May 20 03:08:15 2003 -@@ -147,10 +147,12 @@ - /* for compatibility with the older display modes: */ - /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */ - gx_color_index --lvga256_map_rgb_color(gx_device * dev, gx_color_value r, gx_color_value g, -- gx_color_value b) -+lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[]) - { - #define cv_bits(v,n) (v >> (gx_color_value_bits - n)) -+ gx_color_value r = cv[0]; -+ gx_color_value g = cv[1]; -+ gx_color_value b = cv[2]; - ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5); - static const byte cube_bits[32] = - {0, 128, 128, 128, 128, 128, 128, 128, 128, 128, diff --git a/print/ghostscript-afpl/files/patch-src:gdevlbp8.c b/print/ghostscript-afpl/files/patch-src:gdevlbp8.c deleted file mode 100644 index 052492c58f6a..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevlbp8.c +++ /dev/null @@ -1,70 +0,0 @@ ---- src/gdevlbp8.c.orig Wed Aug 1 09:48:23 2001 -+++ src/gdevlbp8.c Thu Mar 14 20:56:05 2002 -@@ -22,6 +22,8 @@ - - /* - Modifications: -+ 3.10.00 Johnny Lam -+ Removed LIPS III code, as it's obsoleted by gdevlips driver. - 2.2.97 Lauri Paatero - Changed CSI command into ESC [. DCS commands may still need to be changed - (to ESC P). -@@ -49,7 +51,6 @@ - - /* The device descriptors */ - private dev_proc_print_page(lbp8_print_page); --private dev_proc_print_page(lips3_print_page); - - const gx_device_printer far_data gs_lbp8_device = - prn_device(prn_std_procs, "lbp8", -@@ -58,14 +59,6 @@ - 0.16, 0.2, 0.32, 0.21, /* margins: left, bottom, right, top */ - 1, lbp8_print_page); - --const gx_device_printer far_data gs_lips3_device = -- prn_device(prn_std_procs, "lips3", -- 82, /* width_10ths, 8.3" */ -- 117, /* height_10ths, 11.7" */ -- X_DPI, Y_DPI, -- 0.16, 0.27, 0.23, 0.27, /* margins */ -- 1, lips3_print_page); -- - /* ------ Internal routines ------ */ - - #define ESC 0x1b -@@ -84,23 +77,6 @@ - - static const char *lbp8_end = NULL; - --static const char lips3_init[] = { -- ESC, '<', /* soft reset */ -- DCS, '0', 'J', ST, /* JOB END */ -- DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */ -- ESC, '<', /* soft reset */ -- DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST, /* Printing (gs) display */ -- ESC, '[', '?', '1', 'l', /* auto cr-lf disable */ -- ESC, '[', '?', '2', 'h', /* auto ff disable */ -- ESC, '[', '1', '1', 'h', /* set mode */ -- ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/ -- ESC, '[', 'f' /* move to home position */ --}; -- --static const char lips3_end[] = { -- DCS, '0', 'J', ST /* JOB END */ --}; -- - /* Send the page to the printer. */ - private int - can_print_page(gx_device_printer *pdev, FILE *prn_stream, -@@ -203,11 +179,4 @@ - lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream) - { return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init), - lbp8_end, sizeof(lbp8_end)); --} -- --/* Print a LIPS III page. */ --private int --lips3_print_page(gx_device_printer *pdev, FILE *prn_stream) --{ return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init), -- lips3_end, sizeof(lips3_end)); - } diff --git a/print/ghostscript-afpl/files/patch-src:gdevlx50.c b/print/ghostscript-afpl/files/patch-src:gdevlx50.c deleted file mode 100644 index b762afcec85d..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevlx50.c +++ /dev/null @@ -1,62 +0,0 @@ ---- src/gdevlx50.c.orig Fri Dec 17 19:31:43 2004 -+++ src/gdevlx50.c Fri Dec 17 22:31:26 2004 -@@ -1120,18 +1120,18 @@ - - /* Allocate a buffer for a single scan line */ - lineBuffer = (byte *)gs_alloc_byte_array -- ( &gs_memory_default, lx5000dev->scanLineBytes, 1, -+ ( lx5000dev->memory, lx5000dev->scanLineBytes, 1, - "lx5000_print_page(lineBuffer)" ); - - swipeBuf = (byte *)gs_alloc_byte_array -- ( &gs_memory_default, lx5000dev->swipeBufSize, 1, -+ ( lx5000dev->memory, lx5000dev->swipeBufSize, 1, - "lx5000_print_page(swipeBuf)" ); - - for ( colour = 0 ; colour < numColours; colour++ ) - { - if ( ( colourBufs[colour] = - (byte *)gs_alloc_byte_array -- ( &gs_memory_default, lx5000dev->penBufSize, 1, -+ ( lx5000dev->memory, lx5000dev->penBufSize, 1, - "lx5000_print_page(colourBufs)" - ) - ) == NULL ) -@@ -1172,19 +1172,19 @@ - for ( colour = 0; colour < numColours; colour++ ) - { - if ( colourBufs[colour] != NULL ) -- gs_free_object( &gs_memory_default, -+ gs_free_object( lx5000dev->memory, - (char *)colourBufs[colour], - "lx5000_print_page(colourBufs)" ); - colourBufs[ colour ] = NULL; - colourBufPtrs[ colour ] = NULL; - } - if ( swipeBuf != NULL ) -- gs_free_object( &gs_memory_default, -+ gs_free_object( lx5000dev->memory, - (char *)swipeBuf, "lx5000_print_page(swipeBuf)" ); - swipeBuf = NULL; - *swipeBufPtr = NULL; - if ( lineBuffer != NULL ) -- gs_free_object( &gs_memory_default, -+ gs_free_object( lx5000dev->memory, - (char *)lineBuffer, "lx5000_print_page(lineBuffer)" ); - lineBuffer = NULL; - *lineBufferPtr = NULL; -@@ -2603,9 +2603,12 @@ - - /* Map CMYK to color. */ - private gx_color_index --lx5000_map_cmyk_color(gx_device * dev, gx_color_value cyan, -- gx_color_value magenta, gx_color_value yellow, gx_color_value black) -+lx5000_map_cmyk_color(gx_device * dev, const gx_color_value cv[]) - { -+ gx_color_value cyan = cv[0]; -+ gx_color_value magenta = cv[1]; -+ gx_color_value yellow = cv[2]; -+ gx_color_value black = cv[3]; - int bpc = dev->color_info.depth / 4; - int drop = sizeof(gx_color_value) * 8 - bpc; - gx_color_index color = diff --git a/print/ghostscript-afpl/files/patch-src:gdevperm.c b/print/ghostscript-afpl/files/patch-src:gdevperm.c deleted file mode 100644 index da5d52ceedf8..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevperm.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/gdevperm.c.orig Fri Jun 18 16:00:47 2004 -+++ src/gdevperm.c Fri Dec 31 18:06:42 2004 -@@ -289,7 +289,7 @@ - (strncmp((const char *)name, (const char *)str, name_size) == 0)) - - private int --perm_get_color_comp_index(const gx_device *pdev, const char *pname, -+perm_get_color_comp_index(gx_device *pdev, const char *pname, - int name_size, int component_type) - { - const gx_device_perm_t * const dev = (const gx_device_perm_t *)pdev; diff --git a/print/ghostscript-afpl/files/patch-src:gdevvglb.c b/print/ghostscript-afpl/files/patch-src:gdevvglb.c deleted file mode 100644 index b21032ce8779..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gdevvglb.c +++ /dev/null @@ -1,18 +0,0 @@ ---- src/gdevvglb.c.orig Fri Feb 22 07:24:52 2002 -+++ src/gdevvglb.c Tue May 20 23:57:29 2003 -@@ -152,10 +152,12 @@ - } - - private gx_color_index --vgalib_map_rgb_color(gx_device * dev, gx_color_value red, -- gx_color_value green, gx_color_value blue) -+vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[]) - { -- return pc_4bit_map_rgb_color(dev, red, green, blue); -+ gx_color_value red = cv[0]; -+ gx_color_value green = cv[1]; -+ gx_color_value blue = cv[2]; -+ return pc_4bit_map_rgb_color(dev, cv); - } - - private int diff --git a/print/ghostscript-afpl/files/patch-src:gxobj.h b/print/ghostscript-afpl/files/patch-src:gxobj.h deleted file mode 100644 index 8b533b37d4d8..000000000000 --- a/print/ghostscript-afpl/files/patch-src:gxobj.h +++ /dev/null @@ -1,17 +0,0 @@ ---- src/gxobj.h.orig Tue Mar 14 01:18:19 2006 -+++ src/gxobj.h Sat May 27 14:48:20 2006 -@@ -109,10 +109,14 @@ - * required by the hardware, regardless of the value of obj_align_mod. - * See gsmemraw.h for more information about this. - */ -+#if !defined(__ia64__) && !defined(__amd64__) - #define obj_align_mod\ - (((ARCH_ALIGN_MEMORY_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 diff --git a/print/ghostscript-afpl/files/patch-src:smartgdi-contrib.mak b/print/ghostscript-afpl/files/patch-src:smartgdi-contrib.mak deleted file mode 100644 index 3b832daff662..000000000000 --- a/print/ghostscript-afpl/files/patch-src:smartgdi-contrib.mak +++ /dev/null @@ -1,16 +0,0 @@ ---- src/smartgdi-contrib.mak.orig Wed Jun 19 21:43:43 2002 -+++ src/smartgdi-contrib.mak Mon Jul 21 13:59:00 2003 -@@ -3,10 +3,12 @@ - ### Note : this driver is used by Samsung SmartGDI compatible printers. ### - ### - -+gdi_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR) -+ - GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL) - - $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev - $(SETPDEV) $(DD)gdi $(GDIMONO) - - $(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) -- $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c -+ $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(gdi_opts) $(GLSRC)gdevgdi.c diff --git a/print/ghostscript-afpl/files/patch-src:unix-dll.mak b/print/ghostscript-afpl/files/patch-src:unix-dll.mak deleted file mode 100644 index dbecfe241c4d..000000000000 --- a/print/ghostscript-afpl/files/patch-src:unix-dll.mak +++ /dev/null @@ -1,60 +0,0 @@ ---- src/unix-dll.mak.orig Wed Sep 24 22:41:20 2003 -+++ src/unix-dll.mak Wed Dec 10 19:25:49 2003 -@@ -46,11 +46,9 @@ - - # shared library - GS_SONAME=lib$(GS).so --GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR) --GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR) -+GS_SONAME_MAJOR=$(GS_SONAME).$(GS_SHLIB_VER) - GS_SO=$(BINDIR)/$(GS_SONAME) --GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR) --GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR) -+GS_SO_MAJOR=$(GS_SO).$(GS_SHLIB_VER) - - # Shared object is built by redefining GS_XE in a recursive make. - -@@ -58,24 +56,20 @@ - - $(GS_SO): $(GS_SO_MAJOR) - $(RM_) $(GS_SO) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO) -- --$(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR) -- $(RM_) $(GS_SO_MAJOR) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR) -+ ln -s $(GS_SONAME_MAJOR) $(GS_SO) - - # Build the small Ghostscript loaders, with Gtk+ and without - - $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c -- $(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs` -+ $(GLCC) `pkg-config --cflags gtk+` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `pkg-config --libs gtk+` - - $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c -- $(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) -+ $(GLCC) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS) - - # ------------------------- Recursive make targets ------------------------- # - --SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname=$(GS_SONAME_MAJOR)'\ -- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\ -+SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\ -+ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\ - STDIO_IMPLEMENTATION=c\ - DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\ - BINDIR=$(BINDIR)/$(SOBINRELDIR)\ -@@ -104,11 +98,9 @@ - -mkdir -p $(libdir) - $(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME) - $(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME) -- $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR) -+ $(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR) - $(RM_) $(libdir)/$(GS_SONAME) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME) -- $(RM_) $(libdir)/$(GS_SONAME_MAJOR) -- ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR) -+ ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME) - - soinstall: install-so install-scripts install-data - diff --git a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak b/print/ghostscript-afpl/files/patch-src:unix-gcc.mak deleted file mode 100644 index 7150b97c39e3..000000000000 --- a/print/ghostscript-afpl/files/patch-src:unix-gcc.mak +++ /dev/null @@ -1,170 +0,0 @@ ---- src/unix-gcc.mak.orig Thu May 11 06:54:27 2006 -+++ src/unix-gcc.mak Sat May 27 16:23:26 2006 -@@ -21,14 +21,15 @@ - # source, generated intermediate file, and object directories - # for the graphics library (GL) and the PostScript/PDF interpreter (PS). - --BINDIR=./bin --GLSRCDIR=./src --GLGENDIR=./obj --GLOBJDIR=./obj --PSSRCDIR=./src --PSLIBDIR=./lib --PSGENDIR=./obj --PSOBJDIR=./obj -+.CURDIR?=. -+BINDIR=${.CURDIR}/bin -+GLSRCDIR=${.CURDIR}/src -+GLGENDIR=${.CURDIR}/obj -+GLOBJDIR=${.CURDIR}/obj -+PSSRCDIR=${.CURDIR}/src -+PSLIBDIR=${.CURDIR}/lib -+PSGENDIR=${.CURDIR}/obj -+PSOBJDIR=${.CURDIR}/obj - - # Do not edit the next group of lines. - -@@ -47,11 +48,10 @@ - # the directories also define the default search path for the - # initialization files (gs_*.ps) and the fonts. - --INSTALL = $(GLSRCDIR)/instcopy -c --INSTALL_PROGRAM = $(INSTALL) -m 755 --INSTALL_DATA = $(INSTALL) -m 644 -+INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT} -+INSTALL_DATA = ${BSD_INSTALL_DATA} - --prefix = /usr/local -+prefix = ${PREFIX} - exec_prefix = $(prefix) - bindir = $(exec_prefix)/bin - scriptdir = $(bindir) -@@ -142,7 +142,7 @@ - # some older JPEG streams that violate the standard. If the JPEG - # library built from local sources, the patch will be applied. - --SHARE_JPEG=0 -+SHARE_JPEG=1 - JPEG_NAME=jpeg - - # Define the directory where the PNG library sources are stored, -@@ -157,7 +157,7 @@ - # what its name is. - # See gs.mak and Make.htm for more information. - --SHARE_LIBPNG=0 -+SHARE_LIBPNG=1 - LIBPNG_NAME=png - - # Define the directory where the zlib sources are stored. -@@ -169,7 +169,7 @@ - # what its name is (usually libz, but sometimes libgz). - # See gs.mak and Make.htm for more information. - --SHARE_ZLIB=0 -+SHARE_ZLIB=1 - #ZLIB_NAME=gz - ZLIB_NAME=z - -@@ -178,6 +178,13 @@ - JBIG2_LIB=jbig2dec - JBIG2SRCDIR=jbig2dec - -+# Choose the library to use for (JPXDecode support) -+# whether to link to an external build or compile in from source -+# and source location and configuration flags for compiling in -+JPX_LIB=jasper -+SHARE_JPX=1 -+JPX_CFLAGS=-DJAS_CONFIGURE -+ - # Define the directory where the icclib source are stored. - # See icclib.mak for more information - -@@ -201,7 +208,7 @@ - - # Define the name of the C compiler. - --CC=gcc -+CC?=cc - - # Define the name of the linker for the final link step. - # Normally this is the same as the C compiler. -@@ -218,9 +225,9 @@ - # Define the added flags for standard, debugging, profiling - # and shared object builds. - --CFLAGS_STANDARD=-O2 --CFLAGS_DEBUG=-g -O0 --CFLAGS_PROFILE=-pg -O2 -+CFLAGS_STANDARD?=-O2 -+CFLAGS_DEBUG=-g -+CFLAGS_PROFILE=-pg - CFLAGS_SO=-fPIC - - # Define the other compilation flags. Add at most one of the following: -@@ -234,7 +241,7 @@ - # We don't include -ansi, because this gets in the way of the platform- - # specific stuff that <math.h> typically needs; nevertheless, we expect - # gcc to accept ANSI-style function prototypes and function definitions. --XCFLAGS= -+XCFLAGS+=-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include - - CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) - -@@ -245,7 +252,7 @@ - # -R /usr/local/xxx/lib:/usr/local/lib - # giving the full path names of the shared library directories. - # XLDFLAGS can be set from the command line. --XLDFLAGS= -+XLDFLAGS=-L${LOCALBASE}/lib - - LDFLAGS=$(XLDFLAGS) - -@@ -278,7 +285,7 @@ - # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, - # not in $(XINCLUDE). - --XINCLUDE=-I/usr/X11R6/include -+XINCLUDE=-I${X11BASE}/include - - # Define the directory/ies and library names for the X11 library files. - # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH -@@ -290,12 +297,12 @@ - # Solaris and other SVR4 systems with dynamic linking probably want - #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib - # X11R6 (on any platform) may need --#XLIBS=Xt SM ICE Xext X11 -+XLIBS=Xt SM ICE Xext X11 - - #XLIBDIRS=-L/usr/local/X/lib --XLIBDIRS=-L/usr/X11R6/lib -+XLIBDIRS=-L${X11BASE}/lib - XLIBDIR= --XLIBS=Xt Xext X11 -+#XLIBS=Xt Xext X11 - - # Define whether this platform has floating point hardware: - # FPU_TYPE=2 means floating point is faster than fixed point. -@@ -322,10 +329,10 @@ - - # Choose the language feature(s) to include. See gs.mak for details. - --FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev -+FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev - #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev - # The following is strictly for testing. --FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev -+FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev $(GLD)romfs.dev $(PSD)jbig2.dev $(PSD)jpx.dev - #FEATURE_DEVS=$(FEATURE_DEVS_ALL) - - # The list of resources to be included in the %rom% file system. -@@ -450,6 +457,9 @@ - include $(GLSRCDIR)/zlib.mak - include $(GLSRCDIR)/libpng.mak - include $(GLSRCDIR)/jbig2.mak -+include $(GLSRCDIR)/jasper.mak -+include $(GLSRCDIR)/ldf_jb2.mak -+include $(GLSRCDIR)/lwf_jp2.mak - include $(GLSRCDIR)/icclib.mak - include $(GLSRCDIR)/ijs.mak - include $(GLSRCDIR)/devs.mak diff --git a/print/ghostscript-afpl/files/patch-src_cpca_mk_cmd.c b/print/ghostscript-afpl/files/patch-src_cpca_mk_cmd.c deleted file mode 100644 index e7f1f9221946..000000000000 --- a/print/ghostscript-afpl/files/patch-src_cpca_mk_cmd.c +++ /dev/null @@ -1,270 +0,0 @@ ---- src/cpca_mk_cmd.c.orig Wed Mar 15 15:00:26 2006 -+++ src/cpca_mk_cmd.c Wed Mar 15 15:33:26 2006 -@@ -586,6 +586,7 @@ - Ptr data ; - short size ; - Ptr work ; -+ short *swork ; - unsigned long comSize = 0 ; - - if (p && str) { -@@ -594,7 +595,9 @@ - if (data) { - work = data ; - -- *( ( short *)work )++ = id_val_code_set_Shift_JIS ; -+ swork = (short *)work ; -+ *swork++ = id_val_code_set_Shift_JIS ; -+ work = (Ptr)swork ; - memcpy( work, str, (unsigned char)str[ 0 ] + 1 ) ; - comSize = glue_cpcaSetJob( p, - Attribute, -@@ -867,6 +870,7 @@ - short size ; - Ptr data ; - Ptr work ; -+ unsigned short *uswork ; - unsigned long comSize = 0 ; - - if (p) { -@@ -877,8 +881,10 @@ - - *work++ = id_val_resolution_type_dpi ; - -- *( ( unsigned short *)work )++ = resolutionX ; -- *( ( unsigned short *)work )++ = resolutionY ; -+ uswork = (unsigned short *)work ; -+ *uswork++ = resolutionX ; -+ *uswork++ = resolutionY ; -+ work = (Ptr)uswork ; - - comSize = glue_cpcaSetDocument ( p, - id_att_resolution, -@@ -1597,6 +1603,8 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaHANDLE *cpcaHANDLEp ; -+ cpcaUBYTE *cpcaUBYTEp ; - - - z_setUserInfo( userInfo, &userID, &password ) ; -@@ -1616,9 +1624,14 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaHANDLE *)p )++ = inParam->Object1 ; -- *( ( cpcaUBYTE *)p )++ = inParam->Mode ; -- *( ( cpcaHANDLE *)p )++ = inParam->Object2 ; -+ cpcaHANDLEp = (cpcaHANDLE *)p ; -+ *cpcaHANDLEp++ = inParam->Object1 ; -+ cpcaUBYTEp = (cpcaUBYTE *)cpcaHANDLEp ; -+ *cpcaUBYTEp++ = inParam->Mode ; -+ cpcaHANDLEp = (cpcaHANDLE *)cpcaUBYTEp ; -+ *cpcaHANDLEp++ = inParam->Object2 ; -+ p = (Ptr)cpcaHANDLEp ; -+ - comSize += 9; - - return comSize ; -@@ -1644,7 +1657,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -- -+ cpcaATTRIB *cpcaATTRIBp; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = 2 + inParam->Size ; -@@ -1661,7 +1674,9 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ; -+ cpcaATTRIBp = (cpcaATTRIB *)p ; -+ *cpcaATTRIBp++ = inParam->Attribute ; -+ p = (Ptr)cpcaATTRIBp ; - if ( inParam->Data && ( inParam->Size > 0 ) ) - { - memcpy( p, inParam->Data, inParam->Size ) ; -@@ -1687,6 +1702,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaHANDLE *cpcaHANDLEp ; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = sizeof( cpcaHANDLE ) ; -@@ -1703,7 +1719,10 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaHANDLE *)p )++ = inParam->Object ; -+ cpcaHANDLEp = (cpcaHANDLE *)p ; -+ *cpcaHANDLEp++ = inParam->Object ; -+ p = (Ptr)cpcaHANDLEp ; -+ - comSize += paramSize ; - - return comSize ; -@@ -1723,6 +1742,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaATTRIB *cpcaATTRIBp; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = sizeof( cpcaATTRIB ) + inParam->Size ; -@@ -1739,7 +1759,9 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ; -+ cpcaATTRIBp = (cpcaATTRIB *)p; -+ *cpcaATTRIBp++ = inParam->Attribute ; -+ p = (Ptr)cpcaATTRIBp ; - if ( inParam->Data && ( inParam->Size > 0 ) ) - { - memcpy( p, inParam->Data, inParam->Size ) ; -@@ -1764,22 +1786,27 @@ - short comSize ; - Ptr work ; - char BindName; -+ unsigned char *ucwork ; - - work = p ; - - /* ¥Ó¥ó¥¨¥¤¥ê¥¢¥¹¤ÎÀßÄê */ -- *( ( unsigned char *)work )++ = bindInfo; -+ ucwork = (unsigned char *)work ; -+ *ucwork++ = bindInfo; - /* ¥Ó¥óÈÖ¹æ¤ÎÀßÄê¡á¤Ê¤·¡Ê£°¤ò»ØÄê) */ -- *( ( unsigned char *)work )++ = bindNum ; -+ *ucwork++ = bindNum ; - /* ¥Ó¥ó̾¾Î»ØÄê */ - /* nullʸ»úÎó»ØÄê */ - BindName = 0; -+ work = (Ptr)ucwork ; - - memcpy( ( StringPtr )work, &BindName, 1 ) ; - work += 1 ; - /* ³«»Ï¥Ó¥ó¡¢½ªÎ»¥Ó¥ó»ØÄê */ -- *( ( unsigned char *)work )++ = 0 ; -- *( ( unsigned char *)work )++ = 0 ; -+ ucwork = (unsigned char *)work ; -+ *ucwork++ = 0 ; -+ *ucwork++ = 0 ; -+ work = (Ptr)ucwork ; - /* ¥µ¥¤¥º¤Î¼èÆÀ */ - comSize = work - p ; - -@@ -1803,19 +1830,24 @@ - Ptr work ; - char count; - char str_count; -+ unsigned char *ucwork ; -+ unsigned short *uswork ; - - work = p ; - count = 1; - str_count = 1; - - /* Type:¥Õ¥£¥Ë¥Ã¥·¥ó¥°ÊýË¡¤ÎÀßÄê */ -- *( ( unsigned char *)work )++ = str_count; -+ ucwork = (unsigned char *)work ; -+ *ucwork++ = str_count; - /* Type:¥Õ¥£¥Ë¥Ã¥·¥ó¥°ÊýË¡¤ÎÀßÄê */ -- *( ( unsigned char *)work )++ = id_val_finishing_type_staple_stitching; -+ *ucwork++ = id_val_finishing_type_staple_stitching; - /* Count:¥Õ¥£¥Ë¥Ã¥·¥ó¥°¤ò¹Ô¤¦¸Ä¿ô */ -- *( ( unsigned char *)work )++ = count ; -+ *ucwork++ = count ; - /* Locate:¥Õ¥£¥Ë¥Ã¥·¥ó¥°¤ò¹Ô¤¦²Õ½ê */ -- *( ( unsigned short *)work )++ = staple_val; -+ uswork = (unsigned short *)ucwork ; -+ *uswork++ = staple_val; -+ work = (Ptr)uswork ; - /* ¥µ¥¤¥º¤Î¼èÆÀ */ - comSize = work - p ; - -@@ -1839,6 +1871,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaHANDLE *cpcaHANDLEp ; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = 4 ; -@@ -1855,7 +1888,9 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaHANDLE *)p )++ = inParam->Object ; -+ cpcaHANDLEp = (cpcaHANDLE *)p ; -+ *cpcaHANDLEp++ = inParam->Object ; -+ p = (Ptr)cpcaHANDLEp ; - comSize += paramSize ; - - return comSize ; -@@ -1876,7 +1911,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -- -+ cpcaATTRIB *cpcaATTRIBp ; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = 2 + inParam->Size ; -@@ -1893,7 +1928,9 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaATTRIB *)p )++ = inParam->Attribute ; -+ cpcaATTRIBp = (cpcaATTRIB *)p ; -+ *cpcaATTRIBp++ = inParam->Attribute ; -+ p = (Ptr)cpcaATTRIBp ; - if ( inParam->Data && ( inParam->Size > 0 ) ) - { - memcpy( p, inParam->Data, inParam->Size ) ; -@@ -1918,6 +1955,8 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaHANDLE *cpcaHANDLEp ; -+ cpcaUSHORT *cpcaUSHORTp ; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = 6 + inParam->Size ; -@@ -1934,8 +1973,11 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaHANDLE *)p )++ = inParam->Object ; -- *( ( cpcaUSHORT *)p )++ = inParam->Method ; -+ cpcaHANDLEp = (cpcaHANDLE *)p ; -+ *cpcaHANDLEp++ = inParam->Object ; -+ cpcaUSHORTp = (cpcaUSHORT *)cpcaHANDLEp ; -+ *cpcaUSHORTp++ = inParam->Method ; -+ p = (Ptr)cpcaUSHORTp ; - if ( inParam->Data && ( inParam->Size > 0 ) ) - { - memcpy( p, inParam->Data, inParam->Size ) ; -@@ -2075,6 +2117,7 @@ - short paramSize ; - unsigned long userID ; - unsigned long password ; -+ cpcaUBYTE *cpcaUBYTEp ; - - z_setUserInfo( userInfo, &userID, &password ) ; - paramSize = 1 ; -@@ -2091,7 +2134,9 @@ - p += comSize ; - - /* ¸Çͥѥé¥á¡¼¥¿¤ÎÀßÄê */ -- *( ( cpcaUBYTE *)p )++ = inParam->Code ; -+ cpcaUBYTEp = (cpcaUBYTE *)p ; -+ *cpcaUBYTEp++ = inParam->Code ; -+ p = (Ptr)cpcaUBYTEp ; - comSize += paramSize ; - - return comSize ; diff --git a/print/ghostscript-afpl/files/stc740ih.upp b/print/ghostscript-afpl/files/stc740ih.upp deleted file mode 100644 index bb9805f55fb8..000000000000 --- a/print/ghostscript-afpl/files/stc740ih.upp +++ /dev/null @@ -1,60 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $ -# --supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/FSCMYK32 --dupOutputFormat=/EscP2XY --r1440x720 --dupMargins="{ 9.0 39.96 9.0 9.0}" --dupBlackTransfer="{ - 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020 - 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980 - 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000 -}" --dupCyanTransfer="{ - 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020 - 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980 - 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000 -}" --dupMagentaTransfer="{ - 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020 - 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980 - 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000 -}" --dupYellowTransfer="{ - 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020 - 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980 - 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000 -}" --dupOutputComponentOrder="{ 1 2 3 0 }" --dupWeaveXPasses=2 --dupOutputXStep=2 --dupWeaveYPasses=6 --dupOutputPins=46 --dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}" --dupWeaveXStarts="{0 1 0 1 0 1 1 0 1 0 1 0}" --dupWeaveYOffset=50 --dupWeaveInitialYFeeds="{ 5 5 5 5 5 5 5 5 5 5 5 23}" --dupWeaveInitialXStarts="{0 1 0 1 0 1 1 0 1 0 1 0}" --dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}" --dupFormatYabsolute --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2855 0100 05 - 1b2873 0100 02 - 1b5501 - 1b2865 0200 0001 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupAdjustTopMarginCommand --dupAdjustBottomMarginCommand --dupXStepCommand="<1b285c 0400 a005 0100 0000>" --dupEndPageCommand="(\033@\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/files/stc740p.upp b/print/ghostscript-afpl/files/stc740p.upp deleted file mode 100644 index a4e7f5441793..000000000000 --- a/print/ghostscript-afpl/files/stc740p.upp +++ /dev/null @@ -1,36 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $ -# --supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/FSCMYK32 --dupOutputFormat=/EscP2 --r720x720 --dupMargins="{ 9.0 39.96 9.0 9.0}" --dupBlackTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }" --dupCyanTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }" --dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }" --dupYellowTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }" --dupOutputComponentOrder="{ 1 2 3 0 }" --dupWeaveYPasses=6 --dupOutputPins=48 --dupWeaveYFeeds="{47 47 47 53 47 47}" --dupWeaveInitialYFeeds="{1 1 1 1 1 43}" --dupWeaveInitialPins="{ 8 48 40 31 23 15}" --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2855 0100 05 - 1b5500 - 1b2865 0200 0002 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupAdjustTopMarginCommand --dupAdjustBottomMarginCommand --dupEndPageCommand="(\033@\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/files/stc740pl.upp b/print/ghostscript-afpl/files/stc740pl.upp deleted file mode 100644 index b2fdb0dbbc06..000000000000 --- a/print/ghostscript-afpl/files/stc740pl.upp +++ /dev/null @@ -1,32 +0,0 @@ -# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $ -# --supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper" --sDEVICE=uniprint --dNOPAUSE --dSAFER --dupColorModel=/DeviceCMYKgenerate --dupRendering=/FSCMYK32 --dupOutputFormat=/EscP2 --r360x360 --dupMargins="{ 9.0 39.96 9.0 9.0}" --dupOutputComponentOrder="{ 1 2 3 0 }" --dupWeaveYPasses=3 --dupOutputPins=48 --dupWeaveYFeeds="{47 50 47}" --dupWeaveInitialYFeeds="{1 1 46}" --dupWeaveInitialPins="{ 16 48 32}" --dupBeginPageCommand="< - 1b40 1b40 - 1b2847 0100 01 - 1b2855 0100 0A - 1b5500 - 1b2865 0200 0002 - 1b2843 0200 0000 - 1b2863 0400 0000 0000 ->" --dupAdjustPageLengthCommand --dupAdjustTopMarginCommand --dupAdjustBottomMarginCommand --dupEndPageCommand="(\033@\014)" --dupAbortCommand="(\033@\15\12\12\12\12 Printout-Aborted\15\014)" - diff --git a/print/ghostscript-afpl/pkg-descr b/print/ghostscript-afpl/pkg-descr deleted file mode 100644 index e3d97f845b58..000000000000 --- a/print/ghostscript-afpl/pkg-descr +++ /dev/null @@ -1,20 +0,0 @@ -Ghostscript is the well-known PostScript interpreter which is available for -all common and most esoteric platforms and supports many different printers -and some displays. - -Versions entitled "AFPL Ghostscript" are distributed with a licence different -from the GPL. Read the file PUBLIC in the work/gsX.Y directory or in -${PREFIX}/share/ghostscript/X.Y/doc/PUBLIC after installation for details ! - -This port includes add-on packages (not part of the official gs release) - o HP8XX driver for HP DeskJet 880C/882C/895C - - http://www.gelhaus.net/hp880c/ - o DJ970 driver for HP DeskJet 970CXi - - http://www.harsch.net/Ghostscript/ghostscript.html - o Special drivers for verious printer models - - Alps, Canon, Epson, NEC, Lexmark, Ricoh,... - o Additional contributed uniprint driver profiles for - - Epson Stylus Color 740 and Epson LQ-1170 - -WWW: http://www.cs.wisc.edu/~ghost/doc/AFPL/index.htm - http://www.ghostscript.com/ diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist deleted file mode 100644 index ce95c5e213fe..000000000000 --- a/print/ghostscript-afpl/pkg-plist +++ /dev/null @@ -1,610 +0,0 @@ -@comment $FreeBSD$ -bin/bdftops -bin/dumphint -bin/dvipdf -bin/eps2eps -bin/ert -bin/fixmswrd.pl -bin/font2c -bin/gs -bin/gsbj -%%SHLIB%%bin/gsc -bin/gsdj -bin/gsdj500 -bin/gslj -bin/gslp -bin/gsnd -%%SHLIB%%bin/gsx -bin/lprsetup.sh -bin/pdf2dsc -bin/pdf2ps -bin/pdfopt -bin/pf2afm -bin/pfbtopfa -bin/printafm -bin/ps2ascii -bin/ps2epsi -bin/ps2pdf -bin/ps2pdf12 -bin/ps2pdf13 -bin/ps2pdf14 -bin/ps2pdfwr -bin/ps2ps -bin/pv.sh -bin/unix-lpr.sh -bin/wftopfa -%%SHLIB%%include/ghostscript/iapi.h -%%SHLIB%%include/ghostscript/ierrors.h -%%SHLIB%%lib/libgs.so -%%SHLIB%%lib/libgs.so.%%SHLIB_VER%% -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/alps/README.gdevalps -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/bj10v/gdev10v.jis -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ert.txt -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gdevepag.txt -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gsepagif.sh -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/psprint -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/gdi/README -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lips/Gdevlips.htm -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/README -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/md2k/README.jis -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/MJ700V2C.FAQ -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mjc -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mje -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.noz -%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/cpem.doc -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-RKSJ-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-RKSJ-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78ms-RKSJ-H -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-RKSJ-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Add-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-0 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-1 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-CNS1-2 -%%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-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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Adobe-Japan1-3 -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/EUC-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/EUC-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-RKSJ-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/Ext-V -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/GBKp-EUC-V -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKdlb-B5-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKgccs-B5-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm314-B5-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKm471-B5-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/HKscs-B5-H -%%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-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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/NWP-V -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF16-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF32-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF32-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF8-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniCNS-UTF8-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UCS2-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF16-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF16-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF32-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniGB-UTF32-V -%%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 -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UCS2-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF16-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF16-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF32-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF32-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF8-H -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF8-V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/V -%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/WP-Symbol -%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultCMYK -%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultGray -%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/DefaultRGB -%%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace/TrivialCMYK -%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Latin1 -%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding -%%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode -%%DATADIR%%/%%GS_VERSION%%/doc/API.htm -%%DATADIR%%/%%GS_VERSION%%/doc/C-style.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Changes.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Commprod.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Copying.htm -%%DATADIR%%/%%GS_VERSION%%/doc/DLL.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Deprecated.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Details.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Details8.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Develop.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Devices.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Drivers.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Fonts.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Helpers.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Hershey.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History1.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History2.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History3.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History4.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History5.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History6.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History7.htm -%%DATADIR%%/%%GS_VERSION%%/doc/History8.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Htmstyle.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Humor.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Install.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Issues.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Language.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Lib.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Maintain.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Make.htm -%%DATADIR%%/%%GS_VERSION%%/doc/News.htm -%%DATADIR%%/%%GS_VERSION%%/doc/PUBLIC -%%DATADIR%%/%%GS_VERSION%%/doc/Projects.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Ps-style.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Ps2epsi.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Ps2pdf.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Psfiles.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Public.htm -%%DATADIR%%/%%GS_VERSION%%/doc/README -%%DATADIR%%/%%GS_VERSION%%/doc/Readme.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Release.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Source.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Testing.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Unix-lpr.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Use.htm -%%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm -%%DATADIR%%/%%GS_VERSION%%/doc/gs.css -%%DATADIR%%/%%GS_VERSION%%/doc/index.html -%%DATADIR%%/%%GS_VERSION%%/examples/alphabet.ps -%%DATADIR%%/%%GS_VERSION%%/examples/annots.pdf -%%DATADIR%%/%%GS_VERSION%%/examples/chess.ps -%%DATADIR%%/%%GS_VERSION%%/examples/colorcir.ps -%%DATADIR%%/%%GS_VERSION%%/examples/doretree.ps -%%DATADIR%%/%%GS_VERSION%%/examples/escher.ps -%%DATADIR%%/%%GS_VERSION%%/examples/golfer.eps -%%DATADIR%%/%%GS_VERSION%%/examples/grayalph.ps -%%DATADIR%%/%%GS_VERSION%%/examples/ridt91.eps -%%DATADIR%%/%%GS_VERSION%%/examples/snowflak.ps -%%DATADIR%%/%%GS_VERSION%%/examples/tiger.eps -%%DATADIR%%/%%GS_VERSION%%/examples/vasarely.ps -%%DATADIR%%/%%GS_VERSION%%/examples/waterfal.ps -%%DATADIR%%/%%GS_VERSION%%/lib/FAPIcidfmap -%%DATADIR%%/%%GS_VERSION%%/lib/FAPIconfig -%%DATADIR%%/%%GS_VERSION%%/lib/FAPIfontmap -%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap -%%DATADIR%%/%%GS_VERSION%%/lib/Fontmap.GS -%%DATADIR%%/%%GS_VERSION%%/lib/acctest.ps -%%DATADIR%%/%%GS_VERSION%%/lib/addxchar.ps -%%DATADIR%%/%%GS_VERSION%%/lib/align.ps -%%DATADIR%%/%%GS_VERSION%%/lib/bdftops.ps -%%DATADIR%%/%%GS_VERSION%%/lib/bj8.rpd -%%DATADIR%%/%%GS_VERSION%%/lib/bj8gc12f.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bj8hg12f.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bj8oh06n.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bj8pa06n.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bj8pp12f.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bj8ts06n.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a0.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a1.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a2.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a3.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a4.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a5.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a6.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a7.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610a8.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b1.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b2.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b3.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b4.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b6.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b7.upp -%%DATADIR%%/%%GS_VERSION%%/lib/bjc610b8.upp -%%DATADIR%%/%%GS_VERSION%%/lib/caption.ps -%%DATADIR%%/%%GS_VERSION%%/lib/cbjc600.ppd -%%DATADIR%%/%%GS_VERSION%%/lib/cbjc800.ppd -%%DATADIR%%/%%GS_VERSION%%/lib/cdj550.upp -%%DATADIR%%/%%GS_VERSION%%/lib/cdj690.upp -%%DATADIR%%/%%GS_VERSION%%/lib/cdj690ec.upp -%%DATADIR%%/%%GS_VERSION%%/lib/cid2code.ps -%%DATADIR%%/%%GS_VERSION%%/lib/cidfmap -%%DATADIR%%/%%GS_VERSION%%/lib/decrypt.ps -%%DATADIR%%/%%GS_VERSION%%/lib/dnj750c.upp -%%DATADIR%%/%%GS_VERSION%%/lib/dnj750m.upp -%%DATADIR%%/%%GS_VERSION%%/lib/docie.ps -%%DATADIR%%/%%GS_VERSION%%/lib/dumphint.ps -%%DATADIR%%/%%GS_VERSION%%/lib/font2c.ps -%%DATADIR%%/%%GS_VERSION%%/lib/font2pcl.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ghostpdf.ppd -%%DATADIR%%/%%GS_VERSION%%/lib/gs_agl.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_btokn.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ccfnt.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ce_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cff.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidcm.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciddc.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidfm.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidfn.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cidtt.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciecs2.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ciecs3.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cmap.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cmdl.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_cspace.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_css_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dbt_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_devcs.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_devn.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_devpxl.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_diskf.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_diskn.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dpnxt.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps1.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dps2.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_dscp.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_epsf.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_fapi.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_fform.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_fntem.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_fonts.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_frsd.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_icc.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_il1_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_il2_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_img.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_indxd.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_init.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_kanji.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ksb_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_l.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_l.xpm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_l2img.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_l_m.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_lev2.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_lgo_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_lgx_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ll3.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_m.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_m.xpm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_m_m.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_mex_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_mgl_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_mro_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_patrn.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_pdf_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_pdfwr.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_pfile.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_rdlin.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_res.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_resmp.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_resst.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_s.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_s.xpm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_s_m.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_sepr.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_setpd.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_statd.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_std_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_sym_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_t.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_t.xpm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_t_m.xbm -%%DATADIR%%/%%GS_VERSION%%/lib/gs_trap.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_ttf.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_typ32.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_typ42.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_type1.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_wan_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl1_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl2_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gs_wl5_e.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gslp.ps -%%DATADIR%%/%%GS_VERSION%%/lib/gsnup.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ht_ccsto.ps -%%DATADIR%%/%%GS_VERSION%%/lib/image-qa.ps -%%DATADIR%%/%%GS_VERSION%%/lib/impath.ps -%%DATADIR%%/%%GS_VERSION%%/lib/jispaper.ps -%%DATADIR%%/%%GS_VERSION%%/lib/landscap.ps -%%DATADIR%%/%%GS_VERSION%%/lib/level1.ps -%%DATADIR%%/%%GS_VERSION%%/lib/lines.ps -%%DATADIR%%/%%GS_VERSION%%/lib/lqx70ch.upp -%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cm.upp -%%DATADIR%%/%%GS_VERSION%%/lib/markhint.ps -%%DATADIR%%/%%GS_VERSION%%/lib/markpath.ps -%%DATADIR%%/%%GS_VERSION%%/lib/necp2x.upp -%%DATADIR%%/%%GS_VERSION%%/lib/necp2x6.upp -%%DATADIR%%/%%GS_VERSION%%/lib/packfile.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_ops.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_rbld.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdf_sec.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdfopt.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pdfwrite.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pf2afm.ps -%%DATADIR%%/%%GS_VERSION%%/lib/pfbtopfa.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ppath.ps -%%DATADIR%%/%%GS_VERSION%%/lib/prfont.ps -%%DATADIR%%/%%GS_VERSION%%/lib/printafm.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ps2ai.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ps2ascii.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ps2epsi.ps -%%DATADIR%%/%%GS_VERSION%%/lib/quit.ps -%%DATADIR%%/%%GS_VERSION%%/lib/ras1.upp -%%DATADIR%%/%%GS_VERSION%%/lib/ras24.upp -%%DATADIR%%/%%GS_VERSION%%/lib/ras3.upp -%%DATADIR%%/%%GS_VERSION%%/lib/ras32.upp -%%DATADIR%%/%%GS_VERSION%%/lib/ras4.upp -%%DATADIR%%/%%GS_VERSION%%/lib/ras8m.upp -%%DATADIR%%/%%GS_VERSION%%/lib/rollconv.ps -%%DATADIR%%/%%GS_VERSION%%/lib/showchar.ps -%%DATADIR%%/%%GS_VERSION%%/lib/showpage.ps -%%DATADIR%%/%%GS_VERSION%%/lib/st640ih.upp -%%DATADIR%%/%%GS_VERSION%%/lib/st640ihg.upp -%%DATADIR%%/%%GS_VERSION%%/lib/st640p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/st640pg.upp -%%DATADIR%%/%%GS_VERSION%%/lib/st640pl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/st640plg.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc1520h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc2.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc200_h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc2_h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc2s_h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc300.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc300bl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc300bm.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc500p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc500ph.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc600ih.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc600p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc600pl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc640p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc740ih.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc740p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc740pl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc800ih.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc800p.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc800pl.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc_h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stc_l.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stcany.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stcany_h.upp -%%DATADIR%%/%%GS_VERSION%%/lib/stcinfo.ps -%%DATADIR%%/%%GS_VERSION%%/lib/stcolor.ps -%%DATADIR%%/%%GS_VERSION%%/lib/stocht.ps -%%DATADIR%%/%%GS_VERSION%%/lib/traceimg.ps -%%DATADIR%%/%%GS_VERSION%%/lib/traceop.ps -%%DATADIR%%/%%GS_VERSION%%/lib/type1enc.ps -%%DATADIR%%/%%GS_VERSION%%/lib/type1ops.ps -%%DATADIR%%/%%GS_VERSION%%/lib/uninfo.ps -%%DATADIR%%/%%GS_VERSION%%/lib/unprot.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewcmyk.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewgif.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewjpeg.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewmiff.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewpbm.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewpcx.ps -%%DATADIR%%/%%GS_VERSION%%/lib/viewps2a.ps -%%DATADIR%%/%%GS_VERSION%%/lib/wftopfa.ps -%%DATADIR%%/%%GS_VERSION%%/lib/winmaps.ps -%%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps -%%DATADIR%%/%%GS_VERSION%%/lib/xlatmap -%%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps -@exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont -@unexec rm -f %%CIDFONTDIR%%/CIDFont -%%SHLIB%%@dirrm include/ghostscript -@dirrm %%DATADIR%%/%%GS_VERSION%%/lib -@dirrm %%DATADIR%%/%%GS_VERSION%%/examples -@dirrm %%DATADIR%%/%%GS_VERSION%%/doc -@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding -@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace -@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/CMap -@dirrm %%DATADIR%%/%%GS_VERSION%%/Resource -@dirrmtry %%DATADIR%%/%%GS_VERSION%% -@dirrmtry %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200 -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lips -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/gdi -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/eplaser -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/epag -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/bj10v -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/alps -%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure deleted file mode 100644 index a82046f2d4b3..000000000000 --- a/print/ghostscript-afpl/scripts/configure +++ /dev/null @@ -1,389 +0,0 @@ -#! /bin/sh - -# $FreeBSD$ - -# configure - gs driver preconfiguration, manual driver selection -# by Andreas Klemm <andreas@FreeBSD.org> - -tempfile=`mktemp -t checklist` - -if [ -z "${WITHOUT_X11}" ]; then -x11devs="x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \ - x11gray2 x11gray4 x11mono x11rg16x x11rg32x" -fi - -if [ -n "${WITH_SVGALIB}" ]; then -svgalibdevs="lvga256 vgalib" -fi - -if [ ! -z "${GS_DRIVERS_LIST}" ]; then - set ${GS_DRIVERS_LIST} -else - set \ - $x11devs \ - $svgalibdevs \ - md2k md5k \ - md50Mono md50Eco md1xMono \ - appledmp iwhi iwlo iwlq hl7x0 bj10e \ - bj10v bj10vh bj200 bjc600 bjc800 \ - bjccmyk bjccolor bjcgray bjcmono \ - lbp8 \ - lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \ - lips2p lips3 lips4 bjc880j lips4v \ - m8510 coslw2p coslwxl uniprint \ - lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \ - epag \ - escpage lp2000 \ - alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \ - lp9800c lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \ - lp8200c lp8000c \ - epl6100 epl5900 epl5800 \ - epl2050 epl2050p epl2120 epl2500 epl2750 \ - lp9000b lp2500 lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 \ - lp8900 lp8700 lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 \ - lp9600s lp9300 lp9600 lp8600 lp1800 \ - lq850 epsonc \ - mjc180 mjc360 mjc720 mj500c \ - st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \ - djet500c cdjcolor cdjmono cdj500 cdj550 \ - cdj670 cdj850 cdj880 cdj890 cdj1600 cdj970 \ - laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \ - cljet5 cljet5c cljet5pr lj5mono lj5gray \ - pj pjetxl pjxl paintjet \ - pjxl300 pxlmono pxlcolor \ - ijs ibmpro jetp3852 imagen fs600 lxm5700m \ - lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \ - cp50 necp6 \ - npdl \ - oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \ - rpdl \ - gdi \ - sj48 t4693d2 t4693d4 t4693d8 tek4696 \ - bmpmono bmpgray bmp16 bmp256 bmp16m bmp32b bmpsep1 bmpsep8 \ - ccr \ - cgmmono cgm8 cgm24 \ - cif \ - dfaxhigh dfaxlow \ - xcf xcfcmyk \ - faxg3 faxg32d faxg4 \ - miff24 inferno jpeg jpeggray \ - mgrmono mgrgray2 mgrgray4 mgrgray8 mgr4 mgr8 \ - pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pdfwrite \ - psdrgb psdcmyk \ - bit bitrgb bitcmyk plan9bm pam pbm pbmraw \ - pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw \ - pkm pkmraw pksm pksmraw \ - pngmono pnggray png16 png256 png16m pngalpha \ - psmono psgray psrgb \ - pswrite ps2write epswrite sgirgb sunhmono \ - tiffcrle tiffg3 tiffg32d tiffg4 \ - tiff12nc tiff24nc tifflzw tiffpack \ - bbox \ - devicen perm spotcmyk -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "AFPL Ghostscript driver configuration" --clear \ - --checklist "\n\ -This new ghostscript driver configuration dialog allows you to choose \n\ -only those gs drivers, you really need. Don't think too economical, since \n\ -other programs in the ports collection might need some of the default gs \n\ -file format drivers. The gs5 default drivers are preselected. \n\ -Have fun with this new configuration style ! -andreas \n\n\ - Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9 \ - "x11" "X Window System version 11, release >=4" "$status_x11" \ - "x11alpha" "X Window System masquer. as device with alpha capability" "$status_x11alpha" \ - "x11cmyk" "X Window System masquer. as 1-bit-per-plane CMYK device" "$status_x11cmyk" \ - "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" "$status_x11cmyk2" \ - "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" "$status_x11cmyk4" \ - "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" "$status_x11cmyk8" \ - "x11gray2" "X Window System as a 2-bit gray-scale device" "$status_x11gray2" \ - "x11gray4" "X Window System as a 4-bit gray-scale device" "$status_x11gray4" \ - "x11mono" "X Window System masquer. as black-and-white device" "$status_x11mono" \ - "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" "$status_x11rg16x" \ - "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" "$status_x11rg32x" \ - "lvga256" "SVGAlib, 256-color VGA modes" "$status_lvga256" \ - "vgalib" "SVGAlib, 16-color VGA modes" "$status_vgalib" \ - "md2k" "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" "$status_md2k" \ - "md5k" "ALPS MD-5000 Eco Mode [MD2K]" "$status_md5k" \ - "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" "$status_md50Mono" \ - "md50Eco" "ALPS MD-5000 Eco Mode [ALPS]" "$status_md50Eco" \ - "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" "$status_md1xMono" \ - "appledmp" "Apple Dot Matrix Printer / Imagewriter" "$status_appledmp" \ - "iwhi" "Apple Imagewriter, high-resolution mode" "$status_iwhi" \ - "iwlo" "Apple Imagewriter, low-resolution mode" "$status_iwlo" \ - "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \ - "hl7x0" "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \ - "hl1250" "Brother HL-1030/1050/1070/1250/1270N/14x0" "$status_hl1250" \ - "bj10e" "Canon BubbleJet BJ-10e" "$status_bj10e" \ - "bj10v" "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \ - "bj10vh" "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \ - "bj200" "Canon BubbleJet BJ-200 and BJC-240(b&w)" "$status_bj200" \ - "bjc600" "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" "$status_bjc600" \ - "bjc800" "Canon Color BubbleJet BJC-240/800" "$status_bjc800" \ - "bjccmyk" "Canon Color BubbleJet BJC-210/240/250/265/1000 [BJC250]" "$status_bjccmyk" \ - "bjccolor" "Canon Color BubbleJet BJC-210 ... 1000 truecolor [BJC250]" "$status_bjccolor" \ - "bjcgray" "Canon Color BubbleJet BJC-210 ... 1000 grayscale [BJC250]" "$status_bjcgray" \ - "bjcmono" "Canon Color BubbleJet BJC-210 ... 1000 monochrome [BJC250]" "$status_bjcmono" \ - "lbp8" "Canon LBP-8II laser printer" "$status_lbp8" \ - "lbp1310" "Canon LBP-1310 laser printer [CPCA]" "$status_lbp1310" \ - "lbp1510" "Canon LBP-1510 laser printer [CPCA]" "$status_lbp1510" \ - "lbp1610" "Canon LBP-1610 laser printer [CPCA]" "$status_lbp1610" \ - "lbp1710" "Canon LBP-1710 laser printer [CPCA]" "$status_lbp1710" \ - "lbp1810" "Canon LBP-1810 laser printer [CPCA]" "$status_lbp1810" \ - "lbp1910" "Canon LBP-1910 laser printer [CPCA]" "$status_lbp1910" \ - "lips2p" "Canon LIPS II+ [LIPS]" "$status_lips2p" \ - "lips3" "Canon LIPS III [LIPS]" "$status_lips3" \ - "lips4" "Canon LIPS IV [LIPS]" "$status_lips4" \ - "bjc880j" "Canon LIPS IVc (BJC-680J/880J) [LIPS]" "$status_bjc880j" \ - "lips4v" "Canon LIPS IV, vector output mode [LIPS]" "$status_lips4v" \ - "m8510" "C.Itoh M8510 printer" "$status_m8510" \ - "coslw2p" "CoStar LabelWriter II II/Plus" "$status_coslw2p" \ - "coslwxl" "CoStar LabelWriter XL" "$status_coslwxl" \ - "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \ - "lj250" "DEC LJ250 Companion color printer" "$status_lj250" \ - "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \ - "ap3250" "Epson ActionPrinter 3250" "$status_ap3250" \ - "epson" "Epson-compatible dot matrix, 9/24-pin" "$status_epson" \ - "eps9mid" "Epson-compatible 9-pin, interleaved lines, medium resol" "$status_eps9mid" \ - "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" "$status_eps9high" \ - "lp8000" "Epson LP-8000 line printer" "$status_lp8000" \ - "epag" "Epson ESC/Page laser printer (generic) [EPAG]" "$status_epag" \ - "escpage" "Epson ESC/Page laser printer (generic) [LIPS]" "$status_escpage" \ - "lp2000" "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" "$status_lp2000" \ - "alc8600" "Epson AL-C8600 color laser printer [EPLASER]" "$status_alc8600" \ - "alc8500" "Epson AL-C8500 color laser printer [EPLASER]" "$status_alc8500" \ - "alc2000" "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \ - "alc4000" "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \ - "alc1900" "Epson AL-C1900 color laser printer [EPLASER]" "$status_alc1900" \ - "alc4100" "Epson AL-C4100 color laser printer [EPLASER]" "$status_alc4100" \ - "lp9800c" "Epson LP-9800C color laser printer [EPLASER]" "$status_lp9800c" \ - "lp9000c" "Epson LP-9000C color laser printer [EPLASER]" "$status_lp9000c" \ - "lp9500c" "Epson LP-9500C color laser printer [EPLASER]" "$status_lp9500c" \ - "lp8800c" "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \ - "lp8300c" "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \ - "lp8500c" "Epson LP-8500C color laser printer [EPLASER]" "$status_lp8500c" \ - "lp3000c" "Epson LP-3000C color laser printer [EPLASER]" "$status_lp3000c" \ - "lp8200c" "Epson LP-8200C color laser printer [EPLASER]" "$status_lp8200c" \ - "lp8000c" "Epson LP-8000C color laser printer [EPLASER]" "$status_lp8000c" \ - "epl6100" "Epson EPL-6100 laser printer [EPLASER]" "$status_epl6100" \ - "epl5900" "Epson EPL-5900 laser printer [EPLASER]" "$status_epl5900" \ - "epl5800" "Epson EPL-5800 laser printer [EPLASER]" "$status_epl5800" \ - "epl2050" "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \ - "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \ - "epl2120" "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \ - "epl2500" "Epson EPL-N2500 laser printer [EPLASER]" "$status_epl2500" \ - "epl2750" "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \ - "lp9000b" "Epson LP-9000B laser printer [EPLASER]" "$status_lp9000b" \ - "lp2500" "Epson LP-2500 laser printer [EPLASER]" "$status_lp2500" \ - "lp9100" "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \ - "lp7900" "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \ - "lp7500" "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \ - "lp2400" "Epson LP-2400 laser printer [EPLASER]" "$status_lp2400" \ - "lp2200" "Epson LP-2200 laser printer [EPLASER]" "$status_lp2200" \ - "lp9400" "Epson LP-9400(R) laser printer [EPLASER]" "$status_lp9400" \ - "lp8900" "Epson LP-8900(R) laser printer [EPLASER]" "$status_lp8900" \ - "lp8700" "Epson LP-8700(R) laser printer [EPLASER]" "$status_lp8700" \ - "lp8100" "Epson LP-8100(R) laser printer [EPLASER]" "$status_lp8100" \ - "lp7700" "Epson LP-7700(R) laser printer [EPLASER]" "$status_lp7700" \ - "lp8600f" "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600f" \ - "lp8400f" "Epson LP-8400FX(N) laser printer [EPLASER]" "$status_lp8400f" \ - "lp8300f" "Epson LP-8300F laser printer [EPLASER]" "$status_lp8300f" \ - "lp1900" "Epson LP-1900(N) laser printer [EPLASER]" "$status_lp1900" \ - "lp9600s" "Epson LP-9600S laser printer [EPLASER]" "$status_lp9600s" \ - "lp9300" "Epson LP-9300 laser printer [EPLASER]" "$status_lp9300" \ - "lp9600" "Epson LP-9600 laser printer [EPLASER]" "$status_lp9600" \ - "lp8600" "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600" \ - "lp1800" "Epson LP-1800 laser printer [EPLASER]" "$status_lp1800" \ - "lq850" "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" "$status_lq850" \ - "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" "$status_epsonc" \ - "mjc180" "Epson MachJet series 180dpi, CMYK [MJC]" "$status_mjc180" \ - "mjc360" "Epson MachJet series 360dpi, CMYK [MJC]" "$status_mjc360" \ - "mjc720" "Epson MachJet series 720dpi, CMYK [MJC]" "$status_mjc720" \ - "mj500c" "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" "$status_mj500c" \ - "st800" "Epson Stylus 800 printer" "$status_st800" \ - "stcolor" "Epson Stylus Color and II/IIs/1500 (see driver docu)" "$status_stcolor" \ - "photoex" "Epson Stylus Color Photo, Photo EX, Photo 700" "$status_photoex" \ - "lp2563" "HP 2563B line printer" "$status_lp2563" \ - "dnj650c" "HP DesignJet 650C" "$status_dnj650c" \ - "deskjet" "HP DeskJet and DeskJet Plus" "$status_deskjet" \ - "djet500" "HP DeskJet 500 (for DeskJet 600 use -r600)" "$status_djet500" \ - "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" "$status_cdeskjet" \ - "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" "$status_djet500c" \ - "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" "$status_cdjcolor" \ - "cdjmono" "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \ - "cdj500" "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \ - "cdj550" "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \ - "cdj670" "HP DeskJet 670/690 [HP8XX]" "$status_cdj670" \ - "cdj850" "HP DeskJet 850/855/870/1100 [HP8XX]" "$status_cdj850" \ - "cdj880" "HP DeskJet 880 [HP8XX]" "$status_cdj880" \ - "cdj890" "HP DeskJet 890 [HP8XX]" "$status_cdj890" \ - "cdj1600" "HP DeskJet 1600 [HP8XX]" "$status_cdj1600" \ - "cdj970" "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \ - "laserjet" "HP LaserJet" "$status_laserjet" \ - "ljetplus" "HP LaserJet Plus" "$status_ljetplus" \ - "ljet2p" "HP LaserJet IId/IIp/III* with TIFF compression" "$status_ljet2p" \ - "ljet3" "HP LaserJet III* with Delta Row compression" "$status_ljet3" \ - "ljet3d" "HP LaserJet IIID with duplex capability" "$status_ljet3d" \ - "ljet4" "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" "$status_ljet4" \ - "ljet4d" "HP LaserJet 4 (defaults to 600 dpi) with duplex" "$status_ljet4d" \ - "lj4dith" "HP LaserJet 4 with Floyd-Steinberg dithering" "$status_lj4dith" \ - "cljet5" "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" "$status_cljet5" \ - "cljet5c" "HP LaserJet 5/5M Color Simple" "$status_cljet5c" \ - "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" "$status_cljet5pr" \ - "lj5mono" "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" "$status_lj5mono" \ - "lj5gray" "HP LaserJet 5 and 6 family, gray-scale bitmap" "$status_lj5gray" \ - "pj" "HP PaintJet XL driver " "$status_pj" \ - "pjetxl" "HP PaintJet XL driver (alternate)" "$status_pjetxl" \ - "pjxl" "HP PaintJet XL color printer" "$status_pjxl" \ - "paintjet" "HP PaintJet color printer (alternate)" "$status_paintjet" \ - "pjxl300" "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" "$status_pjxl300" \ - "pxlmono" "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \ - "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \ - "ijs" "HP Inkjet and other raster devices" "$status_ijs" \ - "ibmpro" "IBM 9-pin Proprinter" "$status_ibmpro" \ - "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" "$status_jetp3852" \ - "imagen" "Imagen ImPress printers" "$status_imagen" \ - "fs600" "Kyocera FS-600 (600 dpi)" "$status_fs600" \ - "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \ - "lxm3200" "Lexmark 3200/Z12/Z22/Z31/Z32 [LXM3200]" "$status_lxm3200" \ - "lx5000" "Lexmark 5000/Z51/Z82 [LX5000]" "$status_lx5000" \ - "lex2050" "Lexmark 2050 [LEX7000]" "$status_lex2050" \ - "lex3200" "Lexmark 3200 [LEX7000]" "$status_lex3200" \ - "lex5700" "Lexmark 5700 [LEX7000]" "$status_lex5700" \ - "lex7000" "Lexmark 7000 [LEX7000]" "$status_lex7000" \ - "cp50" "Mitsubishi CP50 color" "$status_cp50" \ - "necp6" "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" "$status_necp6" \ - "npdl" "NEC Printer Description Language [LIPS]" "$status_npdl" \ - "oce9050" "OCE 9050 printer" "$status_oce9050" \ - "oki182" "Okidata MicroLine 182" "$status_oki182" \ - "okiibm" "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \ - "atx23" "Practical Automation ATX-23 label printer" "$status_atx23" \ - "atx24" "Practical Automation ATX-24 label printer" "$status_atx24" \ - "atx38" "Practical Automation ATX-38 label printer" "$status_atx38" \ - "r4081" "Ricoh 4081 laser printer" "$status_r4081" \ - "rpdl" "Ricoh Printer Description Language [LIPS]" "$status_rpdl" \ - "gdi" "Samsung SmartGDI laser printer [GDI]" "$status_gdi" \ - "sj48" "StarJet 48 inkjet printer" "$status_sj48" \ - "t4693d2" "Tektronix 4693d color, 2 bits per R/G/B component" "$status_t4693d2" \ - "t4693d4" "Tektronix 4693d color, 4 bits per R/G/B component" "$status_t4693d4" \ - "t4693d8" "Tektronix 4693d color, 8 bits per R/G/B component" "$status_t4693d8" \ - "tek4696" "Tektronix 4695/4696 inkjet plotter" "$status_tek4696" \ - "bmpmono" "BMP Monochrome" "$status_bmpmono" \ - "bmpgray" "BMP 8-bit gray" "$status_bmpgray" \ - "bmp16" "BMP 4-bit EGA/VGA" "$status_bmp16" \ - "bmp256" "BMP 8-bit 256-color" "$status_bmp256" \ - "bmp16m" "BMP 24-bit" "$status_bmp16m" \ - "bmp32b" "BMP 32-bit pseudo-.BMP" "$status_bmp32b" \ - "bmpsep1" "BMP Separated 1-bit CMYK" "$status_bmpsep1" \ - "bmpsep8" "BMP Separated 8-bit CMYK" "$status_bmpsep8" \ - "ccr" "CalComp Raster format" "$status_ccr" \ - "cgmmono" "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" "$status_cgmmono" \ - "cgm8" "CGM 8-bit 256-color -- DITTO" "$status_cgm8" \ - "cgm24" "CGM 24-bit color -- DITTO" "$status_cgm24" \ - "cif" "CIF file format for VLSI" "$status_cif" \ - "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" "$status_dfaxhigh" \ - "dfaxlow" "DigiFAX low (normal) resol" "$status_dfaxlow" \ - "xcf" "Gimp XCF, RGB" "$status_xcf" \ - "xcfcmyk" "Gimp XCF, CMYK" "$status_xcfcmyk" \ - "faxg3" "Group 3 fax, with EOLs but no header or EOD" "$status_faxg3" \ - "faxg32d" "Group 3 2-D fax, with EOLs but no header or EOD" "$status_faxg32d" \ - "faxg4" "Group 4 fax, with EOLs but no header or EOD" "$status_faxg4" \ - "miff24" "ImageMagick MIFF, 24-bit direct color, RLE compressed" "$status_miff24" \ - "inferno" "Inferno bitmaps" "$status_inferno" \ - "jpeg" "JPEG format, RGB output" "$status_jpeg" \ - "jpeggray" "JPEG format, gray output" "$status_jpeggray" \ - "mgrmono" "MGR devices 1-bit monochrome" "$status_mgrmono" \ - "mgrgray2" "MGR devices 2-bit gray scale" "$status_mgrgray2" \ - "mgrgray4" "MGR devices 4-bit gray scale" "$status_mgrgray4" \ - "mgrgray8" "MGR devices 8-bit gray scale" "$status_mgrgray8" \ - "mgr4" "MGR devices 4-bit (VGA) color" "$status_mgr4" \ - "mgr8" "MGR devices 8-bit color" "$status_mgr8" \ - "pcxmono" "PCX file format, monochrome 1-bit b/w" "$status_pcxmono" \ - "pcxgray" "PCX file format, 8-bit gray scale" "$status_pcxgray" \ - "pcx16" "PCX file format, 4-bit planar EGA/VGA color" "$status_pcx16" \ - "pcx256" "PCX file format, 8-bit chunky color" "$status_pcx256" \ - "pcx24b" "PCX file format, 24-bit color 3x8-bit planes" "$status_pcx24b" \ - "pcxcmyk" "PCX file format, 4-bit chunky CMYK color" "$status_pcxcmyk" \ - "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" "$status_pdfwrite" \ - "psdrgb" "PhotoShop PSD, RGB" "$status_psdrgb" \ - "psdcmyk" "PhotoShop PSD, CMYK" "$status_psdcmyk" \ - "bit" "Plain bits, monochrome" "$status_bit" \ - "bitrgb" "Plain bits, RGB" "$status_bitrgb" \ - "bitcmyk" "Plain bits, CMYK" "$status_bitcmyk" \ - "plan9bm" "Plan 9 bitmap format" "$status_plan9bm" \ - "pam" "Portable Arbitrary Map file format" "$status_pam" \ - "pbm" "Portable Bitmap, plain format" "$status_pbm" \ - "pbmraw" "Portable Bitmap, raw format" "$status_pbmraw" \ - "pgm" "Portable Graymap, plain format" "$status_pgm" \ - "pgmraw" "Portable Graymap, raw format" "$status_pgmraw" \ - "pgnm" "Portable Graymap, plain format, optim. to PBM" "$status_pgnm" \ - "pgnmraw" "Portable Graymap, raw format, optim. to PBM" "$status_pgmraw" \ - "pnm" "Portable Pixmap, plain format RGB, optim. to PGM/PBM" "$status_pnm" \ - "pnmraw" "Portable Pixmap, raw format RGB, optim. to PGM/PBM" "$status_pnmraw" \ - "ppm" "Portable Pixmap, plain format RGB" "$status_ppm" \ - "ppmraw" "Portable Pixmap, raw format RGB" "$status_ppmraw" \ - "pkm" "Portable inKmap (plain format) (4-bit CMYK => RGB)" "$status_pkm" \ - "pkmraw" "Portable inKmap (raw format) (4-bit CMYK => RGB)" "$status_pkmraw" \ - "pksm" "Portable Separated map (plain) (4-bit CMYK => 4 pages)" "$status_pksm" \ - "pksmraw" "Portable Separated map (raw) (4-bit CMYK => 4 pages)" "$status_pksmraw" \ - "pngmono" "PNG Monochrome Portable Network Graphics" "$status_pngmono" \ - "pnggray" "PNG 8-bit gray Portable Network Graphics" "$status_pnggray" \ - "png16" "PNG 4-bit color Portable Network Graphics" "$status_png16" \ - "png256" "PNG 8-bit color Portable Network Graphics" "$status_png256" \ - "png16m" "PNG 24-bit color Portable Network Graphics" "$status_png16m" \ - "pngalpha" "PNG 32-bit RGBA color Portable Network Graphics" "$status_pngalpha" \ - "psmono" "PostScript (Level 1) monochrome image" "$status_psmono" \ - "psgray" "PostScript (Level 1) 8-bit gray image" "$status_psgray" \ - "psrgb" "PostScript (Level 2) 24-bit color image" "$status_psrgb" \ - "pswrite" "PostScript output (like PostScript Distillery)" "$status_pswrite" \ - "ps2write" "PostScript (Level 2) output" "$status_ps2write" \ - "epswrite" "EPS output (like PostScript Distillery)" "$status_epswrite" \ - "sgirgb" "SGI RGB pixmap format" "$status_sgirgb" \ - "sunhmono" "Harlequin variant of 1-bit Sun raster file" "$status_sunhmono" \ - "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" "$status_tiffcrle" \ - "tiffg3" "TIFF Group 3 fax with EOLs" "$status_tiffg3" \ - "tiffg32d" "TIFF Group 3 2-D fax" "$status_tiffg32d" \ - "tiffg4" "TIFF Group 4 fax" "$status_tiffg4" \ - "tiff12nc" "TIFF 12-bit RGB, no compression" "$status_tiff12nc" \ - "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" "$status_tiff24nc" \ - "tifflzw" "TIFF LZW, tag = 5, mono" "$status_tifflzw" \ - "tiffpack" "TIFF PackBits, tag = 32773, mono" "$status_tiffpack" \ - "bbox" "Bounding box output" "$status_bbox" \ - "devicen" "DeviceN process color model device" "$status_devicen" \ - "perm" "DeviceN which permutes color components" "$status_perm" \ - "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - echo "Nothing selected" - fi - ;; - 1) echo "Cancel pressed." - exit 1 - ;; - esac -fi - -exec > ${WRKSRC}/Makefile - -echo "DEVICE_DEVS= \\" - -for i; do - echo " \$(DD)$i.dev \\" -done - -echo "" -cat "${WRKSRC}/src/unix-gcc.mak" diff --git a/print/ghostscript-gnu-commfont/Makefile b/print/ghostscript-gnu-commfont/Makefile index f8655526dab2..4e8ecb7a3b8c 100644 --- a/print/ghostscript-gnu-commfont/Makefile +++ b/print/ghostscript-gnu-commfont/Makefile @@ -29,9 +29,7 @@ DEPENDS_ARGS+= -DA4 USE_GHOSTSCRIPT= yes WITH_GHOSTSCRIPT_GNU= yes -CONFLICTS= ghostscript-afpl-[0-9]* \ - ghostscript-afpl-nox11-[0-9]* \ - ghostscript-gpl-[0-9]* \ +CONFLICTS= ghostscript-gpl-[0-9]* \ ghostscript-gpl-nox11-[0-9]* CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index 573527954776..f0c1794d8a1a 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -62,7 +62,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print # normazile WRKSRC so things like cups-pstoraster may work WRKSRC= ${WRKDIR}/${PORTNAME} -CONFLICTS= ghostscript-afpl* ghostscript-gpl* +CONFLICTS= ghostscript-gpl* USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile index f85ad73e142a..4eddddc11929 100644 --- a/print/ghostscript-gpl/Makefile +++ b/print/ghostscript-gpl/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS= ghostscript-afpl* ghostscript-gnu* +CONFLICTS= ghostscript-gnu* USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile index f8655526dab2..4e8ecb7a3b8c 100644 --- a/print/ghostscript7-commfont/Makefile +++ b/print/ghostscript7-commfont/Makefile @@ -29,9 +29,7 @@ DEPENDS_ARGS+= -DA4 USE_GHOSTSCRIPT= yes WITH_GHOSTSCRIPT_GNU= yes -CONFLICTS= ghostscript-afpl-[0-9]* \ - ghostscript-afpl-nox11-[0-9]* \ - ghostscript-gpl-[0-9]* \ +CONFLICTS= ghostscript-gpl-[0-9]* \ ghostscript-gpl-nox11-[0-9]* CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 573527954776..f0c1794d8a1a 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -62,7 +62,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print # normazile WRKSRC so things like cups-pstoraster may work WRKSRC= ${WRKDIR}/${PORTNAME} -CONFLICTS= ghostscript-afpl* ghostscript-gpl* +CONFLICTS= ghostscript-gpl* USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index f85ad73e142a..4eddddc11929 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -27,7 +27,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts -CONFLICTS= ghostscript-afpl* ghostscript-gnu* +CONFLICTS= ghostscript-gnu* USE_BZIP2= yes USE_GMAKE= yes MAKE_ENV= CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \ diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 5ace94c2e034..656c0a58b94f 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -37,14 +37,6 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-install: @${TOUCH} ${PREFIX}/etc/gnome/fonts/gnome-print-x11.fontmap diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile index e9376138bc3c..8f191033b7c5 100644 --- a/print/html2ps-letter/Makefile +++ b/print/html2ps-letter/Makefile @@ -31,14 +31,6 @@ MAN1= html2ps.1 MAN5= html2psrc.5 SCRIPTS_ENV+= PERL=${PERL} PAPERSIZE=${PAPERSIZE} -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - do-install: @cd ${WRKSRC}; ${PERL} install diff --git a/print/lpr-wrapper/Makefile b/print/lpr-wrapper/Makefile index 76253f7e5878..d27f88375876 100644 --- a/print/lpr-wrapper/Makefile +++ b/print/lpr-wrapper/Makefile @@ -14,10 +14,6 @@ MASTER_SITES= http://www.mathstat.dal.ca/~selinger/lpr-wrapper/download/ MAINTAINER= e-masson@kisoft-services.com COMMENT= A user level printer frontend -# -# define WITH_GHOSTSCRIPT_AFPL=yes for AFPL Postscript interpreter -# instead of GNU one -# USE_GHOSTSCRIPT_RUN= yes HAS_CONFIGURE= yes diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index f81d535a032d..a4f82224960c 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -30,14 +30,4 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} MAN5= magicfilter.5 MAN8= magicfilter.8 -.include <bsd.port.pre.mk> - -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile index 17b8e0a13c19..5f8b86a5fc29 100644 --- a/print/pnm2ppa/Makefile +++ b/print/pnm2ppa/Makefile @@ -26,14 +26,6 @@ CFLAGS+= ${CPPFLAGS} MAN1= pnm2ppa.1 -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-patch: @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" \ ${WRKSRC}/pnm2ppa.conf > ${WRKSRC}/pnm2ppa.conf.sample diff --git a/print/psdim/Makefile b/print/psdim/Makefile index 075250d20632..e5a53f95262d 100644 --- a/print/psdim/Makefile +++ b/print/psdim/Makefile @@ -14,10 +14,6 @@ MASTER_SITES= http://www.mathstat.dal.ca/~selinger/psdim/download/ MAINTAINER= e-masson@kisoft-services.com COMMENT= Utility that calculates the optimal placement of the pages for n-up printing -# -# define WITH_GHOSTSCRIPT_AFPL=yes for AFPL Postscript interpreter -# instead of GNU one -# USE_GHOSTSCRIPT=yes HAS_CONFIGURE= yes diff --git a/print/pstotext/Makefile b/print/pstotext/Makefile index f4c9fe807e15..f81d022f1f7a 100644 --- a/print/pstotext/Makefile +++ b/print/pstotext/Makefile @@ -21,14 +21,6 @@ USE_GHOSTSCRIPT_RUN= yes MAN1= pstotext.1 PLIST_FILES= bin/pstotext -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/pstotext ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/pstotext.1 ${PREFIX}/man/man1 diff --git a/print/transfig/Makefile b/print/transfig/Makefile index a093f26e28b0..0aa689228887 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -30,11 +30,10 @@ MAKE_ARGS+= INSTALLFLAGS="${COPY}" \ INSTMANFLAGS="${_MANOWNGRP} -m ${MANMODE}" pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) && !defined(WITH_GHOSTSCRIPT_GNU) +.if !defined(WITH_GHOSTSCRIPT_GNU) @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GPL one" - @${ECHO_MSG} " Or define WITH_GHOSTSCRIPT_GNU=yes to use GNU one" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_GNU=yes to use" + @${ECHO_MSG} " GNU Postscript interpreter instead of GPL one" @${ECHO_MSG} "" .endif diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile index 142360d7a233..9ce808815e7f 100644 --- a/textproc/latex2html/Makefile +++ b/textproc/latex2html/Makefile @@ -41,14 +41,6 @@ PORTDOCS= FAQ INSTALL LICENSE README .include <bsd.port.pre.mk> -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - post-install: ${INSTALL_MAN} ${FILESDIR}/latex2html.1 ${MANPREFIX}/man/man1 .if !defined(NOPORTDOCS) diff --git a/textproc/pdftohtml/Makefile b/textproc/pdftohtml/Makefile index 599dc233c17f..7899b7536bbc 100644 --- a/textproc/pdftohtml/Makefile +++ b/textproc/pdftohtml/Makefile @@ -23,14 +23,6 @@ PLIST_FILES= bin/pdftohtml WRKSRC= ${WRKDIR}/${DISTNAME} -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - pre-patch: @${FIND} ${WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e "s|-O[0-9]||" -e "s|-g||" diff --git a/textproc/prosper/Makefile b/textproc/prosper/Makefile index 48b21350588e..850556bb8ebc 100644 --- a/textproc/prosper/Makefile +++ b/textproc/prosper/Makefile @@ -40,14 +40,6 @@ DOCS= AUTHORS ChangeLog FAQ INSTALL NEWS README TODO \ doc/rotation.ps doc/rotation.tex EXAMPLES_DIR= doc/doc-examples -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - post-extract: @${CP} -r ${WRKDIR}/contrib-prosper-1.0.0/* ${WRKSRC}/contrib/ diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile index c595e34e6f22..bdd4b19e1ebc 100644 --- a/textproc/tth/Makefile +++ b/textproc/tth/Makefile @@ -26,14 +26,6 @@ MAN1= tth.1 PLIST_FILES= bin/latex2gif bin/ps2gif bin/ps2png bin/tth bin/Xfonts.fix PORTDOCS= license.txt tth_manual.html -pre-everything:: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO_MSG} "" - @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" - @${ECHO_MSG} "" -.endif - do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} tth.c -o tth -ll diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index 88d7c07bf131..b6fe153d3472 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -34,14 +34,6 @@ INSTALLDIRS= gs DPS/demos/dpsexec DPS/demos/xepsf .include <bsd.port.pre.mk> -pre-fetch: -.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" -.endif - pre-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} \ ${REINPLACE_CMD} -e 's|manm|mann|g' |