diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-27 02:35:24 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-09-27 02:35:24 +0000 |
commit | 407f8a093f5323d2227dbadb047a95edeba967d5 (patch) | |
tree | 68ef8cce1ef5de0026ff458caee878f579d6c489 /print | |
parent | [UPDATE] Security update for ecartis, new snap-20030814 (diff) |
Update port: print/ghostscript-gnu
- Update EPLASER driver to version 3.1.1
- Fix papersize handling of LIPS driver
- Enable hl1240/hl1250 driver by default configuration
PR: ports/57009
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Notes
Notes:
svn path=/head/; revision=89498
Diffstat (limited to 'print')
-rw-r--r-- | print/ghostscript-gnu/Makefile | 14 | ||||
-rw-r--r-- | print/ghostscript-gnu/distinfo | 2 | ||||
-rw-r--r-- | print/ghostscript-gnu/files/patch-eplaser:gdevescv.c | 96 | ||||
-rw-r--r-- | print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c | 96 | ||||
-rw-r--r-- | print/ghostscript-gnu/pkg-plist | 4 | ||||
-rw-r--r-- | print/ghostscript-gnu/scripts/configure | 13 | ||||
-rw-r--r-- | print/ghostscript7/Makefile | 14 | ||||
-rw-r--r-- | print/ghostscript7/distinfo | 2 | ||||
-rw-r--r-- | print/ghostscript7/files/patch-eplaser:gdevescv.c | 96 | ||||
-rw-r--r-- | print/ghostscript7/files/patch-eplaser:gdevesmv.c | 96 | ||||
-rw-r--r-- | print/ghostscript7/pkg-plist | 4 | ||||
-rw-r--r-- | print/ghostscript7/scripts/configure | 13 |
12 files changed, 250 insertions, 200 deletions
diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile index dbe46b244b3a..3163c8ed1e0c 100644 --- a/print/ghostscript-gnu/Makefile +++ b/print/ghostscript-gnu/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostscript PORTVERSION= ${GS_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \ @@ -19,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \ ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \ http://www.ucatv.ne.jp/~taeko/software/gs/:lips \ http://www.humblesoft.com/pub/:epag \ - http://www.epkowa.on.arena.ne.jp/gslpd/data/V306/:eplaser \ + http://www.epkowa.on.arena.ne.jp/gslpd/data/V${EPLASER_VERS:S/.//g}/:eplaser \ http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \ http://www.linuxprinting.org/download/printing/:lxm3200 \ http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \ @@ -224,9 +224,9 @@ EPAG_SRCS= ${EPAG_NAME}.tar.gz # EPLASER - additional driver for ESC/Page printers (Epson Kowa developed) # http://www.epkowa.co.jp/linux/lpd.html EPLASER= eplaser -EPLASER_VERS= 3.0.6 +EPLASER_VERS= 3.1.1 EPLASER_NAME= ${EPLASER}-${EPLASER_VERS} -EPLASER_SRCS= ${EPLASER_NAME}-652.tgz +EPLASER_SRCS= ${EPLASER_NAME}-705.tgz # MJC - additional driver for Epson MachJet series MJC= mjc @@ -419,9 +419,9 @@ pre-configure: >> ${WRKSRC}/src/contrib.mak # for EPLASER driver ${ECHO_MSG} ">>> adding ${EPLASER} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv6.mak \ + ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv7.mak \ >> ${WRKSRC}/src/contrib.mak - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv6.mak \ + ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv7.mak \ >> ${WRKSRC}/src/contrib.mak # for MJC driver ${ECHO_MSG} ">>> adding ${MJC} driver to contrib.mak ..." @@ -668,7 +668,7 @@ post-install: # for EPLASER driver ${ECHO_MSG} ">>> installing ${EPLASER} docs ..." ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER} -.for i in readme-eplaser-652.euc readme-eplaser-652-jp.euc +.for i in readme-eplaser-705.euc readme-eplaser-705-jp.euc ${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \ ${DOCSDIR}/${GS_VERSION}/${EPLASER} .endfor diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo index 4db3688dd567..d9f2409f2f2a 100644 --- a/print/ghostscript-gnu/distinfo +++ b/print/ghostscript-gnu/distinfo @@ -14,7 +14,7 @@ MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 -MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd +MD5 (ghostscript/eplaser-3.1.1-705.tgz) = 3b984ec8c3d2f161b569783f4884fdea MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b diff --git a/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c b/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c index 6168d5b7da61..3578352b1b7e 100644 --- a/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c +++ b/print/ghostscript-gnu/files/patch-eplaser:gdevescv.c @@ -1,5 +1,5 @@ ---- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001 -+++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002 +--- eplaser/gdevescv.c.orig Fri Jul 25 20:59:58 2003 ++++ eplaser/gdevescv.c Tue Sep 9 22:03:50 2003 @@ -37,8 +37,6 @@ */ @@ -9,44 +9,54 @@ #include <string.h> #include "math_.h" -@@ -1760,13 +1759,13 @@ - - /* Process the next piece of an image. */ - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - escv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used) - #else - escv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1784,7 +1783,7 @@ - - { - --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - if (height == 260) - height = 1; - #endif -@@ -1922,13 +1921,13 @@ - - - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - escv_image_end_image(gx_image_enum_common_t * info, bool draw_last) - #else - escv_image_end_image(gx_device *dev, gx_image_enum_common_t * info, bool draw_last) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; +@@ -321,6 +319,16 @@ + }; + + /* Vector device implementation */ ++#if GS_VERSION_MAJOR >= 8 ++private int escv_beginpage(gx_device_vector * vdev); ++private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int escv_setdash(gx_device_vector * vdev, const float *pattern, ++ uint count, floatp offset); ++private int escv_setflat(gx_device_vector * vdev, floatp flatness); ++private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, ++ gs_logical_operation_t diff); ++#else + private int escv_beginpage(P1(gx_device_vector * vdev)); + private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); + private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); +@@ -329,10 +337,25 @@ + private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness)); + private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, + gs_logical_operation_t diff)); ++#endif + private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, + fixed y1, gx_path_type_t type); + private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, + gx_path_type_t type); ++#if GS_VERSION_MAJOR >= 8 ++private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type); ++private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x1, floatp y1, floatp x2, floatp y2, ++ floatp x3, floatp y3, gx_path_type_t type); ++private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y, ++ floatp x_start, floatp y_start, gx_path_type_t type); ++ ++private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type); ++#else + private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); + private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, + floatp x, floatp y, gx_path_type_t type)); +@@ -345,6 +368,7 @@ + floatp x_start, floatp y_start, gx_path_type_t type)); + + private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); ++#endif + private int escv_setlinewidth(gx_device_vector * vdev, floatp width); + private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); + private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join); diff --git a/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c b/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c index 0d5ba3b0db97..b18c7503f5f5 100644 --- a/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c +++ b/print/ghostscript-gnu/files/patch-eplaser:gdevesmv.c @@ -1,5 +1,5 @@ ---- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001 -+++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002 +--- eplaser/gdevesmv.c.orig Tue Aug 26 19:45:23 2003 ++++ eplaser/gdevesmv.c Tue Sep 9 22:08:25 2003 @@ -34,8 +34,6 @@ */ @@ -9,44 +9,54 @@ #include <string.h> #include "math_.h" -@@ -1799,13 +1798,13 @@ - - /* Process the next piece of an image. */ - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - esmv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used) - #else - esmv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1823,7 +1822,7 @@ - - { - --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - if (height == 260) - height = 1; - #endif -@@ -1980,13 +1979,13 @@ - - - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - esmv_image_end_image(gx_image_enum_common_t * info, bool draw_last) - #else - esmv_image_end_image(gx_device * dev, gx_image_enum_common_t * info, bool draw_last) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; +@@ -407,6 +405,16 @@ + + + /* Vector device implementation */ ++#if GS_VERSION_MAJOR >= 8 ++private int esmv_beginpage(gx_device_vector * vdev); ++private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int esmv_setdash(gx_device_vector * vdev, const float *pattern, ++ uint count, floatp offset); ++private int esmv_setflat(gx_device_vector * vdev, floatp flatness); ++private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, ++ gs_logical_operation_t diff); ++#else + private int esmv_beginpage(P1(gx_device_vector * vdev)); + private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); + private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); +@@ -415,10 +423,25 @@ + private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness)); + private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, + gs_logical_operation_t diff)); ++#endif + private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, + fixed y1, gx_path_type_t type); + private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, + gx_path_type_t type); ++#if GS_VERSION_MAJOR >= 8 ++private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type); ++private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x1, floatp y1, floatp x2, floatp y2, ++ floatp x3, floatp y3, gx_path_type_t type); ++private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y, ++ floatp x_start, floatp y_start, gx_path_type_t type); ++ ++private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type); ++#else + private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); + private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, + floatp x, floatp y, gx_path_type_t type)); +@@ -431,6 +454,7 @@ + floatp x_start, floatp y_start, gx_path_type_t type)); + + private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); ++#endif + private int esmv_setlinewidth(gx_device_vector * vdev, floatp width); + private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); + private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join); diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist index b6ec3e6ffdda..3fb806ca1ddd 100644 --- a/print/ghostscript-gnu/pkg-plist +++ b/print/ghostscript-gnu/pkg-plist @@ -45,8 +45,8 @@ bin/wftopfa %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gsepagif.sh %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-652.euc -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-652-jp.euc +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705-jp.euc %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure index ddae04aaa2ac..ce3803ee0d55 100644 --- a/print/ghostscript-gnu/scripts/configure +++ b/print/ghostscript-gnu/scripts/configure @@ -24,7 +24,7 @@ else $svgalibdevs \ md2k md5k \ md50Mono md50Eco md1xMono \ - appledmp iwhi iwlo iwlq hl7x0 bj10e \ + appledmp iwhi iwlo iwlq hl7x0 hl1240 hl1250 bj10e \ bj10v bj10vh bj200 bjc600 bjc800 \ bjccmyk bjccolor bjcgray bjcmono \ lbp8 \ @@ -38,9 +38,9 @@ else alc8600 alc8500 alc2000 alc4000 alc1900 \ lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \ epl6100 epl5900 epl5800 epl2050 epl2050p epl2120 epl2750 \ - lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 lp8100 lp7700 \ - lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 lp9600 lp8600 \ - lp1800 \ + lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 \ + lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 \ + lp9600 lp8600 lp1800 \ lq850 epsonc \ mjc180 mjc360 mjc720 mj500c \ st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \ @@ -115,6 +115,8 @@ Have fun with this new configuration style ! -andreas \n\n\ "iwlo" "Apple Imagewriter, low-resolution mode" "$status_iwlo" \ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \ "hl7x0" "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \ + "hl1240" "Brother HL1030/1240" "$status_hl1240" \ + "hl1250" "Brother HLHL1050/1070/1250/1270N" "$status_hl1250" \ "bj10e" "Canon BubbleJet BJ-10e" "$status_bj10e" \ "bj10v" "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \ "bj10vh" "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \ @@ -172,6 +174,8 @@ Have fun with this new configuration style ! -andreas \n\n\ "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \ "epl2120" "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \ "epl2750" "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \ + "lp9100" "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \ + "lp7900" "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \ "lp7500" "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \ "lp2400" "Epson LP-2400 laser printer [EPLASER]" "$status_lp2400" \ "lp2200" "Epson LP-2200 laser printer [EPLASER]" "$status_lp2200" \ @@ -179,6 +183,7 @@ Have fun with this new configuration style ! -andreas \n\n\ "lp8900" "Epson LP-8900(R) laser printer [EPLASER]" "$status_lp8900" \ "lp8700" "Epson LP-8700(R) laser printer [EPLASER]" "$status_lp8700" \ "lp8100" "Epson LP-8100(R) laser printer [EPLASER]" "$status_lp8100" \ + "lp7700" "Epson LP-7700(R) laser printer [EPLASER]" "$status_lp7700" \ "lp8600f" "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600f" \ "lp8400f" "Epson LP-8400FX(N) laser printer [EPLASER]" "$status_lp8400f" \ "lp8300f" "Epson LP-8300F laser printer [EPLASER]" "$status_lp8300f" \ diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index dbe46b244b3a..3163c8ed1e0c 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostscript PORTVERSION= ${GS_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \ @@ -19,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gs_fonts/} \ ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \ http://www.ucatv.ne.jp/~taeko/software/gs/:lips \ http://www.humblesoft.com/pub/:epag \ - http://www.epkowa.on.arena.ne.jp/gslpd/data/V306/:eplaser \ + http://www.epkowa.on.arena.ne.jp/gslpd/data/V${EPLASER_VERS:S/.//g}/:eplaser \ http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \ http://www.linuxprinting.org/download/printing/:lxm3200 \ http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \ @@ -224,9 +224,9 @@ EPAG_SRCS= ${EPAG_NAME}.tar.gz # EPLASER - additional driver for ESC/Page printers (Epson Kowa developed) # http://www.epkowa.co.jp/linux/lpd.html EPLASER= eplaser -EPLASER_VERS= 3.0.6 +EPLASER_VERS= 3.1.1 EPLASER_NAME= ${EPLASER}-${EPLASER_VERS} -EPLASER_SRCS= ${EPLASER_NAME}-652.tgz +EPLASER_SRCS= ${EPLASER_NAME}-705.tgz # MJC - additional driver for Epson MachJet series MJC= mjc @@ -419,9 +419,9 @@ pre-configure: >> ${WRKSRC}/src/contrib.mak # for EPLASER driver ${ECHO_MSG} ">>> adding ${EPLASER} driver to contrib.mak ..." - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv6.mak \ + ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv7.mak \ >> ${WRKSRC}/src/contrib.mak - ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv6.mak \ + ${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv7.mak \ >> ${WRKSRC}/src/contrib.mak # for MJC driver ${ECHO_MSG} ">>> adding ${MJC} driver to contrib.mak ..." @@ -668,7 +668,7 @@ post-install: # for EPLASER driver ${ECHO_MSG} ">>> installing ${EPLASER} docs ..." ${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER} -.for i in readme-eplaser-652.euc readme-eplaser-652-jp.euc +.for i in readme-eplaser-705.euc readme-eplaser-705-jp.euc ${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \ ${DOCSDIR}/${GS_VERSION}/${EPLASER} .endfor diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo index 4db3688dd567..d9f2409f2f2a 100644 --- a/print/ghostscript7/distinfo +++ b/print/ghostscript7/distinfo @@ -14,7 +14,7 @@ MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3 -MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd +MD5 (ghostscript/eplaser-3.1.1-705.tgz) = 3b984ec8c3d2f161b569783f4884fdea MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c index 6168d5b7da61..3578352b1b7e 100644 --- a/print/ghostscript7/files/patch-eplaser:gdevescv.c +++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c @@ -1,5 +1,5 @@ ---- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001 -+++ eplaser/gdevescv.c Sat Apr 27 13:45:53 2002 +--- eplaser/gdevescv.c.orig Fri Jul 25 20:59:58 2003 ++++ eplaser/gdevescv.c Tue Sep 9 22:03:50 2003 @@ -37,8 +37,6 @@ */ @@ -9,44 +9,54 @@ #include <string.h> #include "math_.h" -@@ -1760,13 +1759,13 @@ - - /* Process the next piece of an image. */ - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - escv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used) - #else - escv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1784,7 +1783,7 @@ - - { - --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - if (height == 260) - height = 1; - #endif -@@ -1922,13 +1921,13 @@ - - - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - escv_image_end_image(gx_image_enum_common_t * info, bool draw_last) - #else - escv_image_end_image(gx_device *dev, gx_image_enum_common_t * info, bool draw_last) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; +@@ -321,6 +319,16 @@ + }; + + /* Vector device implementation */ ++#if GS_VERSION_MAJOR >= 8 ++private int escv_beginpage(gx_device_vector * vdev); ++private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int escv_setdash(gx_device_vector * vdev, const float *pattern, ++ uint count, floatp offset); ++private int escv_setflat(gx_device_vector * vdev, floatp flatness); ++private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, ++ gs_logical_operation_t diff); ++#else + private int escv_beginpage(P1(gx_device_vector * vdev)); + private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); + private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); +@@ -329,10 +337,25 @@ + private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness)); + private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, + gs_logical_operation_t diff)); ++#endif + private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, + fixed y1, gx_path_type_t type); + private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, + gx_path_type_t type); ++#if GS_VERSION_MAJOR >= 8 ++private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type); ++private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x1, floatp y1, floatp x2, floatp y2, ++ floatp x3, floatp y3, gx_path_type_t type); ++private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y, ++ floatp x_start, floatp y_start, gx_path_type_t type); ++ ++private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type); ++#else + private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); + private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, + floatp x, floatp y, gx_path_type_t type)); +@@ -345,6 +368,7 @@ + floatp x_start, floatp y_start, gx_path_type_t type)); + + private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); ++#endif + private int escv_setlinewidth(gx_device_vector * vdev, floatp width); + private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); + private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join); diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c index 0d5ba3b0db97..b18c7503f5f5 100644 --- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c +++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c @@ -1,5 +1,5 @@ ---- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001 -+++ eplaser/gdevesmv.c Sat Apr 27 13:46:31 2002 +--- eplaser/gdevesmv.c.orig Tue Aug 26 19:45:23 2003 ++++ eplaser/gdevesmv.c Tue Sep 9 22:08:25 2003 @@ -34,8 +34,6 @@ */ @@ -9,44 +9,54 @@ #include <string.h> #include "math_.h" -@@ -1799,13 +1798,13 @@ - - /* Process the next piece of an image. */ - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - esmv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used) - #else - esmv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; -@@ -1823,7 +1822,7 @@ - - { - --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - if (height == 260) - height = 1; - #endif -@@ -1980,13 +1979,13 @@ - - - private int --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - esmv_image_end_image(gx_image_enum_common_t * info, bool draw_last) - #else - esmv_image_end_image(gx_device * dev, gx_image_enum_common_t * info, bool draw_last) - #endif - { --#if GS_VERSION_MAJOR == 6 -+#if GS_VERSION_MAJOR >= 6 - gx_device *dev = info->dev; - #endif - gx_device_vector *const vdev = (gx_device_vector *) dev; +@@ -407,6 +405,16 @@ + + + /* Vector device implementation */ ++#if GS_VERSION_MAJOR >= 8 ++private int esmv_beginpage(gx_device_vector * vdev); ++private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc); ++private int esmv_setdash(gx_device_vector * vdev, const float *pattern, ++ uint count, floatp offset); ++private int esmv_setflat(gx_device_vector * vdev, floatp flatness); ++private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, ++ gs_logical_operation_t diff); ++#else + private int esmv_beginpage(P1(gx_device_vector * vdev)); + private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); + private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc)); +@@ -415,10 +423,25 @@ + private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness)); + private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, + gs_logical_operation_t diff)); ++#endif + private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1, + fixed y1, gx_path_type_t type); + private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath, + gx_path_type_t type); ++#if GS_VERSION_MAJOR >= 8 ++private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type); ++private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x, floatp y, gx_path_type_t type); ++private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0, ++ floatp x1, floatp y1, floatp x2, floatp y2, ++ floatp x3, floatp y3, gx_path_type_t type); ++private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y, ++ floatp x_start, floatp y_start, gx_path_type_t type); ++ ++private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type); ++#else + private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type)); + private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0, + floatp x, floatp y, gx_path_type_t type)); +@@ -431,6 +454,7 @@ + floatp x_start, floatp y_start, gx_path_type_t type)); + + private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type)); ++#endif + private int esmv_setlinewidth(gx_device_vector * vdev, floatp width); + private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap); + private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join); diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist index b6ec3e6ffdda..3fb806ca1ddd 100644 --- a/print/ghostscript7/pkg-plist +++ b/print/ghostscript7/pkg-plist @@ -45,8 +45,8 @@ bin/wftopfa %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gdevepag.txt %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/gsepagif.sh %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/epag/psprint -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-652.euc -%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-652-jp.euc +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc +%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/eplaser/readme-eplaser-705-jp.euc %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/gdi/README %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure index ddae04aaa2ac..ce3803ee0d55 100644 --- a/print/ghostscript7/scripts/configure +++ b/print/ghostscript7/scripts/configure @@ -24,7 +24,7 @@ else $svgalibdevs \ md2k md5k \ md50Mono md50Eco md1xMono \ - appledmp iwhi iwlo iwlq hl7x0 bj10e \ + appledmp iwhi iwlo iwlq hl7x0 hl1240 hl1250 bj10e \ bj10v bj10vh bj200 bjc600 bjc800 \ bjccmyk bjccolor bjcgray bjcmono \ lbp8 \ @@ -38,9 +38,9 @@ else alc8600 alc8500 alc2000 alc4000 alc1900 \ lp9500c lp8800c lp8300c lp8500c lp3000c lp8200c lp8000c \ epl6100 epl5900 epl5800 epl2050 epl2050p epl2120 epl2750 \ - lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 lp8100 lp7700 \ - lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 lp9600 lp8600 \ - lp1800 \ + lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 lp8900 lp8700 \ + lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 lp9600s lp9300 \ + lp9600 lp8600 lp1800 \ lq850 epsonc \ mjc180 mjc360 mjc720 mj500c \ st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \ @@ -115,6 +115,8 @@ Have fun with this new configuration style ! -andreas \n\n\ "iwlo" "Apple Imagewriter, low-resolution mode" "$status_iwlo" \ "iwlq" "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \ "hl7x0" "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \ + "hl1240" "Brother HL1030/1240" "$status_hl1240" \ + "hl1250" "Brother HLHL1050/1070/1250/1270N" "$status_hl1250" \ "bj10e" "Canon BubbleJet BJ-10e" "$status_bj10e" \ "bj10v" "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \ "bj10vh" "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \ @@ -172,6 +174,8 @@ Have fun with this new configuration style ! -andreas \n\n\ "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \ "epl2120" "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \ "epl2750" "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \ + "lp9100" "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \ + "lp7900" "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \ "lp7500" "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \ "lp2400" "Epson LP-2400 laser printer [EPLASER]" "$status_lp2400" \ "lp2200" "Epson LP-2200 laser printer [EPLASER]" "$status_lp2200" \ @@ -179,6 +183,7 @@ Have fun with this new configuration style ! -andreas \n\n\ "lp8900" "Epson LP-8900(R) laser printer [EPLASER]" "$status_lp8900" \ "lp8700" "Epson LP-8700(R) laser printer [EPLASER]" "$status_lp8700" \ "lp8100" "Epson LP-8100(R) laser printer [EPLASER]" "$status_lp8100" \ + "lp7700" "Epson LP-7700(R) laser printer [EPLASER]" "$status_lp7700" \ "lp8600f" "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600f" \ "lp8400f" "Epson LP-8400FX(N) laser printer [EPLASER]" "$status_lp8400f" \ "lp8300f" "Epson LP-8300F laser printer [EPLASER]" "$status_lp8300f" \ |