Update to version 7.07.

PR:		52480
Submitted by:	Ports Fury

20 files changed, 418 insertions, 28 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 412afe1cd1f7..fe1b2ed8716c 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -21,6 +21,8 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		http://www.epkowa.on.arena.ne.jp/pips/data/V306/:eplaser \
 		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
+		http://www.linuxprinting.org/download/printing/:lxm3200 \
+		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
@@ -47,7 +49,11 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
 		${NPDL_SRCS}:npdl \
-		${GDI_SRCS}:gdi
+		${GDI_SRCS}:gdi \
+		${LXM3200_SRCS}:lxm3200 \
+		${LX5000_SRCS}:lx5000 \
+		${LEX7000_SRCS}:lx5000
+
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
@@ -62,10 +68,12 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
-		XCFLAGS="${XCFLAGS}" WITHOUT_X11="${WITHOUT_X11}"
-PLIST_SUB=	GS_VERSION=${GS_VERSION}
+		XCFLAGS="${XCFLAGS}"
+PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}"
+SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
+		WITHOUT_X11="${WITHOUT_X11}" \
+		WITH_SVGALIB="${WITH_SVGALIB}"
 
 MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 \
 		pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 \
@@ -90,6 +98,10 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 USE_XLIB=	yes
 .endif
 
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+.endif
+
 .if defined(WITH_SHLIB)
 .undef WITHOUT_X11
 USE_GNOME=	gtk12
@@ -234,10 +246,27 @@ GDI=		gdi
 GDI_NAME=	Samsung-SmartGDI-all-GS
 GDI_SRCS=	${GDI_NAME}.tar.gz
 
+# LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32
+LXM3200=	lxm3200
+LXM3200_VERS=	20030501
+LXM3200_NAME=	${LXM3200}-tweaked-${LXM3200_VERS}
+LXM3200_SRCS=	${LXM3200_NAME}.tar.gz
+
+# LX5000 - additional driver for Lexmark 5000/Z51/Z82
+# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
+LX5000=		lx5000
+LX5000_SRCS=	gdevlx50.c
+
+# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
+# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
+LEX7000=	lex7000
+LEX7000_SRCS=	gs6.0.lexmark7000.patch
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
 
+.include <bsd.port.pre.mk>
 .SILENT:
 
 pre-everything::
@@ -320,6 +349,19 @@ post-extract:
 # for GDI driver
 	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   extracting ${LXM3200_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LXM3200_SRCS}
+	${LN} -sf ${LXM3200_NAME} ${WRKSRC}/${LXM3200}
+# for LX5000 driver
+	${ECHO_MSG} ">>>   extracting ${LX5000_SRCS} ..."
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${LX5000_SRCS} ${WRKSRC}/src
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   extracting ${LEX7000_SRCS} ..."
+	${MKDIR} ${WRKSRC}/${LEX7000}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${LEX7000_SRCS} | \
+		${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
+		2>/dev/null || ${TRUE}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
@@ -403,6 +445,18 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   adding ${LXM3200} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lxm3200.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for LX5000 driver
+	${ECHO_MSG} ">>>   adding ${LX5000} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lx5000.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   adding ${LEX7000} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lex7000.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
@@ -487,6 +541,16 @@ pre-build:
 .for i in gdevnpdl.c
 	${LN} -sf ${WRKSRC}/${NPDL_NAME}/${i} ${WRKSRC}/src
 .endfor
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LXM3200} ..."
+.for i in gdevlx32.c
+	${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LEX7000} ..."
+.for i in gdevlx7.c
+	${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src
+.endfor
 
 pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
@@ -647,8 +711,15 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${DOCSDIR}/${GS_VERSION}/${GDI}
 .endfor
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   installing ${LXM3200} docs ..."
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LXM3200}
+.for i in README RELEASE_NOTES Z12-Z31-QuickSetup
+	${INSTALL_DATA} ${WRKSRC}/${LXM3200_NAME}/${i} \
+		${DOCSDIR}/${GS_VERSION}/${LXM3200}
+.endfor
 .endif
 	${ECHO_MSG} "> post-installation tasks completed."
 
 .include "Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript-gnu/Makefile.inc b/print/ghostscript-gnu/Makefile.inc
