summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-12-20 22:31:09 +0000
committerjlam <jlam@pkgsrc.org>2001-12-20 22:31:09 +0000
commit8051917eb9854c98350890a8cb111b4300b78ed4 (patch)
treeaa7e6c19e25a1ce80becd99f5e6be5d4b6842873 /print
parent9058149209b2881cace770e056e4d294cd34aac2 (diff)
downloadpkgsrc-8051917eb9854c98350890a8cb111b4300b78ed4.tar.gz
Update ghostscript and ghostscript-nox11 to 6.01nb1. The changes are adding
additional printer drivers: stp: Gimp-Print/STP color inkjets for photo quality output hpijs: HP Linux Inkjet Driver for 41 HP inkjets cdj880: HP DeskJet 880 series gdi: Samsung SmartGDI laser printers This closes pkg/13351 by Ingolf Steinbach <ingolf@steinba.ch> and pkg/13902 by Thor Lancelot Simon <tls@rek.tjls.com>.
Diffstat (limited to 'print')
-rw-r--r--print/ghostscript-nox11/DESCR10
-rw-r--r--print/ghostscript-nox11/Makefile14
-rw-r--r--print/ghostscript-nox11/Makefile.common246
-rw-r--r--print/ghostscript-nox11/PLIST414
-rw-r--r--print/ghostscript-nox11/distinfo19
-rw-r--r--print/ghostscript-nox11/files/devs.nox1113
-rw-r--r--print/ghostscript-nox11/patches/patch-aa7
-rw-r--r--print/ghostscript-nox11/patches/patch-ae25
-rw-r--r--print/ghostscript-nox11/patches/patch-ah44
-rw-r--r--print/ghostscript-nox11/patches/patch-at73
-rw-r--r--print/ghostscript-nox11/patches/patch-ax10
-rw-r--r--print/ghostscript-nox11/patches/patch-ay13
-rw-r--r--print/ghostscript/DESCR12
-rw-r--r--print/ghostscript/Makefile24
14 files changed, 528 insertions, 396 deletions
diff --git a/print/ghostscript-nox11/DESCR b/print/ghostscript-nox11/DESCR
index 68d479391a6..5251691e989 100644
--- a/print/ghostscript-nox11/DESCR
+++ b/print/ghostscript-nox11/DESCR
@@ -1,6 +1,6 @@
-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.
+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.
-This version of Ghostscript includes support for the Japanese
-Vector Font library.
+This version of Ghostscript includes support for the Japanese Vector Font
+library and contains a full installation without the X11 drivers.
diff --git a/print/ghostscript-nox11/Makefile b/print/ghostscript-nox11/Makefile
index bc4aa542305..9454ab90e33 100644
--- a/print/ghostscript-nox11/Makefile
+++ b/print/ghostscript-nox11/Makefile
@@ -1,9 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:51:42 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/20 22:31:09 jlam Exp $
PKGNAME= ghostscript-nox11-${GS_VERS}
-
-COMMENT= Aladdin Postscript interpreter
+PKGREVISION= 1
+COMMENT= Aladdin Postscript interpreter without X11 drivers
CONFLICTS= ghostscript{,-x11}-[0-9]*
+USE_BUILDLINK_ONLY= YES
+
.include "../../print/ghostscript-nox11/Makefile.common"
+.include "../../mk/bsd.pkg.mk"
+
+# arm32 compiler has an optimizer problem
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
+CFLAGS+= -O0
+.endif
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 0798fe5034d..f670914e222 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.24 2001/12/08 21:15:47 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.25 2001/12/20 22:31:09 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
CATEGORIES= print
-MASTER_SITES+= http://download.sourceforge.net/ghostscript/ \
- ftp://ftp.cs.wisc.edu/ghost/aladdin/gs601/
+MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
+ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/aladdin/gs${GS_VERS:S/.//}/
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jlam@netbsd.org
@@ -13,16 +13,21 @@ HOMEPAGE= http://www.cs.wisc.edu/~ghost/index.html
DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont
-GS_SOURCES= ${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+= ${GS_SOURCES}
+USE_GMAKE= YES
+
+GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
+WRKSRC= ${WRKDIR}/gs${GS_VERS}
+DISTFILES+= ${GS_SRCS}
+EXTRACT_ONLY= ${GS_SRCS}
# Adobe's JPEG implementation in their PDF/PS documents is non-standard,
# so we can't use an already installed libjpeg.so.
#
-JPEG_SOURCES= jpegsrc.v6b.tar.gz
-MASTER_SITES_${JPEG_SOURCES}= ftp://ftp.uu.net/graphics/jpeg/
-DISTFILES+= ${JPEG_SOURCES}
-EXTRACT_LIST+= ${JPEG_SOURCES}
+JPEG_SRCS= jpegsrc.v6b.tar.gz
+JPEG_WRKSRC= ${WRKDIR}/jpeg-6b
+MASTER_SITES_${JPEG_SRCS}= ftp://ftp.uu.net/graphics/jpeg/
+DISTFILES+= ${JPEG_SRCS}
+EXTRACT_ONLY+= ${JPEG_SRCS}
# VFlib & Japanese PDF patch
PATCH_SITES= http://www.sat.t.u-tokyo.ac.jp/~hideyuki/Ghostscript/
@@ -34,83 +39,109 @@ PDF_SEC= pdf_sec.ps
MASTER_SITES_${PDF_SEC}= http://www.ozemail.com.au/~geoffk/pdfencrypt/
DISTFILES+= ${PDF_SEC}
+# Gimp-print/STP drivers for photo-quality inkjet output
+GIMPPRINT= gimp-print-4.2.0
+GIMPPRINT_SRCS= ${GIMPPRINT}.tar.gz
+GIMPPRINT_WRKSRC= ${WRKDIR}/${GIMPPRINT}
+MASTER_SITES_${GIMPPRINT_SRCS}= ${MASTER_SITE_SOURCEFORGE:=gimp-print/}
+DISTFILES+= ${GIMPPRINT_SRCS}
+EXTRACT_ONLY+= ${GIMPPRINT_SRCS}
+GIMPPRINT_CONFIGURE_ARGS= --without-gimp --with-ghost
+
+# Drivers from the HP Inkjet Project (IJS/HPIJS)
+HPIJS_DRV= hpijs0.97
+HPIJS_SRCS= ${HPIJS_DRV}.tar.gz
+HPIJS_WRKSRC= ${WRKDIR}/${HPIJS_DRV}
+MASTER_SITES_${HPIJS_SRCS}= ${MASTER_SITE_SOURCEFORGE:=hpinkjet/}
+DISTFILES+= ${HPIJS_SRCS}
+EXTRACT_ONLY+= ${HPIJS_SRCS}
+
# Additional driver for several HP deskjets
HPDJ_DRV= hpdj-2.6
MASTER_SITES_${HPDJ_DRV}.tar.gz= ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/
DISTFILES+= ${HPDJ_DRV}.tar.gz
-EXTRACT_LIST+= ${HPDJ_DRV}.tar.gz
+EXTRACT_ONLY+= ${HPDJ_DRV}.tar.gz
# I don't know the primary destribution sites of these drivers....
DMPRT_DRV= dmprt-2.01
MASTER_SITES_${DMPRT_DRV}.tar.gz= ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
DISTFILES+= ${DMPRT_DRV}.tar.gz
-EXTRACT_LIST+= ${DMPRT_DRV}.tar.gz
+EXTRACT_ONLY+= ${DMPRT_DRV}.tar.gz
BJ10V_DRV= gdev10v
DISTFILES+= ${BJ10V_DRV}.tar.gz
-EXTRACT_LIST+= ${BJ10V_DRV}.tar.gz
+EXTRACT_ONLY+= ${BJ10V_DRV}.tar.gz
# EPSON MJ-700V2C
MJC_DRV= gdevmjc-0.8
DISTFILES+= ${MJC_DRV}.tar.gz
-EXTRACT_LIST+= ${MJC_DRV}.tar.gz
+EXTRACT_ONLY+= ${MJC_DRV}.tar.gz
# Alps MD5000 printer 600dpi monochrome mode
MD5000_DRV= gdevalps-0.2
DISTFILES+= ${MD5000_DRV}.tar.gz
-EXTRACT_LIST+= ${MD5000_DRV}.tar.gz
+EXTRACT_ONLY+= ${MD5000_DRV}.tar.gz
# Alps MD-2000/2010/4000/1300/1500/5000
MD2000_DRV= gdevmd2k-0.2a
MASTER_SITES_${MD2000_DRV}.tar.gz= http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/
DISTFILES+= ${MD2000_DRV}.tar.gz
-EXTRACT_LIST+= ${MD2000_DRV}.tar.gz
+EXTRACT_ONLY+= ${MD2000_DRV}.tar.gz
# Canon LIPS II+, III, IV; EPSON ESC/Page; NEC NPDL drivers
LIPS_DRV= gdevlips-2.3.6
MASTER_SITES_${LIPS_DRV}.tar.gz= http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
DISTFILES+= ${LIPS_DRV}.tar.gz
-EXTRACT_LIST+= ${LIPS_DRV}.tar.gz
+EXTRACT_ONLY+= ${LIPS_DRV}.tar.gz
# Ricoh RPDL
RPDL_DRV= gdevrpdl
MASTER_SITES_${RPDL_DRV}.tar.gz= http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
DISTFILES+= ${RPDL_DRV}.tar.gz
-EXTRACT_LIST+= ${RPDL_DRV}.tar.gz
+EXTRACT_ONLY+= ${RPDL_DRV}.tar.gz
# Kyocera Prescribe
PRESCR_DRV= gdevprsc-0.3
MASTER_SITES_${PRESCR_DRV}.tar.gz= ${MASTER_SITE_LOCAL}
DISTFILES+= ${PRESCR_DRV}.tar.gz
-EXTRACT_LIST+= ${PRESCR_DRV}.tar.gz
+EXTRACT_ONLY+= ${PRESCR_DRV}.tar.gz
+
+# Samsung SmartGDI laser printers
+GDI_DRV= samsung-gdi-driver
+MASTER_SITES_${GDI_DRV}.tar.gz= http://www.linuxprinting.org/download/printing/
+DISTFILES+= ${GDI_DRV}.tar.gz
+EXTRACT_ONLY+= ${GDI_DRV}.tar.gz
DISTINFO_FILE= ${.CURDIR}/../../print/ghostscript-nox11/distinfo
FILESDIR= ${.CURDIR}/../../print/ghostscript-nox11/files
PATCHDIR= ${.CURDIR}/../../print/ghostscript-nox11/patches
PLIST_SRC= ${.CURDIR}/../../print/ghostscript-nox11/PLIST
-EXTRACT_ONLY= ${GS_SOURCES}
DIST_SUBDIR= ghostscript
-WRKSRC= ${WRKDIR}/gs${GS_VERS}
MAKEFILE= src/unix-gcc.mak
ALL_TARGET= std
.include "../../mk/bsd.prefs.mk"
-.include "../../graphics/png/buildlink.mk"
-.include "../../japanese/vflib-lib/buildlink.mk"
.if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
CFLAGS+= -DA4
.endif
-
CFLAGS+= -DHAVE_MKSTEMP=1
+XLIBS?= # empty
+GS_DISPLAY_DEVICE?= # empty
+
+MAKE_FLAGS+= CFLAGS="${CFLAGS}"
+MAKE_FLAGS+= LDFLAGS="${LDFLAGS}"
+MAKE_FLAGS+= GS_DISPLAY_DEVICE="${GS_DISPLAY_DEVICE}"
+MAKE_FLAGS+= XINCLUDE= # x11.buildlink.mk will handle
+MAKE_FLAGS+= XLIBDIRS= # these two automatically
+MAKE_FLAGS+= XLIBS="${XLIBS}"
+
.if ${OPSYS} == "SunOS"
LDFLAGS+= -L${LOCALBASE}/bsd/lib -Wl,-R${LOCALBASE}/bsd/lib
.endif
-MAKE_ENV+= XLDFLAGS="${LDFLAGS}"
-
# Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point.
# (This is the case on some RISCs with multiple instruction dispatch.)
@@ -121,22 +152,58 @@ MAKE_ENV+= XLDFLAGS="${LDFLAGS}"
# fixed point.
#
FPU_TYPE?= 1
-MAKE_ENV+= FPU_TYPE=${FPU_TYPE}
+MAKE_FLAGS+= FPU_TYPE=${FPU_TYPE}
+
+# Determine the endianness of the CPU by checking header files.
+.if !defined(MACHINE_ENDIAN)
+_ENDIAN_H_FILES= /usr/include/sys/endian.h
+_ENDIAN_H_FILES+= /usr/include/machine/endian.h
+_ENDIAN_H_FILES+= /usr/include/endian.h
+_ENDIAN_H_FILES+= /usr/include/sys/byteorder.h
+_ENDIAN_H_FILES+= /dev/null
+. for FILE in ${_ENDIAN_H_FILES}
+. if exists(${FILE})
+_ENDIAN_H?= ${FILE:S/\/usr\/include\///}
+. endif
+. endfor
+MACHINE_ENDIAN!= \
+ if ( \
+ ${ECHO} "\#include <${_ENDIAN_H}>"; \
+ ${ECHO} "\#ifndef BYTE_ORDER"; \
+ ${ECHO} "\#ifdef _BIG_ENDIAN"; \
+ ${ECHO} "\#define BYTE_ORDER 4321"; \
+ ${ECHO} "\#else"; \
+ ${ECHO} "\#define BYTE_ORDER 1234"; \
+ ${ECHO} "\#endif"; \
+ ${ECHO} "\#endif"; \
+ ${ECHO} "BYTE_ORDER"; \
+ ) | ${CC} -E - | ${GREP} "4321" >/dev/null 2>&1; \
+ then \
+ ${ECHO} big; \
+ else \
+ ${ECHO} little; \
+ fi
+MAKEFLAGS+= MACHINE_ENDIAN="${MACHINE_ENDIAN}"
+. endif
-.if defined(USE_X11)
-MAKEFRAGS= ${FILESDIR}/devs.x11
+.if defined(MACHINE_ENDIAN) && (${MACHINE_ENDIAN} == "little")
+HPIJS_CFLAGS+= -DIS_LITTLE_ENDIAN
+MAKE_ENV+= HPIJS_CFLAGS="${HPIJS_CFLAGS}"
.endif
-MAKEFRAGS+= ${FILESDIR}/devs.nox11
-GSINST_DIR= ${PREFIX}/share/ghostscript/${GS_VERS}vflib
-DOC_DIR= ${PREFIX}/share/doc/ghostscript
-HTML_DIR= ${PREFIX}/share/doc/html/ghostscript
-LIB_DIR= ${GSINST_DIR}/lib
+PLIST_SUBST+= GS_VERS=${GS_VERS}vflib
-post-extract:
- @cd ${WRKDIR}; for file in ${EXTRACT_LIST}; do \
- ${PAX} -zrf ${_DISTDIR}/$${file}; \
- done
+MAKEFRAGS= ${FILESDIR}/devs.nox11
+REPLACE_PERL= lib/fixmswrd.pl
+
+GSDATADIR= ${PREFIX}/share/ghostscript/${GS_VERS}vflib
+DOCDIR= ${PREFIX}/share/doc/ghostscript
+HTMLDIR= ${PREFIX}/share/doc/html/ghostscript
+LIBDIR= ${GSDATADIR}/lib
+
+GS_CONF_PREREQ= # empty
+
+contrib-drivers:
cd ${WRKSRC}/src; ${PAX} -rf ${WRKDIR}/${HPDJ_DRV}/hpdj.tar
${MV} ${WRKSRC}/src/gs-hpdj.1 ${WRKSRC}/man
cd ${WRKDIR}; ${CP} gdevdmpr.c gdevdmpr.mak ${WRKSRC}/src
@@ -151,21 +218,60 @@ post-extract:
${CP} gdevmd2k.c gdevmd2k.mak-5.8x ${WRKSRC}/src
cd ${WRKDIR}/${PRESCR_DRV}; \
${CP} gdevprsc.c gdevprsc.mak ${WRKSRC}/src
+ cd ${WRKDIR}; ${CP} gdevgdi.c ${WRKSRC}/src
+post-extract: contrib-drivers
${RM} -f ${WRKSRC}/jpeg
- ${LN} -sf ${WRKDIR}/jpeg-6b ${WRKSRC}/jpeg
+ ${LN} -s ${JPEG_WRKSRC} ${WRKSRC}/jpeg
${RM} -f ${WRKSRC}/lib/${PDF_SEC}
${LN} -s ${_DISTDIR}/${PDF_SEC} ${WRKSRC}/lib/${PDF_SEC}
- ${MV} ${WRKSRC}/lib/fixmswrd.pl ${WRKSRC}/lib/fixmswrd.pl.in
post-patch:
if [ ! -f ${WRKDIR}/dmp_site.ps.bak ]; then \
${MV} ${WRKDIR}/dmp_site.ps ${WRKDIR}/dmp_site.ps.bak; \
fi
- ${SED} -e "s|epsimage\.src|${GSINST_DIR}/lib/escp_24.src|g" \
+ ${SED} -e "s|epsimage\.src|${GSDATADIR}/lib/escp_24.src|g" \
${WRKDIR}/dmp_site.ps.bak > ${WRKDIR}/dmp_site.ps
-do-configure:
+GS_CONF_PREREQ+= hpijs-driver
+hpijs-driver:
+ @cd ${HPIJS_WRKSRC} && \
+ ${CP} gdevhpij.* ${WRKSRC}/src && \
+ ${HEAD} -474 contrib.mak | ${TAIL} -31 | \
+ ${SED} -e "s|\$$(GLSRC)\([^ ]*\.dev\)|\$$(DD)\1|g" \
+ -e "s|\(\$$(SETPDEV) \)|\1\$$(DD)|g" \
+ >> ${WRKSRC}/src/contrib.mak
+
+hpijs-server:
+ @cd ${HPIJS_WRKSRC} && \
+ for file in \
+ aladdin.h compression.cpp \
+ ernieplatform.h versioncode.cpp; \
+ do \
+ ${SED} -e "s|_LITTLE_ENDIAN|IS_LITTLE_ENDIAN|g" \
+ $${file} > $${file}.fixed; \
+ ${MV} -f $${file}.fixed $${file}; \
+ done
+ @cd ${HPIJS_WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} default
+
+GS_CONF_PREREQ+= gimpprint-driver
+gimpprint-driver:
+ @cd ${GIMPPRINT_WRKSRC} && \
+ ${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
+ ${CONFIGURE_ENV} \
+ ${CONFIGURE_SCRIPT} ${GIMPPRINT_CONFIGURE_ARGS} && \
+ cd ${GIMPPRINT_WRKSRC}/src/ghost && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} all-local && \
+ ( ${ECHO} '#ifndef GIMPPRINT_VERSION_FIX'; \
+ ${ECHO} '#define GIMPPRINT_VERSION_FIX'; \
+ ${GREP} "#define \(VERSION\|RELEASE_DATE\)" ../../config.h; \
+ ${ECHO} '#endif /* GIMPPRINT_VERSION_FIX */'; \
+ ) >> gdevstp-print.h; \
+ ${CP} *.c *.h ${WRKSRC}/src && \
+ ${CAT} contrib.mak.addon.old >> ${WRKSRC}/src/contrib.mak
+
+do-configure: ${GS_CONF_PREREQ}
#
# Append build rules for extra drivers to contrib.mak
#
@@ -182,35 +288,39 @@ do-configure:
#
# Prepend device list to unix-gcc.mak
#
- ${CAT} ${MAKEFRAGS} \
- ${WRKSRC}/src/unix-gcc.mak \
- > ${WRKDIR}/unix-gcc.mak
+ ( if [ -n "${GS_DISPLAY_DEVICE:Q}" ]; then \
+ ${ECHO} 'DEVICE_DEVS= $$(DD)${GS_DISPLAY_DEVICE}'; \
+ ${ECHO} ''; \
+ fi; \
+ ${CAT} ${MAKEFRAGS} ${WRKSRC}/src/unix-gcc.mak \
+ ) > ${WRKDIR}/unix-gcc.mak
${MV} -f ${WRKDIR}/unix-gcc.mak ${WRKSRC}/src
- ${SED} -e "s|@PERL@|${PERL5}|g" \
- ${WRKSRC}/lib/fixmswrd.pl.in > ${WRKSRC}/lib/fixmswrd.pl
+post-build: hpijs-server
post-install:
strip ${PREFIX}/bin/gs
- ${INSTALL_DATA_DIR} ${DOC_DIR}
- ${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${HTML_DIR}
- ${INSTALL_DATA} ${WRKDIR}/${BJ10V_DRV}/gdev10v.jis ${DOC_DIR}
- ${INSTALL_DATA} ${WRKDIR}/gdevdmpr.sj ${DOC_DIR}
- ${INSTALL_DATA} ${WRKDIR}/dmp_init.ps ${LIB_DIR}
- ${INSTALL_DATA} ${WRKDIR}/dmp_site.ps ${LIB_DIR}
- ${INSTALL_DATA} ${WRKDIR}/escp_24.src ${LIB_DIR}
- ${INSTALL_DATA} ${WRKDIR}/testpage.ps ${LIB_DIR}
- ${INSTALL_DATA} ${WRKDIR}/${PRESCR_DRV}/gdevprsc.?? ${DOC_DIR}
- ${INSTALL_DATA_DIR} ${DOC_DIR}/${MJC_DRV}
- ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mjc ${DOC_DIR}/${MJC_DRV}
- ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.noz ${DOC_DIR}/${MJC_DRV}
- ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mje ${DOC_DIR}/${MJC_DRV}
- ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOC_DIR}/${MJC_DRV}
- ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOC_DIR}/${MJC_DRV}
-
-.include "../../mk/bsd.pkg.mk"
-
-# arm32 compiler has an optimizer problem
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
-CFLAGS+= -O0
-.endif
+ ${INSTALL_PROGRAM} ${HPIJS_WRKSRC}/hpijs ${PREFIX}/bin
+ ${INSTALL_DATA_DIR} ${DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${LIPS_DRV}/Gdevlips.htm ${HTMLDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${BJ10V_DRV}/gdev10v.jis ${DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/gdevdmpr.sj ${DOCDIR}
+ ${INSTALL_DATA} ${WRKDIR}/dmp_init.ps ${LIBDIR}
+ ${INSTALL_DATA} ${WRKDIR}/dmp_site.ps ${LIBDIR}
+ ${INSTALL_DATA} ${WRKDIR}/escp_24.src ${LIBDIR}
+ ${INSTALL_DATA} ${WRKDIR}/testpage.ps ${LIBDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PRESCR_DRV}/gdevprsc.?? ${DOCDIR}
+ ${INSTALL_DATA_DIR} ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mjc ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.noz ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/README.mje ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/cpem.doc ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA} ${WRKDIR}/${MJC_DRV}/MJ700V2C.FAQ ${DOCDIR}/${MJC_DRV}
+ ${INSTALL_DATA_DIR} ${HTMLDIR}/hpijs
+ ${INSTALL_DATA} ${HPIJS_WRKSRC}/append_db.sh ${HTMLDIR}/hpijs
+ ${INSTALL_DATA} ${HPIJS_WRKSRC}/printerdb_append ${HTMLDIR}/hpijs
+ ${INSTALL_DATA} ${HPIJS_WRKSRC}/hpijs_readme.html ${HTMLDIR}/hpijs
+ ${INSTALL_DATA} ${HPIJS_WRKSRC}/*.jpg ${HTMLDIR}/hpijs
+
+.include "../../graphics/png/buildlink.mk"
+.include "../../japanese/vflib-lib/buildlink.mk"
diff --git a/print/ghostscript-nox11/PLIST b/print/ghostscript-nox11/PLIST
index 109eeb039c3..0ae1b4461f4 100644
--- a/print/ghostscript-nox11/PLIST
+++ b/print/ghostscript-nox11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/20 22:31:09 jlam Exp $
bin/bdftops
bin/dvipdf
bin/eps2eps
@@ -11,6 +11,7 @@ bin/gsdj500
bin/gslj
bin/gslp
bin/gsnd
+bin/hpijs
bin/lprsetup.sh
bin/pdf2dsc
bin/pdf2ps
@@ -100,6 +101,16 @@ share/doc/html/ghostscript/Tester.htm
share/doc/html/ghostscript/Unix-lpr.htm
share/doc/html/ghostscript/Use.htm
share/doc/html/ghostscript/Xfonts.htm
+share/doc/html/ghostscript/hpijs/append_db.sh
+share/doc/html/ghostscript/hpijs/hpijs_readme.html
+share/doc/html/ghostscript/hpijs/gs_apdk.jpg
+share/doc/html/ghostscript/hpijs/printtool.jpg
+share/doc/html/ghostscript/hpijs/printtool2.jpg
+share/doc/html/ghostscript/hpijs/printtool3.jpg
+share/doc/html/ghostscript/hpijs/printtool4.jpg
+share/doc/html/ghostscript/hpijs/printtool5.jpg
+share/doc/html/ghostscript/hpijs/printtool7.jpg
+share/doc/html/ghostscript/hpijs/printerdb_append
share/doc/html/ghostscript/ps2epsi.txt
share/examples/ghostscript/alphabet.ps
share/examples/ghostscript/cheq.ps
@@ -114,207 +125,208 @@ share/examples/ghostscript/snowflak.ps
share/examples/ghostscript/tiger.ps
share/examples/ghostscript/vasarely.ps
share/examples/ghostscript/waterfal.ps
-share/ghostscript/6.01vflib/lib/Fontmap
-share/ghostscript/6.01vflib/lib/Fontmap.GS
-share/ghostscript/6.01vflib/lib/acctest.ps
-share/ghostscript/6.01vflib/lib/addxchar.ps
-share/ghostscript/6.01vflib/lib/align.ps
-share/ghostscript/6.01vflib/lib/bdftops.ps
-share/ghostscript/6.01vflib/lib/bjc610a0.upp
-share/ghostscript/6.01vflib/lib/bjc610a1.upp
-share/ghostscript/6.01vflib/lib/bjc610a2.upp
-share/ghostscript/6.01vflib/lib/bjc610a3.upp
-share/ghostscript/6.01vflib/lib/bjc610a4.upp
-share/ghostscript/6.01vflib/lib/bjc610a5.upp
-share/ghostscript/6.01vflib/lib/bjc610a6.upp
-share/ghostscript/6.01vflib/lib/bjc610a7.upp
-share/ghostscript/6.01vflib/lib/bjc610a8.upp
-share/ghostscript/6.01vflib/lib/bjc610b1.upp
-share/ghostscript/6.01vflib/lib/bjc610b2.upp
-share/ghostscript/6.01vflib/lib/bjc610b3.upp
-share/ghostscript/6.01vflib/lib/bjc610b4.upp
-share/ghostscript/6.01vflib/lib/bjc610b6.upp
-share/ghostscript/6.01vflib/lib/bjc610b7.upp
-share/ghostscript/6.01vflib/lib/bjc610b8.upp
-share/ghostscript/6.01vflib/lib/caption.ps
-share/ghostscript/6.01vflib/lib/cbjc600.ppd
-share/ghostscript/6.01vflib/lib/cbjc800.ppd
-share/ghostscript/6.01vflib/lib/cdj550.upp
-share/ghostscript/6.01vflib/lib/cdj690.upp
-share/ghostscript/6.01vflib/lib/cdj690ec.upp
-share/ghostscript/6.01vflib/lib/cid2code.ps
-share/ghostscript/6.01vflib/lib/decrypt.ps
-share/ghostscript/6.01vflib/lib/dmp_init.ps
-share/ghostscript/6.01vflib/lib/dmp_site.ps
-share/ghostscript/6.01vflib/lib/dnj750c.upp
-share/ghostscript/6.01vflib/lib/dnj750m.upp
-share/ghostscript/6.01vflib/lib/docie.ps
-share/ghostscript/6.01vflib/lib/errpage.ps
-share/ghostscript/6.01vflib/lib/escp_24.src
-share/ghostscript/6.01vflib/lib/font2c.ps
-share/ghostscript/6.01vflib/lib/font2pcl.ps
-share/ghostscript/6.01vflib/lib/gs_btokn.ps
-share/ghostscript/6.01vflib/lib/gs_ccfnt.ps
-share/ghostscript/6.01vflib/lib/gs_ce_e.ps
-share/ghostscript/6.01vflib/lib/gs_cff.ps
-share/ghostscript/6.01vflib/lib/gs_cidfn.ps
-share/ghostscript/6.01vflib/lib/gs_cmap.ps
-share/ghostscript/6.01vflib/lib/gs_cmdl.ps
-share/ghostscript/6.01vflib/lib/gs_dbt_e.ps
-share/ghostscript/6.01vflib/lib/gs_diskf.ps
-share/ghostscript/6.01vflib/lib/gs_dpnxt.ps
-share/ghostscript/6.01vflib/lib/gs_dps.ps
-share/ghostscript/6.01vflib/lib/gs_dps1.ps
-share/ghostscript/6.01vflib/lib/gs_dps2.ps
-share/ghostscript/6.01vflib/lib/gs_epsf.ps
-share/ghostscript/6.01vflib/lib/gs_fform.ps
-share/ghostscript/6.01vflib/lib/gs_fonts.ps
-share/ghostscript/6.01vflib/lib/gs_il1_e.ps
-share/ghostscript/6.01vflib/lib/gs_il2_e.ps
-share/ghostscript/6.01vflib/lib/gs_init.ps
-share/ghostscript/6.01vflib/lib/gs_kanji.ps
-share/ghostscript/6.01vflib/lib/gs_ksb_e.ps
-share/ghostscript/6.01vflib/lib/gs_l.xbm
-share/ghostscript/6.01vflib/lib/gs_l.xpm
-share/ghostscript/6.01vflib/lib/gs_l2img.ps
-share/ghostscript/6.01vflib/lib/gs_l_m.xbm
-share/ghostscript/6.01vflib/lib/gs_lev2.ps
-share/ghostscript/6.01vflib/lib/gs_lgo_e.ps
-share/ghostscript/6.01vflib/lib/gs_lgx_e.ps
-share/ghostscript/6.01vflib/lib/gs_ll3.ps
-share/ghostscript/6.01vflib/lib/gs_m.xbm
-share/ghostscript/6.01vflib/lib/gs_m.xpm
-share/ghostscript/6.01vflib/lib/gs_m_m.xbm
-share/ghostscript/6.01vflib/lib/gs_mex_e.ps
-share/ghostscript/6.01vflib/lib/gs_mgl_e.ps
-share/ghostscript/6.01vflib/lib/gs_mro_e.ps
-share/ghostscript/6.01vflib/lib/gs_pdf_e.ps
-share/ghostscript/6.01vflib/lib/gs_pdfwr.ps
-share/ghostscript/6.01vflib/lib/gs_pfile.ps
-share/ghostscript/6.01vflib/lib/gs_rdlin.ps
-share/ghostscript/6.01vflib/lib/gs_res.ps
-share/ghostscript/6.01vflib/lib/gs_s.xbm
-share/ghostscript/6.01vflib/lib/gs_s.xpm
-share/ghostscript/6.01vflib/lib/gs_s_m.xbm
-share/ghostscript/6.01vflib/lib/gs_setpd.ps
-share/ghostscript/6.01vflib/lib/gs_statd.ps
-share/ghostscript/6.01vflib/lib/gs_std_e.ps
-share/ghostscript/6.01vflib/lib/gs_sym_e.ps
-share/ghostscript/6.01vflib/lib/gs_t.xbm
-share/ghostscript/6.01vflib/lib/gs_t.xpm
-share/ghostscript/6.01vflib/lib/gs_t_m.xbm
-share/ghostscript/6.01vflib/lib/gs_trap.ps
-share/ghostscript/6.01vflib/lib/gs_ttf.ps
-share/ghostscript/6.01vflib/lib/gs_typ32.ps
-share/ghostscript/6.01vflib/lib/gs_typ42.ps
-share/ghostscript/6.01vflib/lib/gs_type1.ps
-share/ghostscript/6.01vflib/lib/gs_wan_e.ps
-share/ghostscript/6.01vflib/lib/gs_wl1_e.ps
-share/ghostscript/6.01vflib/lib/gs_wl2_e.ps
-share/ghostscript/6.01vflib/lib/gs_wl5_e.ps
-share/ghostscript/6.01vflib/lib/gslp.ps
-share/ghostscript/6.01vflib/lib/gsnup.ps
-share/ghostscript/6.01vflib/lib/ht_ccsto.ps
-share/ghostscript/6.01vflib/lib/image-qa.ps
-share/ghostscript/6.01vflib/lib/impath.ps
-share/ghostscript/6.01vflib/lib/jispaper.ps
-share/ghostscript/6.01vflib/lib/landscap.ps
-share/ghostscript/6.01vflib/lib/level1.ps
-share/ghostscript/6.01vflib/lib/lines.ps
-share/ghostscript/6.01vflib/lib/markhint.ps
-share/ghostscript/6.01vflib/lib/markpath.ps
-share/ghostscript/6.01vflib/lib/necp2x.upp
-share/ghostscript/6.01vflib/lib/necp2x6.upp
-share/ghostscript/6.01vflib/lib/packfile.ps
-share/ghostscript/6.01vflib/lib/pcharstr.ps
-share/ghostscript/6.01vflib/lib/pdf2dsc.ps
-share/ghostscript/6.01vflib/lib/pdf_base.ps
-share/ghostscript/6.01vflib/lib/pdf_draw.ps
-share/ghostscript/6.01vflib/lib/pdf_font.ps
-share/ghostscript/6.01vflib/lib/pdf_main.ps
-share/ghostscript/6.01vflib/lib/pdf_ops.ps
-share/ghostscript/6.01vflib/lib/pdf_sec.ps
-share/ghostscript/6.01vflib/lib/pdfeof.ps
-share/ghostscript/6.01vflib/lib/pf2afm.ps
-share/ghostscript/6.01vflib/lib/pfbtopfa.ps
-share/ghostscript/6.01vflib/lib/ppath.ps
-share/ghostscript/6.01vflib/lib/prfont.ps
-share/ghostscript/6.01vflib/lib/printafm.ps
-share/ghostscript/6.01vflib/lib/ps2ai.ps
-share/ghostscript/6.01vflib/lib/ps2ascii.ps
-share/ghostscript/6.01vflib/lib/ps2epsi.ps
-share/ghostscript/6.01vflib/lib/quit.ps
-share/ghostscript/6.01vflib/lib/ras1.upp
-share/ghostscript/6.01vflib/lib/ras24.upp
-share/ghostscript/6.01vflib/lib/ras3.upp
-share/ghostscript/6.01vflib/lib/ras32.upp
-share/ghostscript/6.01vflib/lib/ras4.upp
-share/ghostscript/6.01vflib/lib/ras8m.upp
-share/ghostscript/6.01vflib/lib/rollconv.ps
-share/ghostscript/6.01vflib/lib/showchar.ps
-share/ghostscript/6.01vflib/lib/showpage.ps
-share/ghostscript/6.01vflib/lib/stc.upp
-share/ghostscript/6.01vflib/lib/stc1520h.upp
-share/ghostscript/6.01vflib/lib/stc2.upp
-share/ghostscript/6.01vflib/lib/stc200_h.upp
-share/ghostscript/6.01vflib/lib/stc2_h.upp
-share/ghostscript/6.01vflib/lib/stc2s_h.upp
-share/ghostscript/6.01vflib/lib/stc500p.upp
-share/ghostscript/6.01vflib/lib/stc500ph.upp
-share/ghostscript/6.01vflib/lib/stc600ih.upp
-share/ghostscript/6.01vflib/lib/stc600p.upp
-share/ghostscript/6.01vflib/lib/stc600pl.upp
-share/ghostscript/6.01vflib/lib/stc640p.upp
-share/ghostscript/6.01vflib/lib/stc800ih.upp
-share/ghostscript/6.01vflib/lib/stc800p.upp
-share/ghostscript/6.01vflib/lib/stc800pl.upp
-share/ghostscript/6.01vflib/lib/stc_h.upp
-share/ghostscript/6.01vflib/lib/stc_l.upp
-share/ghostscript/6.01vflib/lib/stcany.upp
-share/ghostscript/6.01vflib/lib/stcany_h.upp
-share/ghostscript/6.01vflib/lib/stcinfo.ps
-share/ghostscript/6.01vflib/lib/stcolor.ps
-share/ghostscript/6.01vflib/lib/stocht.ps
-share/ghostscript/6.01vflib/lib/testpage.ps
-share/ghostscript/6.01vflib/lib/traceimg.ps
-share/ghostscript/6.01vflib/lib/traceop.ps
-share/ghostscript/6.01vflib/lib/type1enc.ps
-share/ghostscript/6.01vflib/lib/type1ops.ps
-share/ghostscript/6.01vflib/lib/uninfo.ps
-share/ghostscript/6.01vflib/lib/unprot.ps
-share/ghostscript/6.01vflib/lib/viewcmyk.ps
-share/ghostscript/6.01vflib/lib/viewgif.ps
-share/ghostscript/6.01vflib/lib/viewjpeg.ps
-share/ghostscript/6.01vflib/lib/viewmiff.ps
-share/ghostscript/6.01vflib/lib/viewpbm.ps
-share/ghostscript/6.01vflib/lib/viewpcx.ps
-share/ghostscript/6.01vflib/lib/viewps2a.ps
-share/ghostscript/6.01vflib/lib/wftopfa.ps
-share/ghostscript/6.01vflib/lib/winmaps.ps
-share/ghostscript/6.01vflib/lib/wrfont.ps
-share/ghostscript/6.01vflib/lib/zeroline.ps
-share/ghostscript/6.01vflib/vflib/allkanji.ps
-share/ghostscript/6.01vflib/vflib/article9.ps
-share/ghostscript/6.01vflib/vflib/fmaptype.ps
-share/ghostscript/6.01vflib/vflib/hankaku.ps
-share/ghostscript/6.01vflib/vflib/jcidcmap.ps
-share/ghostscript/6.01vflib/vflib/jcidemu.ps
-share/ghostscript/6.01vflib/vflib/jcidinit.ps
-share/ghostscript/6.01vflib/vflib/jcidjp1.ps
-share/ghostscript/6.01vflib/vflib/kbase.ps
-share/ghostscript/6.01vflib/vflib/kcomp.ps
-share/ghostscript/6.01vflib/vflib/kconfig.ps
-share/ghostscript/6.01vflib/vflib/kfcid.ps
-share/ghostscript/6.01vflib/vflib/kfvflib.ps
-share/ghostscript/6.01vflib/vflib/kinit.ps
-share/ghostscript/6.01vflib/vflib/kmapping.ps
-share/ghostscript/6.01vflib/vflib/koutline.ps
-share/ghostscript/6.01vflib/vflib/metrics2.ps
-share/ghostscript/6.01vflib/vflib/vchars.ps
-@dirrm share/ghostscript/6.01vflib/vflib
-@dirrm share/ghostscript/6.01vflib/lib
-@dirrm share/ghostscript/6.01vflib
+share/ghostscript/${GS_VERS}/lib/Fontmap
+share/ghostscript/${GS_VERS}/lib/Fontmap.GS
+share/ghostscript/${GS_VERS}/lib/acctest.ps
+share/ghostscript/${GS_VERS}/lib/addxchar.ps
+share/ghostscript/${GS_VERS}/lib/align.ps
+share/ghostscript/${GS_VERS}/lib/bdftops.ps
+share/ghostscript/${GS_VERS}/lib/bjc610a0.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a1.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a2.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a3.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a4.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a5.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a6.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a7.upp
+share/ghostscript/${GS_VERS}/lib/bjc610a8.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b1.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b2.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b3.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b4.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b6.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b7.upp
+share/ghostscript/${GS_VERS}/lib/bjc610b8.upp
+share/ghostscript/${GS_VERS}/lib/caption.ps
+share/ghostscript/${GS_VERS}/lib/cbjc600.ppd
+share/ghostscript/${GS_VERS}/lib/cbjc800.ppd
+share/ghostscript/${GS_VERS}/lib/cdj550.upp
+share/ghostscript/${GS_VERS}/lib/cdj690.upp
+share/ghostscript/${GS_VERS}/lib/cdj690ec.upp
+share/ghostscript/${GS_VERS}/lib/cid2code.ps
+share/ghostscript/${GS_VERS}/lib/decrypt.ps
+share/ghostscript/${GS_VERS}/lib/dmp_init.ps
+share/ghostscript/${GS_VERS}/lib/dmp_site.ps
+share/ghostscript/${GS_VERS}/lib/dnj750c.upp
+share/ghostscript/${GS_VERS}/lib/dnj750m.upp
+share/ghostscript/${GS_VERS}/lib/docie.ps
+share/ghostscript/${GS_VERS}/lib/errpage.ps
+share/ghostscript/${GS_VERS}/lib/escp_24.src
+share/ghostscript/${GS_VERS}/lib/font2c.ps
+share/ghostscript/${GS_VERS}/lib/font2pcl.ps
+share/ghostscript/${GS_VERS}/lib/gs_btokn.ps
+share/ghostscript/${GS_VERS}/lib/gs_ccfnt.ps
+share/ghostscript/${GS_VERS}/lib/gs_ce_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_cff.ps
+share/ghostscript/${GS_VERS}/lib/gs_cidfn.ps
+share/ghostscript/${GS_VERS}/lib/gs_cmap.ps
+share/ghostscript/${GS_VERS}/lib/gs_cmdl.ps
+share/ghostscript/${GS_VERS}/lib/gs_dbt_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_diskf.ps
+share/ghostscript/${GS_VERS}/lib/gs_dpnxt.ps
+share/ghostscript/${GS_VERS}/lib/gs_dps.ps
+share/ghostscript/${GS_VERS}/lib/gs_dps1.ps
+share/ghostscript/${GS_VERS}/lib/gs_dps2.ps
+share/ghostscript/${GS_VERS}/lib/gs_epsf.ps
+share/ghostscript/${GS_VERS}/lib/gs_fform.ps
+share/ghostscript/${GS_VERS}/lib/gs_fonts.ps
+share/ghostscript/${GS_VERS}/lib/gs_il1_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_il2_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_init.ps
+share/ghostscript/${GS_VERS}/lib/gs_kanji.ps
+share/ghostscript/${GS_VERS}/lib/gs_ksb_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_l.xbm
+share/ghostscript/${GS_VERS}/lib/gs_l.xpm
+share/ghostscript/${GS_VERS}/lib/gs_l2img.ps
+share/ghostscript/${GS_VERS}/lib/gs_l_m.xbm
+share/ghostscript/${GS_VERS}/lib/gs_lev2.ps
+share/ghostscript/${GS_VERS}/lib/gs_lgo_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_lgx_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_ll3.ps
+share/ghostscript/${GS_VERS}/lib/gs_m.xbm
+share/ghostscript/${GS_VERS}/lib/gs_m.xpm
+share/ghostscript/${GS_VERS}/lib/gs_m_m.xbm
+share/ghostscript/${GS_VERS}/lib/gs_mex_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_mgl_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_mro_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_pdf_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_pdfwr.ps
+share/ghostscript/${GS_VERS}/lib/gs_pfile.ps
+share/ghostscript/${GS_VERS}/lib/gs_rdlin.ps
+share/ghostscript/${GS_VERS}/lib/gs_res.ps
+share/ghostscript/${GS_VERS}/lib/gs_s.xbm
+share/ghostscript/${GS_VERS}/lib/gs_s.xpm
+share/ghostscript/${GS_VERS}/lib/gs_s_m.xbm
+share/ghostscript/${GS_VERS}/lib/gs_setpd.ps
+share/ghostscript/${GS_VERS}/lib/gs_statd.ps
+share/ghostscript/${GS_VERS}/lib/gs_std_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_sym_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_t.xbm
+share/ghostscript/${GS_VERS}/lib/gs_t.xpm
+share/ghostscript/${GS_VERS}/lib/gs_t_m.xbm
+share/ghostscript/${GS_VERS}/lib/gs_trap.ps
+share/ghostscript/${GS_VERS}/lib/gs_ttf.ps
+share/ghostscript/${GS_VERS}/lib/gs_typ32.ps
+share/ghostscript/${GS_VERS}/lib/gs_typ42.ps
+share/ghostscript/${GS_VERS}/lib/gs_type1.ps
+share/ghostscript/${GS_VERS}/lib/gs_wan_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_wl1_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_wl2_e.ps
+share/ghostscript/${GS_VERS}/lib/gs_wl5_e.ps
+share/ghostscript/${GS_VERS}/lib/gslp.ps
+share/ghostscript/${GS_VERS}/lib/gsnup.ps
+share/ghostscript/${GS_VERS}/lib/ht_ccsto.ps
+share/ghostscript/${GS_VERS}/lib/image-qa.ps
+share/ghostscript/${GS_VERS}/lib/impath.ps
+share/ghostscript/${GS_VERS}/lib/jispaper.ps
+share/ghostscript/${GS_VERS}/lib/landscap.ps
+share/ghostscript/${GS_VERS}/lib/level1.ps
+share/ghostscript/${GS_VERS}/lib/lines.ps
+share/ghostscript/${GS_VERS}/lib/markhint.ps
+share/ghostscript/${GS_VERS}/lib/markpath.ps
+share/ghostscript/${GS_VERS}/lib/necp2x.upp
+share/ghostscript/${GS_VERS}/lib/necp2x6.upp
+share/ghostscript/${GS_VERS}/lib/packfile.ps
+share/ghostscript/${GS_VERS}/lib/pcharstr.ps
+share/ghostscript/${GS_VERS}/lib/pdf2dsc.ps
+share/ghostscript/${GS_VERS}/lib/pdf_base.ps
+share/ghostscript/${GS_VERS}/lib/pdf_draw.ps
+share/ghostscript/${GS_VERS}/lib/pdf_font.ps
+share/ghostscript/${GS_VERS}/lib/pdf_main.ps
+share/ghostscript/${GS_VERS}/lib/pdf_ops.ps
+share/ghostscript/${GS_VERS}/lib/pdf_sec.ps
+share/ghostscript/${GS_VERS}/lib/pdfeof.ps
+share/ghostscript/${GS_VERS}/lib/pf2afm.ps
+share/ghostscript/${GS_VERS}/lib/pfbtopfa.ps
+share/ghostscript/${GS_VERS}/lib/ppath.ps
+share/ghostscript/${GS_VERS}/lib/prfont.ps
+share/ghostscript/${GS_VERS}/lib/printafm.ps
+share/ghostscript/${GS_VERS}/lib/ps2ai.ps
+share/ghostscript/${GS_VERS}/lib/ps2ascii.ps
+share/ghostscript/${GS_VERS}/lib/ps2epsi.ps
+share/ghostscript/${GS_VERS}/lib/quit.ps
+share/ghostscript/${GS_VERS}/lib/ras1.upp
+share/ghostscript/${GS_VERS}/lib/ras24.upp
+share/ghostscript/${GS_VERS}/lib/ras3.upp
+share/ghostscript/${GS_VERS}/lib/ras32.upp
+share/ghostscript/${GS_VERS}/lib/ras4.upp
+share/ghostscript/${GS_VERS}/lib/ras8m.upp
+share/ghostscript/${GS_VERS}/lib/rollconv.ps
+share/ghostscript/${GS_VERS}/lib/showchar.ps
+share/ghostscript/${GS_VERS}/lib/showpage.ps
+share/ghostscript/${GS_VERS}/lib/stc.upp
+share/ghostscript/${GS_VERS}/lib/stc1520h.upp
+share/ghostscript/${GS_VERS}/lib/stc2.upp
+share/ghostscript/${GS_VERS}/lib/stc200_h.upp
+share/ghostscript/${GS_VERS}/lib/stc2_h.upp
+share/ghostscript/${GS_VERS}/lib/stc2s_h.upp
+share/ghostscript/${GS_VERS}/lib/stc500p.upp
+share/ghostscript/${GS_VERS}/lib/stc500ph.upp
+share/ghostscript/${GS_VERS}/lib/stc600ih.upp
+share/ghostscript/${GS_VERS}/lib/stc600p.upp
+share/ghostscript/${GS_VERS}/lib/stc600pl.upp
+share/ghostscript/${GS_VERS}/lib/stc640p.upp
+share/ghostscript/${GS_VERS}/lib/stc800ih.upp
+share/ghostscript/${GS_VERS}/lib/stc800p.upp
+share/ghostscript/${GS_VERS}/lib/stc800pl.upp
+share/ghostscript/${GS_VERS}/lib/stc_h.upp
+share/ghostscript/${GS_VERS}/lib/stc_l.upp
+share/ghostscript/${GS_VERS}/lib/stcany.upp
+share/ghostscript/${GS_VERS}/lib/stcany_h.upp
+share/ghostscript/${GS_VERS}/lib/stcinfo.ps
+share/ghostscript/${GS_VERS}/lib/stcolor.ps
+share/ghostscript/${GS_VERS}/lib/stocht.ps
+share/ghostscript/${GS_VERS}/lib/testpage.ps
+share/ghostscript/${GS_VERS}/lib/traceimg.ps
+share/ghostscript/${GS_VERS}/lib/traceop.ps
+share/ghostscript/${GS_VERS}/lib/type1enc.ps
+share/ghostscript/${GS_VERS}/lib/type1ops.ps
+share/ghostscript/${GS_VERS}/lib/uninfo.ps
+share/ghostscript/${GS_VERS}/lib/unprot.ps
+share/ghostscript/${GS_VERS}/lib/viewcmyk.ps
+share/ghostscript/${GS_VERS}/lib/viewgif.ps
+share/ghostscript/${GS_VERS}/lib/viewjpeg.ps
+share/ghostscript/${GS_VERS}/lib/viewmiff.ps
+share/ghostscript/${GS_VERS}/lib/viewpbm.ps
+share/ghostscript/${GS_VERS}/lib/viewpcx.ps
+share/ghostscript/${GS_VERS}/lib/viewps2a.ps
+share/ghostscript/${GS_VERS}/lib/wftopfa.ps
+share/ghostscript/${GS_VERS}/lib/winmaps.ps
+share/ghostscript/${GS_VERS}/lib/wrfont.ps
+share/ghostscript/${GS_VERS}/lib/zeroline.ps
+share/ghostscript/${GS_VERS}/vflib/allkanji.ps
+share/ghostscript/${GS_VERS}/vflib/article9.ps
+share/ghostscript/${GS_VERS}/vflib/fmaptype.ps
+share/ghostscript/${GS_VERS}/vflib/hankaku.ps
+share/ghostscript/${GS_VERS}/vflib/jcidcmap.ps
+share/ghostscript/${GS_VERS}/vflib/jcidemu.ps
+share/ghostscript/${GS_VERS}/vflib/jcidinit.ps
+share/ghostscript/${GS_VERS}/vflib/jcidjp1.ps
+share/ghostscript/${GS_VERS}/vflib/kbase.ps
+share/ghostscript/${GS_VERS}/vflib/kcomp.ps
+share/ghostscript/${GS_VERS}/vflib/kconfig.ps
+share/ghostscript/${GS_VERS}/vflib/kfcid.ps
+share/ghostscript/${GS_VERS}/vflib/kfvflib.ps
+share/ghostscript/${GS_VERS}/vflib/kinit.ps
+share/ghostscript/${GS_VERS}/vflib/kmapping.ps
+share/ghostscript/${GS_VERS}/vflib/koutline.ps
+share/ghostscript/${GS_VERS}/vflib/metrics2.ps
+share/ghostscript/${GS_VERS}/vflib/vchars.ps
+@dirrm share/ghostscript/${GS_VERS}/vflib
+@dirrm share/ghostscript/${GS_VERS}/lib
+@dirrm share/ghostscript/${GS_VERS}
@dirrm share/examples/ghostscript
+@dirrm share/doc/html/ghostscript/hpijs
@dirrm share/doc/html/ghostscript
@dirrm share/doc/ghostscript/gdevmjc-0.8
@dirrm share/doc/ghostscript
diff --git a/print/ghostscript-nox11/distinfo b/print/ghostscript-nox11/distinfo
index 826da20f77c..bb3d6fa274f 100644
--- a/print/ghostscript-nox11/distinfo
+++ b/print/ghostscript-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2001/08/29 12:51:26 itohy Exp $
+$NetBSD: distinfo,v 1.7 2001/12/20 22:31:09 jlam Exp $
SHA1 (ghostscript/ghostscript-6.01.tar.bz2) = 405a8ab16453a8c3f846eae2aa4abbea6a093300
Size (ghostscript/ghostscript-6.01.tar.bz2) = 2974476 bytes
@@ -6,6 +6,10 @@ SHA1 (ghostscript/jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9
Size (ghostscript/jpegsrc.v6b.tar.gz) = 613261 bytes
SHA1 (ghostscript/pdf_sec.ps) = e185f12cb8764ce2d7d32931c6dbd5e05df8722f
Size (ghostscript/pdf_sec.ps) = 11158 bytes
+SHA1 (ghostscript/gimp-print-4.2.0.tar.gz) = 3460b23a1c36c7f5dcfacc8dce5d0ee5f051a086
+Size (ghostscript/gimp-print-4.2.0.tar.gz) = 4501914 bytes
+SHA1 (ghostscript/hpijs0.97.tar.gz) = 5f0dd18c71d6b33d4ed6fe4924031257e78e8e06
+Size (ghostscript/hpijs0.97.tar.gz) = 386722 bytes
SHA1 (ghostscript/hpdj-2.6.tar.gz) = 1767295652292ab00b6859cf6699939be44e49e7
Size (ghostscript/hpdj-2.6.tar.gz) = 143944 bytes
SHA1 (ghostscript/dmprt-2.01.tar.gz) = 179c7bf3d0fde128e1ad8c7142301efa7ccb8ab0
@@ -24,18 +28,17 @@ SHA1 (ghostscript/gdevrpdl.tar.gz) = 927f2f858821ab6a445bfc860d8f87ab40f6e2de
Size (ghostscript/gdevrpdl.tar.gz) = 1664 bytes
SHA1 (ghostscript/gdevprsc-0.3.tar.gz) = 7abd8e0685971e2c19276ee31131f05cc36f3dc7
Size (ghostscript/gdevprsc-0.3.tar.gz) = 12484 bytes
+SHA1 (ghostscript/samsung-gdi-driver.tar.gz) = d9e29d5e018a27832e5d4681221387d35f703083
+Size (ghostscript/samsung-gdi-driver.tar.gz) = 8909 bytes
SHA1 (ghostscript/gs6.01-jpdf-exp.patch.gz) = 21f427a4c80871edab8c4d748b1fe1b7796cd876
Size (ghostscript/gs6.01-jpdf-exp.patch.gz) = 59034 bytes
-SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
-SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
-SHA1 (patch-aa) = 0d3591e0b50530c2b2dc517979757c9b6304bf3d
SHA1 (patch-ab) = 26cea522dbe2e2cc57a5fdc60130f309c76c6991
SHA1 (patch-ac) = 576e0bc659d771f9d634921a0cc6752ab9739a92
SHA1 (patch-ad) = 9b6e66132583a698ebef277caf343c6919f42f72
-SHA1 (patch-ae) = f430e1cdd90e7d2c3577c6cdabba31df4314be82
+SHA1 (patch-ae) = e4424e2dbab71290d7ec69ddec34268c50864a68
SHA1 (patch-af) = 68476971f236ddbd053a4d44ae57dcdf2eb49f04
SHA1 (patch-ag) = 28956425104e1e65f243026d7e7165b69a0903a4
-SHA1 (patch-ah) = da2c96b8b69d4a33725cdd59e53ed017e1de7d2d
+SHA1 (patch-ah) = c6b1b14b330f98a616437ec9cf04addee27c625e
SHA1 (patch-ai) = 544e6dccdd475e3880814457591b4668960c3b8b
SHA1 (patch-aj) = e230a46edc0879ca55055f38aca268fac0e78900
SHA1 (patch-ak) = ef5b52c7e6679d5408bce420a5a76cbf73b2b5d3
@@ -47,8 +50,10 @@ SHA1 (patch-ap) = f742c454b1a058786be0239d84e5fc0b09dc538f
SHA1 (patch-aq) = 5ff3c415eaae3398a2f39037e439955b95161942
SHA1 (patch-ar) = 71d21692dfcbd95798743169d73f6b0611f4c007
SHA1 (patch-as) = 9c1581562be288aba109a2c42db50e1923d60f02
-SHA1 (patch-at) = 80d12fa5104dbf19c7c8e26da9bdf414b64a657c
+SHA1 (patch-at) = a627398bca6e9fbdc5f881d514de6b10d2c187dd
SHA1 (patch-au) = 07c99b2988c34396901594ab635a209e08766303
SHA1 (patch-av) = 87f3c9e01a4e2fa63c75c348b1a5ec2be07948a5
SHA1 (patch-aw) = 9855cacc48db068f87aa37568b198e22e6c391a0
+SHA1 (patch-ax) = 8d563208807aff24ea502e56633da0950afa2835
+SHA1 (patch-ay) = a39a1e27a2f8437103a93ac06e5f857ec5e32fa3
SHA1 (patch-bug-workaround) = 99f4e197b35a8f33b8a1219a38f6d9fc2c307eb6
diff --git a/print/ghostscript-nox11/files/devs.nox11 b/print/ghostscript-nox11/files/devs.nox11
index 5fc31b178e8..59e156f4d67 100644
--- a/print/ghostscript-nox11/files/devs.nox11
+++ b/print/ghostscript-nox11/files/devs.nox11
@@ -1,8 +1,15 @@
-# $NetBSD: devs.nox11,v 1.3 2001/05/02 17:07:23 wiz Exp $
+# $NetBSD: devs.nox11,v 1.4 2001/12/20 22:31:09 jlam Exp $
#
# non-X11 drivers for Ghostscript
DEVICE_DEVS+= \
+ $(DD)AP21xx.dev \
+ $(DD)DJ630.dev \
+ $(DD)DJ6xx.dev \
+ $(DD)DJ6xxP.dev \
+ $(DD)DJ8xx.dev \
+ $(DD)DJ9xx.dev \
+ $(DD)DJ9xxVIP.dev \
$(DD)ap3250.dev \
$(DD)appledmp.dev \
$(DD)bit.dev \
@@ -30,6 +37,7 @@ DEVICE_DEVS+= \
$(DD)cdj550.dev \
$(DD)cdj670.dev \
$(DD)cdj850.dev \
+ $(DD)cdj880.dev \
$(DD)cdj890.dev \
$(DD)cdjcolor.dev \
$(DD)cdjmono.dev \
@@ -59,8 +67,10 @@ DEVICE_DEVS+= \
$(DD)faxg32d.dev \
$(DD)faxg4.dev \
$(DD)fs600.dev \
+ $(DD)gdi.dev \
$(DD)hl7x0.dev \
$(DD)hpdj.dev \
+ $(DD)hpijs.dev \
$(DD)ibmpro.dev \
$(DD)imagen.dev \
$(DD)inferno.dev \
@@ -166,6 +176,7 @@ DEVICE_DEVS+= \
$(DD)sj48.dev \
$(DD)st800.dev \
$(DD)stcolor.dev \
+ $(DD)stp.dev \
$(DD)sunhmono.dev \
$(DD)t4693d2.dev \
$(DD)t4693d4.dev \
diff --git a/print/ghostscript-nox11/patches/patch-aa b/print/ghostscript-nox11/patches/patch-aa
deleted file mode 100644
index 25a930e61c3..00000000000
--- a/print/ghostscript-nox11/patches/patch-aa
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2000/05/07 11:10:05 wiz Exp $
-
---- lib/fixmswrd.pl.in.orig Thu Mar 9 03:40:39 2000
-+++ lib/fixmswrd.pl.in Mon May 1 20:26:23 2000
-@@ -1,1 +1,1 @@
--#!/usr/bin/perl
-+#!@PERL@
diff --git a/print/ghostscript-nox11/patches/patch-ae b/print/ghostscript-nox11/patches/patch-ae
index dd28a8bdcfd..47008d7694d 100644
--- a/print/ghostscript-nox11/patches/patch-ae
+++ b/print/ghostscript-nox11/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.2 2000/10/04 13:17:08 jlam Exp $
+$NetBSD: patch-ae,v 1.3 2001/12/20 22:31:10 jlam Exp $
--- src/contrib.mak.orig Thu Mar 16 03:09:42 2000
+++ src/contrib.mak
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.2 2000/10/04 13:17:08 jlam Exp $
### Note: these drivers were contributed by users. ###
### For questions about these drivers, please contact ###
### Lauri Paatero, lauri.paatero@paatero.pp.fi ###
-@@ -556,11 +556,14 @@
+@@ -556,12 +556,15 @@
$(DD)lbp8.dev : $(lbp8_) $(DD)page.dev
$(SETPDEV) $(DD)lbp8 $(lbp8_)
@@ -29,12 +29,29 @@ $NetBSD: patch-ae,v 1.2 2000/10/04 13:17:08 jlam Exp $
-
$(GLOBJ)gdevlbp8.$(OBJ) : $(GLSRC)gdevlbp8.c $(PDEVH)
$(GLCC) $(GLO_)gdevlbp8.$(OBJ) $(C_) $(GLSRC)gdevlbp8.c
-+
+
+# For the Canon LIPS printer devices, use the gdevlips drivers from
+# http://www.bukka.p.chiba-u.ac.jp/~ohmori/gs/
+#
+#$(DD)lips3.dev : $(lbp8_) $(DD)page.dev
+# $(SETPDEV) $(DD)lips3 $(lbp8_)
-
++
### -------------- The Epson LP-8000 laser printer device -------------- ###
### Note: this driver was contributed by a user: please contact Oleg ###
+ ### Oleg Fat'yanov <faty1@rlem.titech.ac.jp> if you have questions.###
+@@ -810,3 +813,15 @@
+
+ $(GLOBJ)gdevsunr.$(OBJ) : $(GLSRC)gdevsunr.c $(PDEVH)
+ $(GLCC) $(GLO_)gdevsunr.$(OBJ) $(C_) $(GLSRC)gdevsunr.c
++
++### ---------------- The Samsung SmartGDI laser printer devices --------- ###
++### Note : this driver is used by Samsung SmartGDI compatible printers. ###
++###
++
++GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
++
++$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
++ $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
++
++$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
++ $(SETPDEV) $(DD)gdi $(GDIMONO)
diff --git a/print/ghostscript-nox11/patches/patch-ah b/print/ghostscript-nox11/patches/patch-ah
index 4e8a8a25c2e..b3f805b2db2 100644
--- a/print/ghostscript-nox11/patches/patch-ah
+++ b/print/ghostscript-nox11/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
+$NetBSD: patch-ah,v 1.2 2001/12/20 22:31:10 jlam Exp $
--- src/gdevcd8.c.orig Thu Mar 9 03:40:40 2000
-+++ src/gdevcd8.c Mon May 1 20:26:23 2000
++++ src/gdevcd8.c
@@ -31,7 +31,7 @@
/*
@@ -11,16 +11,24 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
To be used with the Ghostscript printing system.
Please report all problems to uliw@erdw.ethz.ch
-@@ -59,6 +59,8 @@
+@@ -43,6 +43,16 @@
+ and hp1600 was added by Martin Gerbershagen.
+ */
- */
-
-+/* Add public code to add support for HP880 color printers. */
++/* Merge code by Matthew J. Gelhaus to add support for the HP DeskJet
++ 880 series color printers. The code has the following copyright:
++
++ DeskJet 880C/882C/895C Ghostscript Driver
++ (c) Copyright 2000 Matthew J. Gelhaus
++ All rights reserved.
+
- /* 1999-01-07 edited by L. Peter Deutsch <ghost@aladdin.com> to eliminate
- non-const statics and otherwise bring up to date with Ghostscript coding
- style guidelines. */
-@@ -303,6 +305,107 @@
++ The code is publicly available at http://www.gelhaus.net/index.html.
++ */
++
+ /* Note: Depending on how you transfered the files,
+ you might need to remove some CR-codes used on intel-based machines:
+
+@@ -303,6 +313,107 @@
166, 169, 174, 177, 182, 187, 194, 203, 215, 255}
};
@@ -128,7 +136,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
private const Gamma gammat890 =
{
/* Lookup values for cyan */
-@@ -408,6 +511,7 @@
+@@ -408,6 +519,7 @@
{
&gammat850, /* CDJ670 */
&gammat850, /* CDJ850 */
@@ -136,7 +144,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
&gammat890, /* CDJ890 */
&gammat850 /* CDJ1600 */
};
-@@ -464,7 +568,7 @@
+@@ -464,7 +576,7 @@
/* Printer types */
typedef enum {
@@ -145,7 +153,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
} cdj_printer_type_t;
/* No. of ink jets (used to minimise head movements) */
-@@ -586,7 +690,7 @@
+@@ -586,7 +698,7 @@
int intensities; /* intensity values per pixel [2,4] */
int xscal; /* boolean to indicate x scaling by 2 */
int yscal; /* boolean to indicate y scaling by 2 */
@@ -154,7 +162,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
int compression; /* compression level */
float mastergamma; /* Gammavalue applied to all colors */
float gammavalc; /* range to which gamma-correction is
-@@ -705,6 +809,10 @@
+@@ -705,6 +817,10 @@
cdj850_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
private void
@@ -165,7 +173,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
cdj1600_start_raster_mode(P3(gx_device_printer * pdev,
int papersize, FILE * prn_stream));
private void
-@@ -727,6 +835,10 @@
+@@ -727,6 +843,10 @@
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
@@ -176,7 +184,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
private const gx_device_procs cdj890_procs =
cmyk_colour_procs(hp_colour_open, cdj850_get_params, cdj850_put_params,
NULL, gdev_cmyk_map_color_rgb, gdev_cmyk_map_cmyk_color);
-@@ -749,6 +861,13 @@
+@@ -749,6 +869,13 @@
cdj850_start_raster_mode, cdj850_print_non_blank_lines,
cdj850_terminate_page);
@@ -190,7 +198,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
const gx_device_cdj850 gs_cdj890_device =
cdj_850_device(cdj890_procs, "cdj890", 600, 600, 32, cdj850_print_page, 0,
PRESENTATION, PLAIN_PAPER, 4, DJ890C, 9,
-@@ -823,6 +942,7 @@
+@@ -823,6 +950,7 @@
m = (gdev_pcl_paper_size(pdev) == PAPER_SIZE_A4 ? dj_a4 : dj_letter);
break;
case DJ850C:
@@ -198,7 +206,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $
case DJ890C:
if (cdj850->quality == DRAFT) {
gx_device_set_resolution(pdev, 300.0, 300.0);
-@@ -2722,6 +2842,20 @@
+@@ -2722,6 +2850,20 @@
* }
* end of unused code */
diff --git a/print/ghostscript-nox11/patches/patch-at b/print/ghostscript-nox11/patches/patch-at
index d3fc4b94bd7..6b3bf3f44cb 100644
--- a/print/ghostscript-nox11/patches/patch-at
+++ b/print/ghostscript-nox11/patches/patch-at
@@ -1,7 +1,7 @@
-$NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
+$NetBSD: patch-at,v 1.4 2001/12/20 22:31:10 jlam Exp $
---- src/unix-gcc.mak.orig Sun Jul 15 23:47:57 2001
-+++ src/unix-gcc.mak Sun Jul 15 23:49:00 2001
+--- src/unix-gcc.mak.orig Thu Dec 20 00:32:55 2001
++++ src/unix-gcc.mak
@@ -30,12 +30,12 @@
BINDIR=./bin
@@ -57,30 +57,6 @@ $NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
#ZLIB_NAME=gz
ZLIB_NAME=z
-@@ -214,9 +214,9 @@
- # 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=
-
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -225,9 +225,9 @@
- # -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=
-
--LDFLAGS=$(XLDFLAGS) -fno-common
-+LDFLAGS=$(XLDFLAGS) # -fno-common
-
- # Define any extra libraries to link into the executable.
- # ISC Unix 2.2 wants -linet.
@@ -244,8 +244,11 @@
# include pthreads in libc and don't require any additional library.
# All reasonable platforms require -lm, but Rhapsody and perhaps one or
@@ -94,35 +70,7 @@ $NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
# Define the include switch(es) for the X11 header files.
# This can be null if handled in some other way (e.g., the files are
-@@ -255,7 +258,7 @@
- # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
- # not in $(XINCLUDE).
-
--XINCLUDE=-I/usr/local/X/include
-+#XINCLUDE=-I/usr/local/X/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
-@@ -270,9 +273,16 @@
- #XLIBS=Xt SM ICE Xext X11
-
- #XLIBDIRS=-L/usr/local/X/lib
--XLIBDIRS=-L/usr/X11/lib
-+#XLIBDIRS=-L/usr/X11/lib
-+#XLIBDIR=
-+#XLIBS=Xt Xext X11
-+
-+.if defined(USE_X11)
-+XINCLUDE=-I${X11BASE}/include
-+XLIBDIRS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib
- XLIBDIR=
--XLIBS=Xt Xext X11
-+XLIBS=Xt SM ICE Xext X11
-+.endif
-
- # Define the directory/ies for the VFlib files.
- # If you use FreeType, Add ttf to VFLIBS
-@@ -281,7 +291,7 @@
+@@ -281,7 +284,7 @@
#VFLIBS=VFlib
VFINCLUDE=
VFLIBDIRS=
@@ -131,16 +79,7 @@ $NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
# Define whether this platform has floating point hardware:
# FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -292,7 +302,7 @@
- # FPU_TYPE=-1 means that floating point is always much slower than
- # fixed point.
-
--FPU_TYPE=1
-+#FPU_TYPE=1
-
- # Define the .dev module that implements thread and synchronization
- # primitives for this platform.
-@@ -339,7 +349,7 @@
+@@ -339,7 +342,7 @@
# Choose the device(s) to include. See devs.mak for details,
# devs.mak and contrib.mak for the list of available devices.
@@ -149,7 +88,7 @@ $NetBSD: patch-at,v 1.3 2001/07/15 22:19:12 bad Exp $
#DEVICE_DEVS1=
#DEVICE_DEVS2=
-@@ -357,27 +367,27 @@
+@@ -357,27 +360,27 @@
#DEVICE_DEVS14=
#DEVICE_DEVS15=
diff --git a/print/ghostscript-nox11/patches/patch-ax b/print/ghostscript-nox11/patches/patch-ax
new file mode 100644
index 00000000000..f0998e4856c
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-ax
@@ -0,0 +1,10 @@
+$NetBSD: patch-ax,v 1.1 2001/12/20 22:31:10 jlam Exp $
+
+--- ../hpijs0.97/makefile.orig Thu Jun 7 17:10:57 2001
++++ ../hpijs0.97/makefile
+@@ -1,4 +1,4 @@
+-FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
++FLAGS = ${HPIJS_CFLAGS} -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
+ -D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350
+
+ VERSION=0.97
diff --git a/print/ghostscript-nox11/patches/patch-ay b/print/ghostscript-nox11/patches/patch-ay
new file mode 100644
index 00000000000..76146d297a4
--- /dev/null
+++ b/print/ghostscript-nox11/patches/patch-ay
@@ -0,0 +1,13 @@
+$NetBSD: patch-ay,v 1.1 2001/12/20 22:31:10 jlam Exp $
+
+--- src/gdevgdi.c.orig Thu Feb 8 23:51:11 2001
++++ src/gdevgdi.c
+@@ -126,7 +126,7 @@
+ private int
+ gdi_open(gx_device *pdev)
+ { /* Change the margins if necessary. */
+- const float _ds *m = 0;
++ const float *m = 0;
+ bool move_origin = true;
+
+ static const float m_a4[4] = { GDI_MARGINS_A4 };
diff --git a/print/ghostscript/DESCR b/print/ghostscript/DESCR
index 2bae230a3f5..77962260cd1 100644
--- a/print/ghostscript/DESCR
+++ b/print/ghostscript/DESCR
@@ -1,8 +1,6 @@
-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.
+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.
-This version of Ghostscript includes support for the Japanese
-Vector Font library.
-
-This package contains the ghostscript binary compiled with X11 drivers.
+This version of Ghostscript includes support for the Japanese Vector Font
+library.
diff --git a/print/ghostscript/Makefile b/print/ghostscript/Makefile
index f85ca3ed3e9..833d2afe35c 100644
--- a/print/ghostscript/Makefile
+++ b/print/ghostscript/Makefile
@@ -1,15 +1,23 @@
-# $NetBSD: Makefile,v 1.5 2001/02/17 17:51:41 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/12/20 22:31:09 jlam Exp $
PKGNAME= ghostscript-${GS_VERS}
-
-COMMENT= Aladdin Postscript interpreter with X11 drivers
+PKGREVISION= 1
+COMMENT= Aladdin Postscript interpreter
CONFLICTS= ghostscript{,-x11,-nox11}-[0-9]*
-USE_X11= # defined
-
-# Build with the X11 display device drivers.
-#
-MAKE_ENV+= USE_X11=1
+USE_BUILDLINK_ONLY= YES
.include "../../print/ghostscript-nox11/Makefile.common"
+
+MAKEFRAGS+= ${FILESDIR}/devs.x11
+GS_DISPLAY_DEVICE= x11.dev
+XLIBS= Xt SM ICE Xext X11
+
+.include "../../mk/x11.buildlink.mk"
+.include "../../mk/bsd.pkg.mk"
+
+# arm32 compiler has an optimizer problem
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "arm32"
+CFLAGS+= -O0
+.endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 19:04:52 +0000