From 5f3dc715b126c38aeee08adbd5fd69de8d77c20b Mon Sep 17 00:00:00 2001 From: Yoshio MITA Date: Sat, 19 Jan 2002 00:38:53 +0000 Subject: A few hours later the import I received patch to ameriolate ports. Since this is rather minor change and it is too short (8 hours) between last and this commit, I don't bump PORTREVISION for this time. Submitted by: KATO Tsuguru to ports-jp@jp ML --- print/ghostscript-gnu-commfont/Makefile | 218 +++++++------- print/ghostscript-gnu-commfont/distinfo | 12 +- .../files/patch-gdev10v.mak.patch | 22 -- .../files/patch-gdev10v:gdev10v.mak | 22 ++ .../files/patch-gdevmd2k.mak.patch | 19 -- .../files/patch-gdevmd2k:gdevmd2k.mak | 19 ++ .../ghostscript-gnu-commfont/files/patch-gdevmjc.c | 335 --------------------- .../files/patch-gdevmjc.mak | 43 --- .../files/patch-gdevmjc:gdevmjc.c | 335 +++++++++++++++++++++ .../files/patch-gdevmjc:gdevmjc.mak | 43 +++ print/ghostscript-gnu-commfont/pkg-plist | 13 +- print/ghostscript-gnu-commfont/scripts/configure | 24 +- 12 files changed, 559 insertions(+), 546 deletions(-) delete mode 100644 print/ghostscript-gnu-commfont/files/patch-gdev10v.mak.patch create mode 100644 print/ghostscript-gnu-commfont/files/patch-gdev10v:gdev10v.mak delete mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmd2k.mak.patch create mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmd2k:gdevmd2k.mak delete mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmjc.c delete mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmjc.mak create mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.c create mode 100644 print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.mak (limited to 'print/ghostscript-gnu-commfont') diff --git a/print/ghostscript-gnu-commfont/Makefile b/print/ghostscript-gnu-commfont/Makefile index 46e086dc1546..37994b854ae6 100644 --- a/print/ghostscript-gnu-commfont/Makefile +++ b/print/ghostscript-gnu-commfont/Makefile @@ -10,16 +10,17 @@ PORTVERSION= 6.52 CATEGORIES= print MASTER_SITES= ftp://ftp.gyve.org/pub/gs-cjk/M2/ \ ftp://ftp.gyve.org/pub/gs-cjk/ \ - ${GPRINT_SITE} ${HPIJS_SITE} ${NPDL_SITE} ${EPAG_SITE} \ - ${ALPS_SITE} ${LIPS_SITE} ${EPLASER_SITE} \ + ${GPRINT_SITE} ${HPIJS_SITE} \ + ${ALPS_SITE} ${BJ10V_SITE} ${EPAG_SITE} ${EPLASER_SITE} \ + ${LIPS_SITE} ${MD2K_SITE} ${MJC_SITE} ${NPDL_SITE} \ ${MASTER_SITE_GNU} \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} PKGNAMESUFFIX= -gnu-cjk DISTFILES= ${GS_SRC} ${GS_CJK_PATCH} ${CMAP} ${CJKFONTS} \ - ${GPRINT_SRC} ${HPIJS_SRC} ${NPDL_SRC} ${EPAG_SRC} \ - ${ALPS_SRC} ${LIPS_SRC} ${EPLASER_SRC} ${BJ_SRC} ${MD2K_SRC} \ - ${MJC_SRC} + ${GPRINT_SRC} ${HPIJS_SRC} \ + ${ALPS_SRC} ${BJ10V_SRC} ${EPAG_SRC} ${EPLASER_SRC} \ + ${LIPS_SRC} ${MD2K_SRC} ${MJC_SRC} ${NPDL_SRC} DIST_SUBDIR= ghostscript EXTRACT_ONLY= ${GS_SRC} @@ -38,6 +39,10 @@ PLIST_SUB= GS_VERSION=${PORTVERSION} XCFLAGS= -DUPD_SIGNAL=0 +.if !defined(NO_A4) +XCFLAGS+= -DA4 +.endif + GS_SRC= ${DISTNAME}${EXTRACT_SUFX} GS_CJK= gs6.51-cjk-M2-R3 GS_CJK_PATCH= ${GS_CJK}.tar.gz @@ -67,7 +72,7 @@ GPRINT_SITE= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,gimp-print,} # HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series HPIJS= hpijs -HPIJS_VERS= 1.0 +HPIJS_VERS= 1.0.1 HPIJS_NAME= ${HPIJS}-${HPIJS_VERS} HPIJS_SRC= ${HPIJS_NAME}.tar.gz HPIJS_SITE= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,hpinkjet,} @@ -76,20 +81,6 @@ HPIJS_SITE= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,hpinkjet,} CONTRIB_UPP= lqx70ch.upp lqx70cl.upp lqx70cm.upp \ stc740ih.upp stc740p.upp stc740pl.upp -# NPDL - NEC Printer Description Language driver -NPDL= gdevnpdl -NPDL_VERS= 1.6.3 -NPDL_NAME= ${NPDL}-${NPDL_VERS} -NPDL_SRC= ${NPDL_NAME}.tar.gz -NPDL_SITE= http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ - -# EPAG - Epson ESC/Page Language driver -EPAG= epag -EPAG_VERS= 3.09 -EPAG_NAME= ${EPAG}-${EPAG_VERS} -EPAG_SRC= ${EPAG_NAME}.tar.gz -EPAG_SITE= http://www.humblesoft.com/pub/ - # ALPS - Alps MD-5000 printer driver ALPS= gdevalps ALPS_VERS= 0.2 @@ -97,12 +88,18 @@ ALPS_NAME= ${ALPS}-${ALPS_VERS} ALPS_SRC= ${ALPS}-0.21.tar.gz ALPS_SITE= ${MASTER_SITE_PORTS_JP} -# LIPS - Canon LIPS II+/III/IVc/IV printer driver -LIPS= gdevlips -LIPS_VERS= 2.4.0 -LIPS_NAME= ${LIPS}-${LIPS_VERS} -LIPS_SRC= ${LIPS_NAME}.tar.gz -LIPS_SITE= ${MASTER_SITE_PORTS_JP} +# BJ10V - Canon BJ-10V printer driver +BJ10V= gdev10v +BJ10V_NAME= ${BJ10V} +BJ10V_SRC= ${BJ10V_NAME}.tar.gz +BJ10V_SITE= ${MASTER_SITE_PORTS_JP} + +# EPAG - Epson ESC/Page Language driver +EPAG= epag +EPAG_VERS= 3.09 +EPAG_NAME= ${EPAG}-${EPAG_VERS} +EPAG_SRC= ${EPAG_NAME}.tar.gz +EPAG_SITE= http://www.humblesoft.com/pub/ # EPLASER - Epson Kowa developed printer driver for ESC/Page Laser printers EPLASER= eplaser @@ -111,35 +108,41 @@ EPLASER_NAME= ${EPLASER}-${EPLASER_VERS} EPLASER_SRC= ${EPLASER_NAME}-651.tgz EPLASER_SITE= http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/ -# bj10v driver -BJ= gdev10v -BJ_NAME= ${BJ} -BJ_SRC= ${BJ_NAME}.tar.gz +# LIPS - Canon LIPS II+/III/IVc/IV printer driver +LIPS= gdevlips +LIPS_VERS= 2.4.0 +LIPS_NAME= ${LIPS}-${LIPS_VERS} +LIPS_SRC= ${LIPS_NAME}.tar.gz +LIPS_SITE= ${MASTER_SITE_PORTS_JP} -# md2k driver +# MD2K - Alps MD-2000/2010/4000/1300/1500/5000 printer driver MD2K= gdevmd2k MD2K_VERS= 0.2a MD2K_NAME= ${MD2K}-${MD2K_VERS} MD2K_SRC= ${MD2K_NAME}.tar.gz +MD2K_SITE= http://plaza26.mbn.or.jp/~higamasa/gdevmd2k/ -# mjc driver +# MJC - Epson MachJet series printer driver MJC= gdevmjc MJC_VERS= 0.8 MJC_NAME= ${MJC}-${MJC_VERS} MJC_SRC= ${MJC_NAME}.tar.gz +MJC_SITE= ${MASTER_SITE_PORTS_JP} -.if defined(NO_A4) -.else -XCFLAGS+= -DA4 -.endif +# NPDL - NEC Printer Description Language driver +NPDL= gdevnpdl +NPDL_VERS= 1.6.3 +NPDL_NAME= ${NPDL}-${NPDL_VERS} +NPDL_SRC= ${NPDL_NAME}.tar.gz +NPDL_SITE= http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/ + +.SILENT: -pre-fetch: +pre-everything:: .if !defined(NO_A4) - @${ECHO_MSG} "Type \"make NO_A4=yes\" if you want not set A4 paper default." + ${ECHO_MSG} "Type \"make NO_A4=yes\" if you want not set A4 paper default." .endif -.SILENT: - post-extract: ${ECHO_MSG} ">>> in post-extract ..." ${LN} -sf `cd ${PORTSDIR}/graphics/jpeg && ${MAKE} -V WRKSRC` \ @@ -158,35 +161,34 @@ post-extract: # for HPinkjet driver ${ECHO_MSG} ">>> extracting ${HPIJS_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${HPIJS_SRC} -# for NPDL driver - ${ECHO_MSG} ">>> extracting ${NPDL_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRC} -# for EPAG driver - ${ECHO_MSG} ">>> extracting ${EPAG_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRC} # for ALPS driver ${ECHO_MSG} ">>> extracting ${ALPS_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRC} ${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS} +# for BJ10V driver + ${ECHO_MSG} ">>> extracting ${BJ10V_SRC} ..." + ${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${BJ10V_SRC} +# for EPAG driver + ${ECHO_MSG} ">>> extracting ${EPAG_SRC} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRC} +# for EPLASER driver + ${ECHO_MSG} ">>> extracting ${EPLASER_SRC} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRC} # for LIPS driver ${ECHO_MSG} ">>> extracting ${LIPS_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRC} ${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS} -# for EPLASER driver - ${ECHO_MSG} ">>> extracting ${EPLASER_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRC} -# for bj10v driver - ${ECHO_MSG} ">>> extracting ${BJ_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${BJ_SRC} - ${CP} ${WRKSRC}/${BJ_NAME}/gdev10v.c ${WRKSRC}/src -# for md2k driver - ${ECHO_MSG} ">>> extracting ${MD2K_SRC} ..." +# for MD2K driver + ${ECHO_MSG} ">>> extracting ${MD2K_SRC} ..." ${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${MD2K_SRC} - ${CP} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.c ${WRKSRC}/src -# for mjc driver + ${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K} +# for MJC driver ${ECHO_MSG} ">>> extracting ${MJC_SRC} ..." - ${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${MJC_SRC} - ${CP} ${WRKSRC}/${MJC_NAME}/*.[ch] ${WRKSRC}/src + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRC} + ${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC} +# for NPDL driver + ${ECHO_MSG} ">>> extracting ${NPDL_SRC} ..." + ${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRC} post-patch: ${ECHO_MSG} ">>> in post-patch ..." @@ -218,38 +220,40 @@ pre-configure: ${ECHO_MSG} ">>> adding ${HPIJS} driver to contrib.mak ..." ${CAT} ${PORTSDIR}/print/ghostscript-gnu/files/hpijs.contrib.mak \ >> ${WRKSRC}/src/contrib.mak -# for NPDL driver - ${ECHO_MSG} ">>> adding ${NPDL} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \ - >> ${WRKSRC}/src/contrib.mak -# for EPAG driver - ${ECHO_MSG} ">>> adding ${EPAG} driver to contrib.mak ..." - ${SED} -e 's:npdl:epag:g' ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \ - >> ${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 LIPS driver - ${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \ +# for BJ10V driver + ${ECHO_MSG} ">>> adding ${BJ10V} driver to contrib.mak ..." + ${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.mak \ + >> ${WRKSRC}/src/contrib.mak +# for EPAG driver + ${ECHO_MSG} ">>> adding ${EPAG} driver to contrib.mak ..." + ${SED} -e 's:npdl:epag:g' ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \ >> ${WRKSRC}/src/contrib.mak # for EPLASER driver + ${ECHO_MSG} ">>> adding ${EPLASER} driver to contrib.mak ..." ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv6.mak \ >> ${WRKSRC}/src/contrib.mak ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv6.mak \ >> ${WRKSRC}/src/contrib.mak -# for bj10v driver - ${ECHO_MSG} ">>> adding ${BJ} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${BJ_NAME}/gdev10v.mak \ - >> ${WRKSRC}/src/contrib.mak -# for md2k driver +# for LIPS driver + ${ECHO_MSG} ">>> adding ${LIPS} driver to contrib.mak ..." + ${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.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 mjc driver +# for MJC driver ${ECHO_MSG} ">>> adding ${MJC} driver to contrib.mak ..." ${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \ - >> ${WRKSRC}/src/contrib.mak + >> ${WRKSRC}/src/contrib.mak +# for NPDL driver + ${ECHO_MSG} ">>> adding ${NPDL} driver to contrib.mak ..." + ${CAT} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.mak \ + >> ${WRKSRC}/src/contrib.mak do-configure: ${ECHO_MSG} ">>> in do-configure ..." @@ -291,28 +295,37 @@ pre-build: .for file in gdevijs.[ch] ijs.[ch] ijs_client.[ch] ijs_exec_unix.c unistd_.h ${LN} -sf ${WRKSRC}/${HPIJS_NAME}/${file} ${WRKSRC}/src .endfor -# for NPDL driver - ${ECHO_MSG} ">>> creating symlinks for ${NPDL} ..." - ${LN} -sf ${WRKSRC}/${NPDL_NAME}/gdevnpdl.c ${WRKSRC}/src +# for ALPS driver + ${ECHO_MSG} ">>> creating symlinks for ${ALPS} ..." + ${LN} -sf ${WRKSRC}/${ALPS_NAME}/gdevalps.c ${WRKSRC}/src +# for BJ10V driver + ${ECHO_MSG} ">>> creating symlinks for ${BJ10V} ..." + ${LN} -sf ${WRKSRC}/${BJ10V_NAME}/gdev10v.c ${WRKSRC}/src # for EPAG driver ${ECHO_MSG} ">>> building ert (Epson printer utility)..." cd ${WRKSRC}/${EPAG_NAME} ; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${ECHO_MSG} ">>> creating symlinks for ${EPAG} ..." ${LN} -sf ${WRKSRC}/${EPAG_NAME}/gdevepag.c ${WRKSRC}/src -# for ALPS driver - ${ECHO_MSG} ">>> creating symlinks for ${ALPS} ..." - ${LN} -sf ${WRKSRC}/${ALPS_NAME}/gdevalps.c ${WRKSRC}/src -# for LIPS driver - ${ECHO_MSG} ">>> creating symlinks for ${LIPS} ..." -.for file in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevrpdl.c - ${LN} -sf ${WRKSRC}/${LIPS_NAME}/${file} ${WRKSRC}/src -.endfor # for EPLASER driver ${ECHO_MSG} ">>> creating symlinks for ${EPLASER} ..." .for file in gdevescv.[ch] gdevesmv.c ${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${file} ${WRKSRC}/src .endfor +# for LIPS driver + ${ECHO_MSG} ">>> creating symlinks for ${LIPS} ..." +.for file in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevrpdl.c + ${LN} -sf ${WRKSRC}/${LIPS_NAME}/${file} ${WRKSRC}/src +.endfor +# for MD2K driver + ${ECHO_MSG} ">>> creating symlinks for ${MD2K} ..." + ${LN} -sf ${WRKSRC}/${MD2K_NAME}/gdevmd2k.c ${WRKSRC}/src +# for MJC driver + ${ECHO_MSG} ">>> creating symlinks for ${MJC} ..." + ${LN} -sf ${WRKSRC}/${MJC_NAME}/*.c ${WRKSRC}/src +# for NPDL driver + ${ECHO_MSG} ">>> creating symlinks for ${NPDL} ..." + ${LN} -sf ${WRKSRC}/${NPDL_NAME}/gdevnpdl.c ${WRKSRC}/src do-install: ${ECHO_MSG} ">>> in do-install ..." @@ -353,36 +366,37 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/${GS_CJK}/${i} \ ${DOCSDIR}/${PORTVERSION}/CJK .endfor -# EPAG documents - ${MKDIR} ${PRINTER_DOC}/${EPAG_NAME} + ${MKDIR} ${PRINTER_DOC} +# for ALPS driver + ${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/README.gdevalps ${PRINTER_DOC} +# for BJ10V driver + ${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/gdev10v.jis ${PRINTER_DOC} +# for EPAG driver + ${MKDIR} ${PRINTER_DOC}/${EPAG} .for i in ert.txt gdevepag.txt ChangeLog ${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \ - ${PRINTER_DOC}/${EPAG_NAME} + ${PRINTER_DOC}/${EPAG} .endfor .for i in psprint gsepagif.sh ${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \ - ${PRINTER_DOC}/${EPAG_NAME} + ${PRINTER_DOC}/${EPAG} .endfor -# NPDL document - ${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.jis ${PRINTER_DOC} -# ALPS document - ${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/README.gdevalps ${PRINTER_DOC} -# LIPS document - ${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/Gdevlips.htm ${PRINTER_DOC} -# EPLASER document +# for EPLASER driver ${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/readme-eplaser-651.euc \ ${PRINTER_DOC} -# bj10v document - ${INSTALL_DATA} ${WRKSRC}/${BJ_NAME}/gdev10v.jis ${PRINTER_DOC} -# md2k document +# for LIPS driver + ${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/Gdevlips.htm ${PRINTER_DOC} +# for MD2K driver ${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/README.jis \ ${PRINTER_DOC}/README.${MD2K} -# MJC document +# for MJC driver ${MKDIR} ${PRINTER_DOC}/${MJC} .for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc ${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \ ${PRINTER_DOC}/${MJC} .endfor +# for NPDL driver + ${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/gdevnpdl.jis ${PRINTER_DOC} .endif .include diff --git a/print/ghostscript-gnu-commfont/distinfo b/print/ghostscript-gnu-commfont/distinfo index 25a79b2d13e1..95cebac0a9bd 100644 --- a/print/ghostscript-gnu-commfont/distinfo +++ b/print/ghostscript-gnu-commfont/distinfo @@ -2,12 +2,12 @@ MD5 (ghostscript/ghostscript-6.52.tar.bz2) = 5a1b698b8fbece1e23e4d8d9ff552762 MD5 (ghostscript/gs6.51-cjk-M2-R3.tar.gz) = 6f8e90effe12527a4c3b36ea4ce47b3c MD5 (ghostscript/adobe-cmaps-200109.tar.gz) = 95ced0f35e107899ce11e8689e9cbdff MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6 -MD5 (ghostscript/hpijs-1.0.tar.gz) = 9ec7d86d2cc2dd613f8829891b02104b -MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2 -MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 +MD5 (ghostscript/hpijs-1.0.1.tar.gz) = 4ac76910a69eb781e35c8eca31db6008 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9 -MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f -MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254 -MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73 +MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 +MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254 +MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24 +MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c +MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2 diff --git a/print/ghostscript-gnu-commfont/files/patch-gdev10v.mak.patch b/print/ghostscript-gnu-commfont/files/patch-gdev10v.mak.patch deleted file mode 100644 index 25a8317379b8..000000000000 --- a/print/ghostscript-gnu-commfont/files/patch-gdev10v.mak.patch +++ /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-gnu-commfont/files/patch-gdev10v:gdev10v.mak b/print/ghostscript-gnu-commfont/files/patch-gdev10v:gdev10v.mak new file mode 100644 index 000000000000..25a8317379b8 --- /dev/null +++ b/print/ghostscript-gnu-commfont/files/patch-gdev10v:gdev10v.mak @@ -0,0 +1,22 @@ +--- 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-gnu-commfont/files/patch-gdevmd2k.mak.patch b/print/ghostscript-gnu-commfont/files/patch-gdevmd2k.mak.patch deleted file mode 100644 index 713377c82906..000000000000 --- a/print/ghostscript-gnu-commfont/files/patch-gdevmd2k.mak.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gdevmd2k-0.2a/gdevmd2k.mak-5.50.orig Sun Nov 19 18:42:20 2000 -+++ gdevmd2k-0.2a/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-gnu-commfont/files/patch-gdevmd2k:gdevmd2k.mak b/print/ghostscript-gnu-commfont/files/patch-gdevmd2k:gdevmd2k.mak new file mode 100644 index 000000000000..67e1251c594e --- /dev/null +++ b/print/ghostscript-gnu-commfont/files/patch-gdevmd2k:gdevmd2k.mak @@ -0,0 +1,19 @@ +--- gdevmd2k/gdevmd2k.mak-5.50.orig Sun Nov 19 18:42:20 2000 ++++ gdevmd2k/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-gnu-commfont/files/patch-gdevmjc.c b/print/ghostscript-gnu-commfont/files/patch-gdevmjc.c deleted file mode 100644 index 8188c0d142dd..000000000000 --- a/print/ghostscript-gnu-commfont/files/patch-gdevmjc.c +++ /dev/null @@ -1,335 +0,0 @@ ---- src/gdevmjc.c.orig Tue May 23 19:16:52 2000 -+++ src/gdevmjc.c Tue May 23 19:17:44 2000 -@@ -43,7 +43,8 @@ - #include - #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,14 +193,12 @@ - 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 dev_proc_get_params(mj_get_params); -+private dev_proc_put_params(mj_put_params); - - 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 void set_bpp(P2(gx_device *, int)); -+private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int)); -+private void mj_set_bpp(P2(gx_device *, int)); - - private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int )); - -@@ -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 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,80 +358,74 @@ - * 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 ------ */ -@@ -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; -@@ -1685,39 +1678,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 +1704,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 +1715,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-gnu-commfont/files/patch-gdevmjc.mak b/print/ghostscript-gnu-commfont/files/patch-gdevmjc.mak deleted file mode 100644 index f54213e30356..000000000000 --- a/print/ghostscript-gnu-commfont/files/patch-gdevmjc.mak +++ /dev/null @@ -1,43 +0,0 @@ ---- gdevmjc-0.8/gdevmjc.mak.orig Tue May 23 19:19:13 2000 -+++ gdevmjc-0.8/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-gnu-commfont/files/patch-gdevmjc:gdevmjc.c b/print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.c new file mode 100644 index 000000000000..60f256743c00 --- /dev/null +++ b/print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.c @@ -0,0 +1,335 @@ +--- gdevmjc/gdevmjc.c.orig Tue May 23 19:16:52 2000 ++++ gdevmjc/gdevmjc.c Tue May 23 19:17:44 2000 +@@ -43,7 +43,8 @@ + #include + #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,14 +193,12 @@ + 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 dev_proc_get_params(mj_get_params); ++private dev_proc_put_params(mj_put_params); + + 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 void set_bpp(P2(gx_device *, int)); ++private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int)); ++private void mj_set_bpp(P2(gx_device *, int)); + + private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int )); + +@@ -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 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,80 +358,74 @@ + * 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 ------ */ +@@ -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; +@@ -1685,39 +1678,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 +1704,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 +1715,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-gnu-commfont/files/patch-gdevmjc:gdevmjc.mak b/print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.mak new file mode 100644 index 000000000000..cd3d954495ac --- /dev/null +++ b/print/ghostscript-gnu-commfont/files/patch-gdevmjc:gdevmjc.mak @@ -0,0 +1,43 @@ +--- gdevmjc/gdevmjc.mak.orig Tue May 23 19:19:13 2000 ++++ gdevmjc/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-gnu-commfont/pkg-plist b/print/ghostscript-gnu-commfont/pkg-plist index 1c2fc0efc17f..3a5955b51e07 100644 --- a/print/ghostscript-gnu-commfont/pkg-plist +++ b/print/ghostscript-gnu-commfont/pkg-plist @@ -15,11 +15,11 @@ bin/gs %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/Gdevlips.htm %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/README.gdevalps %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/README.gdevmd2k -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/ert.txt -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/gdevepag.txt -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/ChangeLog -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/psprint -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09/gsepagif.sh +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/ert.txt +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/gdevepag.txt +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/ChangeLog +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/psprint +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/epag/gsepagif.sh %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/MJ700V2C.FAQ %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/README.mjc %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc/README.mje @@ -520,7 +520,6 @@ share/ghostscript/Resource/ag14/CMap/UniGB-UCS2-H @dirrm share/ghostscript/Resource/rksj-cmaps @dirrm share/ghostscript/Resource %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/CJK -%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/epag-3.09 -%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmd2k %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/gdevmjc +%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers/epag %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/printers diff --git a/print/ghostscript-gnu-commfont/scripts/configure b/print/ghostscript-gnu-commfont/scripts/configure index cce576748970..cdf34595fab4 100644 --- a/print/ghostscript-gnu-commfont/scripts/configure +++ b/print/ghostscript-gnu-commfont/scripts/configure @@ -20,20 +20,20 @@ Have fun with this new configuration style ! -andreas \n\n\ "x11mono" "X Window System masquer. as black-and-white device" ON \ "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" ON \ "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" ON \ - "md2k" "ALPS MD2000/2010/4000/1300/1500/5000 driver" ON \ - "md5k" "ALPS MD5000 driver" ON \ + "md2k" "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" ON \ + "md5k" "ALPS MD-5000 Eco Mode [MD2K]" ON \ "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" ON \ "md50Eco" "ALPS MD-5000 Eco Mode [ALPS]" ON \ - "md1xMono" "ALPS MD-1x Monochrome [ALPS]" ON \ + "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" ON \ "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \ "iwhi" "Apple Imagewriter, high-resolution mode" OFF \ "iwlo" "Apple Imagewriter, low-resolution mode" OFF \ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \ "hl7x0" "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" OFF \ - "bj10e" "Canon BubbleJet BJ10e" ON \ - "bj10v" "Canon BubbleJet BJ10v" ON \ - "bj10vh" "Canon BubbleJet BJ10vh" ON \ - "bj200" "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \ + "bj10e" "Canon BubbleJet BJ-10e" ON \ + "bj10v" "Canon BubbleJet BJ-10v [BJ]" ON \ + "bj10vh" "Canon BubbleJet BJ-10v, high-mergin [BJ]" ON \ + "bj200" "Canon BubbleJet BJ-200 and BJC-240(b&w)" ON \ "bjc600" "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" ON \ "bjc800" "Canon Color BubbleJet BJC-240/800" ON \ "lbp8" "Canon LBP-8II laser printer" OFF \ @@ -82,10 +82,10 @@ Have fun with this new configuration style ! -andreas \n\n\ "lp1800" "Epson LP-1800 laser printer [EPLASER]" ON \ "lq850" "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \ "epsonc" "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \ - "mjc180" "Epson MachJet series 180dpi, CMYK" ON \ - "mjc360" "Epson MachJet series 360dpi, CMYK" ON \ - "mjc720" "Epson MachJet series 720dpi, CMYK" ON \ - "mj500c" "Epson MachJet MJ-500C 360dpi, CMY or mono" ON \ + "mjc180" "Epson MachJet series 180dpi, CMYK [MJC]" ON \ + "mjc360" "Epson MachJet series 360dpi, CMYK [MJC]" ON \ + "mjc720" "Epson MachJet series 720dpi, CMYK [MJC]" ON \ + "mj500c" "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" ON \ "st800" "Epson Stylus 800 printer" OFF \ "stcolor" "Epson Stylus Color and II/IIs/1500 (see driver docu)" OFF \ "photoex" "Epson Stylus Color Photo, Photo EX, Photo 700" OFF \ @@ -119,7 +119,7 @@ Have fun with this new configuration style ! -andreas \n\n\ "pjxl300" "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" ON \ "pxlmono" "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \ "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \ - "ijs" "HP PhotoSmart/DeskJet series (HP developed driver) [HPinkjet]" ON \ + "ijs" "HP PhotoSmart/DeskJet series (HP developed) [HPinkjet]" ON \ "ibmpro" "IBM 9-pin Proprinter" OFF \ "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \ "imagen" "Imagen ImPress printers" OFF \ -- cgit v1.2.3