index a60208a0d665..8d8a630b9aa5 100644
--- a/print/ghostscript-gnu/Makefile.inc
+++ b/print/ghostscript-gnu/Makefile.inc
@@ -1 +1 @@
-GS_VERSION=	7.06
+GS_VERSION=	7.07
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index 002dc6be2be8..bdc76a9075b3 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript/ghostscript-7.06.tar.bz2) = 8411464add7f19879ab5086cc45815f5
+MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
 MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
 MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
@@ -18,3 +18,6 @@ MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
 MD5 (ghostscript/Samsung-SmartGDI-all-GS.tar.gz) = e6963f6c9460a964fe57d38479bbdd41
+MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
+MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf
+MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
diff --git a/print/ghostscript-gnu/files/lex7000.contrib.mak b/print/ghostscript-gnu/files/lex7000.contrib.mak
new file mode 100644
index 000000000000..a5f1a162b785
--- /dev/null
+++ b/print/ghostscript-gnu/files/lex7000.contrib.mak
@@ -0,0 +1,21 @@
+# ------ The Lexmark 5700 and 7000 devices ------ #
+
+lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex7000 $(lex7000_)
+
+lex5700_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex5700.dev: $(lex5700_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex5700 $(lex5700_)
+
+lex3200_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex3200.dev: $(lex3200_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex3200 $(lex3200_)
+
+lex2050_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex2050.dev: $(lex2050_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex2050 $(lex2050_)
+
+$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c
+
diff --git a/print/ghostscript-gnu/files/lx5000.contrib.mak b/print/ghostscript-gnu/files/lx5000.contrib.mak
new file mode 100644
index 000000000000..f22c1dbb904c
--- /dev/null
+++ b/print/ghostscript-gnu/files/lx5000.contrib.mak
@@ -0,0 +1,11 @@
+### ----------------- LexMark 5000 printer ----------------------------- ###
+### Note: this driver was contributed by users.  Please contact:         ###
+###   Peter B. West <p.west@uq.net.au>                                   ###
+
+lx5000_=$(GLOBJ)gdevlx50.$(OBJ)
+$(DD)lx5000.dev:    $(lx5000_)
+	$(SETPDEV) $(DD)lx5000 $(lx5000_)
+
+$(GLOBJ)gdevlx50.$(OBJ): $(GLSRC)gdevlx50.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c
+
diff --git a/print/ghostscript-gnu/files/lxm3200.contrib.mak b/print/ghostscript-gnu/files/lxm3200.contrib.mak
new file mode 100644
index 000000000000..c670f6de111c
--- /dev/null
+++ b/print/ghostscript-gnu/files/lxm3200.contrib.mak
@@ -0,0 +1,10 @@
+### ---------------- Lexmark 3200 device ----------------- ###
+
+lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
+
+$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
+	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
+
+$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
+	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
+
diff --git a/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps b/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps
new file mode 100644
index 000000000000..1e0cf12559a7
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-lib:gs_setpd.ps
@@ -0,0 +1,59 @@
+--- lib/gs_setpd.ps.orig	Mon Mar 31 22:02:22 2003
++++ lib/gs_setpd.ps	Sat May 17 06:57:49 2003
+@@ -323,21 +323,42 @@
+     } bind
+ .dicttomark readonly def
+ 
+-% Define the keys used in input attribute matching.
+-/.inputattrkeys [
+-  /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
+-	% The following are documented in Adobe's supplement for v2017.
+-  /LeadingEdge /MediaClass
+-] readonly def
+-% Define other keys used in media selection.
+-/.inputselectionkeys [
+-  /MediaPosition /Orientation
+-] readonly def
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to
++% support the standard Adobe media attributes.
++currentdict /NOMEDIAATTRS known {
++  % Define the keys used in input attribute matching.
++  /.inputattrkeys [
++    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
++	  % The following are documented in Adobe's supplement for v2017.
++    /LeadingEdge /MediaClass
++  ] readonly def
++  % Define other keys used in media selection.
++  /.inputselectionkeys [
++    /MediaPosition /Orientation
++  ] readonly def
+ 
+-% Define the keys used in output attribute matching.
+-/.outputattrkeys [
+-  /OutputType
+-] readonly def
++  % Define the keys used in output attribute matching.
++  /.outputattrkeys [
++    /OutputType
++  ] readonly def
++} {
++  % Define only PageSize for input attribute matching.
++  /.inputattrkeys [
++    /PageSize
++  ] readonly def
++  % Define no other keys used in media selection.
++  /.inputselectionkeys [
++    /noInputSelectionsKeys
++  ] readonly def
++
++  % Define no keys used in output attribute matching.
++  /.outputattrkeys [
++    /noOutputAttrKeys
++  ] readonly def
++} ifelse
+ 
+ % Define all the parameters that should always be copied to the merged
+ % dictionary.
diff --git a/print/ghostscript-gnu/pkg-descr b/print/ghostscript-gnu/pkg-descr
index fc7fa847a854..e6e4f6341aac 100644
--- a/print/ghostscript-gnu/pkg-descr
+++ b/print/ghostscript-gnu/pkg-descr
@@ -15,8 +15,8 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
 	  - http://gimp-print.sourceforge.net/
-	o Spacial drivers for verious printer models mainly sold in Japan
-	  - Alps, Canon, Epson, NEC, Ricoh,...
+	o Special drivers for verious printer models
+	  - Alps, Canon, Epson, NEC, Lexmark, Ricoh,...
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index b19a63fb5ddb..578ab9214ead 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -51,6 +51,9 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/README
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mjc
@@ -547,6 +550,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lxm3200
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
diff --git a/print/ghostscript-gnu/scripts/configure b/print/ghostscript-gnu/scripts/configure
index 36f568a7f225..c4e1e56d3a1d 100644
--- a/print/ghostscript-gnu/scripts/configure
+++ b/print/ghostscript-gnu/scripts/configure
@@ -12,11 +12,16 @@ x11devs="x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \
 	x11gray2 x11gray4 x11mono x11rg16x x11rg32x"
 fi
 
-if [ ! -z "${GS_OPTIONS}" ]; then
-	set ${GS_OPTIONS}
+if [ -n "${WITH_SVGALIB}" ]; then
+svgalibdevs="lvga256 vgalib"
+fi
+
+if [ ! -z "${GS_DRIVERS_LIST}" ]; then
+	set ${GS_DRIVERS_LIST}
 else
 	set \
 		$x11devs \
+		$svgalibdevs \
 		md2k md5k \
 		md50Mono md50Eco md1xMono \
 		appledmp iwhi iwlo iwlq hl7x0 bj10e \
@@ -46,7 +51,9 @@ else
 		pj pjetxl pjxl paintjet \
 		pjxl300 pxlmono pxlcolor \
 		pcl3 hpdj \
-		ijs ibmpro jetp3852 imagen fs600 lxm5700m cp50 necp6 \
+		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
+		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
+		cp50 necp6 \
 		npdl \
 		oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \
 		rpdl \
@@ -64,7 +71,8 @@ else
 		bit bitrgb bitcmyk plan9bm pam pbm pbmraw \
 		pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw \
 		pkm pkmraw pksm pksmraw \
-		pngmono pnggray png16 png256 png16m pnga psmono psgray psrgb \
+		pngmono pnggray png16 png256 png16m pngalpha \
+		psmono psgray psrgb \
 		pswrite epswrite sgirgb sunhmono \
 		tiffcrle tiffg3 tiffg32d tiffg4 \
 		tiff12nc tiff24nc tifflzw tiffpack \
@@ -95,6 +103,8 @@ Have fun with this new configuration style !     -andreas \n\n\
   "x11mono"  "X Window System masquer. as black-and-white device" "$status_x11mono" \
   "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" "$status_x11rg16x" \
   "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" "$status_x11rg32x" \
+  "lvga256"  "SVGAlib, 256-color VGA modes" "$status_lvga256" \
+  "vgalib"   "SVGAlib, 16-color VGA modes" "$status_vgalib" \
   "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" "$status_md2k" \
   "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" "$status_md5k" \
   "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" "$status_md50Mono" \
@@ -232,6 +242,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "imagen"   "Imagen ImPress printers" "$status_imagen" \
   "fs600"    "Kyocera FS-600 (600 dpi)" "$status_fs600" \
   "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \
+  "lxm3200"  "Lexmark 3200/Z12/Z22/Z31/Z32 [LXM3200]" "$status_lxm3200" \
+  "lx5000"   "Lexmark 5000/Z51/Z82 [LX5000]" "$status_lx5000" \
+  "lex2050"  "Lexmark 2050 [LEX7000]" "$status_lex2050" \
+  "lex3200"  "Lexmark 3200 [LEX7000]" "$status_lex3200" \
+  "lex5700"  "Lexmark 5700 [LEX7000]" "$status_lex5700" \
+  "lex7000"  "Lexmark 7000 [LEX7000]" "$status_lex7000" \
   "cp50"     "Mitsubishi CP50 color" "$status_cp50" \
   "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" "$status_necp6" \
   "npdl"     "NEC Printer Description Language [NPDL]" "$status_npdl" \
@@ -308,7 +324,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
   "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
   "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pnga"     "PNG with transparency" "$status_pnga" \
+  "pngalpha" "PNG 32-bit RGBA color Portable Network Graphics" "$status_pngalpha" \
   "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
   "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
   "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 412afe1cd1f7..fe1b2ed8716c 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -21,6 +21,8 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		http://www.epkowa.on.arena.ne.jp/pips/data/V306/:eplaser \
 		http://www.hi.is.uec.ac.jp/~osamuw/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
+		http://www.linuxprinting.org/download/printing/:lxm3200 \
+		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,gs_fonts,ports_jp_gs \
@@ -47,7 +49,11 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
 		${NPDL_SRCS}:npdl \
-		${GDI_SRCS}:gdi
+		${GDI_SRCS}:gdi \
+		${LXM3200_SRCS}:lxm3200 \
+		${LX5000_SRCS}:lx5000 \
+		${LEX7000_SRCS}:lx5000
+
 DIST_SUBDIR=	ghostscript
 EXTRACT_ONLY=	${GS_SRCS}
 
@@ -62,10 +68,12 @@ USE_BZIP2=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
-		XCFLAGS="${XCFLAGS}" WITHOUT_X11="${WITHOUT_X11}"
-PLIST_SUB=	GS_VERSION=${GS_VERSION}
+		XCFLAGS="${XCFLAGS}"
+PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-SCRIPTS_ENV=	GS_OPTIONS="${GS_OPTIONS}" WITHOUT_X11="${WITHOUT_X11}"
+SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
+		WITHOUT_X11="${WITHOUT_X11}" \
+		WITH_SVGALIB="${WITH_SVGALIB}"
 
 MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 \
 		pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 \
@@ -90,6 +98,10 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 USE_XLIB=	yes
 .endif
 
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+.endif
+
 .if defined(WITH_SHLIB)
 .undef WITHOUT_X11
 USE_GNOME=	gtk12
@@ -234,10 +246,27 @@ GDI=		gdi
 GDI_NAME=	Samsung-SmartGDI-all-GS
 GDI_SRCS=	${GDI_NAME}.tar.gz
 
+# LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32
+LXM3200=	lxm3200
+LXM3200_VERS=	20030501
+LXM3200_NAME=	${LXM3200}-tweaked-${LXM3200_VERS}
+LXM3200_SRCS=	${LXM3200_NAME}.tar.gz
+
+# LX5000 - additional driver for Lexmark 5000/Z51/Z82
+# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
+LX5000=		lx5000
+LX5000_SRCS=	gdevlx50.c
+
+# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
+# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
+LEX7000=	lex7000
+LEX7000_SRCS=	gs6.0.lexmark7000.patch
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
 
+.include <bsd.port.pre.mk>
 .SILENT:
 
 pre-everything::
@@ -320,6 +349,19 @@ post-extract:
 # for GDI driver
 	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   extracting ${LXM3200_SRCS} ..."
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LXM3200_SRCS}
+	${LN} -sf ${LXM3200_NAME} ${WRKSRC}/${LXM3200}
+# for LX5000 driver
+	${ECHO_MSG} ">>>   extracting ${LX5000_SRCS} ..."
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/${LX5000_SRCS} ${WRKSRC}/src
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   extracting ${LEX7000_SRCS} ..."
+	${MKDIR} ${WRKSRC}/${LEX7000}
+	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${LEX7000_SRCS} | \
+		${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
+		2>/dev/null || ${TRUE}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
@@ -403,6 +445,18 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   adding ${LXM3200} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lxm3200.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for LX5000 driver
+	${ECHO_MSG} ">>>   adding ${LX5000} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lx5000.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   adding ${LEX7000} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/lex7000.contrib.mak \
+		>> ${WRKSRC}/src/contrib.mak
 
 post-configure:
 	${ECHO_MSG} ">>> in post-configure ..."
@@ -487,6 +541,16 @@ pre-build:
 .for i in gdevnpdl.c
 	${LN} -sf ${WRKSRC}/${NPDL_NAME}/${i} ${WRKSRC}/src
 .endfor
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LXM3200} ..."
+.for i in gdevlx32.c
+	${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src
+.endfor
+# for LEX7000 driver
+	${ECHO_MSG} ">>>   creating symlinks for ${LEX7000} ..."
+.for i in gdevlx7.c
+	${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src
+.endfor
 
 pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
@@ -647,8 +711,15 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${DOCSDIR}/${GS_VERSION}/${GDI}
 .endfor
+# for LXM3200 driver
+	${ECHO_MSG} ">>>   installing ${LXM3200} docs ..."
+	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LXM3200}
+.for i in README RELEASE_NOTES Z12-Z31-QuickSetup
+	${INSTALL_DATA} ${WRKSRC}/${LXM3200_NAME}/${i} \
+		${DOCSDIR}/${GS_VERSION}/${LXM3200}
+.endfor
 .endif
 	${ECHO_MSG} "> post-installation tasks completed."
 
 .include "Makefile.inc"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/print/ghostscript7/Makefile.inc b/print/ghostscript7/Makefile.inc
index a60208a0d665..8d8a630b9aa5 100644
--- a/print/ghostscript7/Makefile.inc
+++ b/print/ghostscript7/Makefile.inc
@@ -1 +1 @@
-GS_VERSION=	7.06
+GS_VERSION=	7.07
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index 002dc6be2be8..bdc76a9075b3 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript/ghostscript-7.06.tar.bz2) = 8411464add7f19879ab5086cc45815f5
+MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
 MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
 MD5 (ghostscript/gs-hp2200.tar.gz) = cafe60c0003abe370579f9bfb1d27caa
@@ -18,3 +18,6 @@ MD5 (ghostscript/eplaser-3.0.6-652.tgz) = a575b9f3424d0a9ab6fbb5619429a8fd
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
 MD5 (ghostscript/Samsung-SmartGDI-all-GS.tar.gz) = e6963f6c9460a964fe57d38479bbdd41
+MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
+MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf
+MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
diff --git a/print/ghostscript7/files/lex7000.contrib.mak b/print/ghostscript7/files/lex7000.contrib.mak
new file mode 100644
index 000000000000..a5f1a162b785
--- /dev/null
+++ b/print/ghostscript7/files/lex7000.contrib.mak
@@ -0,0 +1,21 @@
+# ------ The Lexmark 5700 and 7000 devices ------ #
+
+lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex7000 $(lex7000_)
+
+lex5700_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex5700.dev: $(lex5700_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex5700 $(lex5700_)
+
+lex3200_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex3200.dev: $(lex3200_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex3200 $(lex3200_)
+
+lex2050_=$(GLOBJ)gdevlx7.$(OBJ)
+$(DD)lex2050.dev: $(lex2050_) $(DD)page.dev
+	$(SETPDEV) $(DD)lex2050 $(lex2050_)
+
+$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c
+
diff --git a/print/ghostscript7/files/lx5000.contrib.mak b/print/ghostscript7/files/lx5000.contrib.mak
new file mode 100644
index 000000000000..f22c1dbb904c
--- /dev/null
+++ b/print/ghostscript7/files/lx5000.contrib.mak
@@ -0,0 +1,11 @@
+### ----------------- LexMark 5000 printer ----------------------------- ###
+### Note: this driver was contributed by users.  Please contact:         ###
+###   Peter B. West <p.west@uq.net.au>                                   ###
+
+lx5000_=$(GLOBJ)gdevlx50.$(OBJ)
+$(DD)lx5000.dev:    $(lx5000_)
+	$(SETPDEV) $(DD)lx5000 $(lx5000_)
+
+$(GLOBJ)gdevlx50.$(OBJ): $(GLSRC)gdevlx50.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c
+
diff --git a/print/ghostscript7/files/lxm3200.contrib.mak b/print/ghostscript7/files/lxm3200.contrib.mak
new file mode 100644
index 000000000000..c670f6de111c
--- /dev/null
+++ b/print/ghostscript7/files/lxm3200.contrib.mak
@@ -0,0 +1,10 @@
+### ---------------- Lexmark 3200 device ----------------- ###
+
+lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
+
+$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
+	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
+
+$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
+	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
+
diff --git a/print/ghostscript7/files/patch-lib:gs_setpd.ps b/print/ghostscript7/files/patch-lib:gs_setpd.ps
new file mode 100644
index 000000000000..1e0cf12559a7
--- /dev/null
+++ b/print/ghostscript7/files/patch-lib:gs_setpd.ps
@@ -0,0 +1,59 @@
+--- lib/gs_setpd.ps.orig	Mon Mar 31 22:02:22 2003
++++ lib/gs_setpd.ps	Sat May 17 06:57:49 2003
+@@ -323,21 +323,42 @@
+     } bind
+ .dicttomark readonly def
+ 
+-% Define the keys used in input attribute matching.
+-/.inputattrkeys [
+-  /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
+-	% The following are documented in Adobe's supplement for v2017.
+-  /LeadingEdge /MediaClass
+-] readonly def
+-% Define other keys used in media selection.
+-/.inputselectionkeys [
+-  /MediaPosition /Orientation
+-] readonly def
++% M. Sweet, Easy Software Products:
++%
++% Define NOMEDIAATTRS to turn the default (but unimplementable) media
++% selection policies for setpagedevice.  This is used by CUPS to
++% support the standard Adobe media attributes.
++currentdict /NOMEDIAATTRS known {
++  % Define the keys used in input attribute matching.
++  /.inputattrkeys [
++    /PageSize /MediaColor /MediaWeight /MediaType /InsertSheet
++	  % The following are documented in Adobe's supplement for v2017.
++    /LeadingEdge /MediaClass
++  ] readonly def
++  % Define other keys used in media selection.
++  /.inputselectionkeys [
++    /MediaPosition /Orientation
++  ] readonly def
+ 
+-% Define the keys used in output attribute matching.
+-/.outputattrkeys [
+-  /OutputType
+-] readonly def
++  % Define the keys used in output attribute matching.
++  /.outputattrkeys [
++    /OutputType
++  ] readonly def
++} {
++  % Define only PageSize for input attribute matching.
++  /.inputattrkeys [
++    /PageSize
++  ] readonly def
++  % Define no other keys used in media selection.
++  /.inputselectionkeys [
++    /noInputSelectionsKeys
++  ] readonly def
++
++  % Define no keys used in output attribute matching.
++  /.outputattrkeys [
++    /noOutputAttrKeys
++  ] readonly def
++} ifelse
+ 
+ % Define all the parameters that should always be copied to the merged
+ % dictionary.
diff --git a/print/ghostscript7/pkg-descr b/print/ghostscript7/pkg-descr
index fc7fa847a854..e6e4f6341aac 100644
--- a/print/ghostscript7/pkg-descr
+++ b/print/ghostscript7/pkg-descr
@@ -15,8 +15,8 @@ This port includes add-on packages (not part of the official gs release)
 	  - http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 	o Gimp-Print driver for Canon/Epson/Lexmark/HP printers
 	  - http://gimp-print.sourceforge.net/
-	o Spacial drivers for verious printer models mainly sold in Japan
-	  - Alps, Canon, Epson, NEC, Ricoh,...
+	o Special drivers for verious printer models
+	  - Alps, Canon, Epson, NEC, Lexmark, Ricoh,...
 	o Additional contributed uniprint driver profiles for
 	  - Epson Stylus Color 740 and Epson LQ-1170
 
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index b19a63fb5ddb..578ab9214ead 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -51,6 +51,9 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/NEWS
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/hpdj/hpdj.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lips/Gdevlips.htm
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/README
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
+%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/md2k/README.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mjc
@@ -547,6 +550,7 @@ share/ghostscript/fonts/z003034l.pfm
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/md2k
+%%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lxm3200
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/lips
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/hpdj
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/gdi
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 36f568a7f225..c4e1e56d3a1d 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -12,11 +12,16 @@ x11devs="x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \
 	x11gray2 x11gray4 x11mono x11rg16x x11rg32x"
 fi
 
-if [ ! -z "${GS_OPTIONS}" ]; then
-	set ${GS_OPTIONS}
+if [ -n "${WITH_SVGALIB}" ]; then
+svgalibdevs="lvga256 vgalib"
+fi
+
+if [ ! -z "${GS_DRIVERS_LIST}" ]; then
+	set ${GS_DRIVERS_LIST}
 else
 	set \
 		$x11devs \
+		$svgalibdevs \
 		md2k md5k \
 		md50Mono md50Eco md1xMono \
 		appledmp iwhi iwlo iwlq hl7x0 bj10e \
@@ -46,7 +51,9 @@ else
 		pj pjetxl pjxl paintjet \
 		pjxl300 pxlmono pxlcolor \
 		pcl3 hpdj \
-		ijs ibmpro jetp3852 imagen fs600 lxm5700m cp50 necp6 \
+		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
+		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
+		cp50 necp6 \
 		npdl \
 		oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \
 		rpdl \
@@ -64,7 +71,8 @@ else
 		bit bitrgb bitcmyk plan9bm pam pbm pbmraw \
 		pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw \
 		pkm pkmraw pksm pksmraw \
-		pngmono pnggray png16 png256 png16m pnga psmono psgray psrgb \
+		pngmono pnggray png16 png256 png16m pngalpha \
+		psmono psgray psrgb \
 		pswrite epswrite sgirgb sunhmono \
 		tiffcrle tiffg3 tiffg32d tiffg4 \
 		tiff12nc tiff24nc tifflzw tiffpack \
@@ -95,6 +103,8 @@ Have fun with this new configuration style !     -andreas \n\n\
   "x11mono"  "X Window System masquer. as black-and-white device" "$status_x11mono" \
   "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" "$status_x11rg16x" \
   "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" "$status_x11rg32x" \
+  "lvga256"  "SVGAlib, 256-color VGA modes" "$status_lvga256" \
+  "vgalib"   "SVGAlib, 16-color VGA modes" "$status_vgalib" \
   "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" "$status_md2k" \
   "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" "$status_md5k" \
   "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" "$status_md50Mono" \
@@ -232,6 +242,12 @@ Have fun with this new configuration style !     -andreas \n\n\
   "imagen"   "Imagen ImPress printers" "$status_imagen" \
   "fs600"    "Kyocera FS-600 (600 dpi)" "$status_fs600" \
   "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \
+  "lxm3200"  "Lexmark 3200/Z12/Z22/Z31/Z32 [LXM3200]" "$status_lxm3200" \
+  "lx5000"   "Lexmark 5000/Z51/Z82 [LX5000]" "$status_lx5000" \
+  "lex2050"  "Lexmark 2050 [LEX7000]" "$status_lex2050" \
+  "lex3200"  "Lexmark 3200 [LEX7000]" "$status_lex3200" \
+  "lex5700"  "Lexmark 5700 [LEX7000]" "$status_lex5700" \
+  "lex7000"  "Lexmark 7000 [LEX7000]" "$status_lex7000" \
   "cp50"     "Mitsubishi CP50 color" "$status_cp50" \
   "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" "$status_necp6" \
   "npdl"     "NEC Printer Description Language [NPDL]" "$status_npdl" \
@@ -308,7 +324,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
   "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
   "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pnga"     "PNG with transparency" "$status_pnga" \
+  "pngalpha" "PNG 32-bit RGBA color Portable Network Graphics" "$status_pngalpha" \
   "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
   "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
   "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \