diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 143c9f874e74..2f084312cbf4 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
@@ -18,7 +19,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		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.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 \
@@ -43,7 +43,6 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
-		${NPDL_SRCS}:npdl \
 		${GDI_SRCS}:gdi \
 		${LXM3200_SRCS}:lxm3200 \
 		${LX5000_SRCS}:lx5000 \
@@ -197,12 +196,6 @@ MJC_VERS=	0.8
 MJC_NAME=	gdevmjc-${MJC_VERS}
 MJC_SRCS=	${MJC_NAME}.tar.gz
 
-# NPDL - additional driver for NEC Printer Description Language printers
-NPDL=		npdl
-NPDL_VERS=	1.6.3
-NPDL_NAME=	gdevnpdl-${NPDL_VERS}
-NPDL_SRCS=	${NPDL_NAME}.tar.gz
-
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
 GDI_NAME=	Samsung-SmartGDI-all-GS
@@ -292,9 +285,6 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${MJC_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
 	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
-# for NPDL driver
-	${ECHO_MSG} ">>>   extracting ${NPDL_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRCS}
 # for GDI driver
 	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
@@ -366,7 +356,7 @@ pre-configure:
 		>> ${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 \
+	${CAT} ${FILESDIR}/epag.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for EPLASER driver
 	${ECHO_MSG} ">>>   adding ${EPLASER} driver to contrib.mak ..."
@@ -378,10 +368,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.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 GDI driver
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
@@ -431,7 +417,8 @@ pre-build:
 .endfor
 # for LIPS driver
 	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
-.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c gdevrpdl.c
+.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \
+	gdevnpdl.c gdevrpdl.c
 	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
 .endfor
 # for EPAG driver
@@ -453,11 +440,6 @@ pre-build:
 	mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
 	${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
-.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
@@ -568,13 +550,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${MJC}
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   installing ${NPDL} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${NPDL}
-.for i in gdevnpdl.jis
-	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${NPDL}
-.endfor
 # for GDI driver
 	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 79caa18be266..91dda8543b62 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -13,8 +13,7 @@ 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/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/Samsung-SmartGDI-all-GS.tar.gz) = 72ca1cf514f09aa4b131240722deee79
 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-afpl/files/epag.contrib.mak b/print/ghostscript-afpl/files/epag.contrib.mak
new file mode 100644
index 000000000000..2e6117ad4b51
--- /dev/null
+++ b/print/ghostscript-afpl/files/epag.contrib.mak
@@ -0,0 +1,8 @@
+### ------- Epson ESC/Page printer device ----------------- ###
+epag_=$(GLOBJ)gdevepag.$(OBJ)
+
+$(DD)epag.dev : $(epag_) $(DD)page.dev
+	$(SETPDEV) $(DD)epag $(epag_)
+
+$(GLOBJ)gdevepag.$(OBJ): $(GLSRC)gdevepag.c $(gdevprn_h) $(PDEVH)
+	$(GLCC) $(GLO_)gdevepag.$(OBJ) $(C_) $(GLSRC)gdevepag.c
diff --git a/print/ghostscript-afpl/files/patch-lips:gdevlips.mak b/print/ghostscript-afpl/files/patch-lips:gdevlips.mak
deleted file mode 100644
index 06630057330c..000000000000
--- a/print/ghostscript-afpl/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
-+++ lips/gdevlips.mak	Wed Feb 13 07:29:36 2002
-@@ -43,15 +43,6 @@
- $(GLOBJ)lp2000.dev: $(escpage_) $(DD)page.dev
- 	$(SETPDEV) $(DD)lp2000 $(escpage_)
- 
--### --- The NEC NPDL language printer device ------ ###
--
--npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
--$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
--
--$(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
--	$(SETPDEV) $(DD)npdl $(npdl_)
--	
- ### --- The RICOH RPDL language printer device ------ ###
- 
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 25314d5dfc08..0f4c855b1884 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -57,7 +57,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mje
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -517,7 +516,6 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
-%%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
diff --git a/print/ghostscript-afpl/scripts/configure b/print/ghostscript-afpl/scripts/configure
index 834327911bc7..ae54b4f496bc 100644
--- a/print/ghostscript-afpl/scripts/configure
+++ b/print/ghostscript-afpl/scripts/configure
@@ -251,7 +251,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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" \
+  "npdl"     "NEC Printer Description Language [LIPS]" "$status_npdl" \
   "oce9050"  "OCE 9050 printer" "$status_oce9050" \
   "oki182"   "Okidata MicroLine 182" "$status_oki182" \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 143c9f874e74..2f084312cbf4 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
@@ -18,7 +19,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		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.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 \
@@ -43,7 +43,6 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
-		${NPDL_SRCS}:npdl \
 		${GDI_SRCS}:gdi \
 		${LXM3200_SRCS}:lxm3200 \
 		${LX5000_SRCS}:lx5000 \
@@ -197,12 +196,6 @@ MJC_VERS=	0.8
 MJC_NAME=	gdevmjc-${MJC_VERS}
 MJC_SRCS=	${MJC_NAME}.tar.gz
 
-# NPDL - additional driver for NEC Printer Description Language printers
-NPDL=		npdl
-NPDL_VERS=	1.6.3
-NPDL_NAME=	gdevnpdl-${NPDL_VERS}
-NPDL_SRCS=	${NPDL_NAME}.tar.gz
-
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
 GDI_NAME=	Samsung-SmartGDI-all-GS
@@ -292,9 +285,6 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${MJC_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
 	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
-# for NPDL driver
-	${ECHO_MSG} ">>>   extracting ${NPDL_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRCS}
 # for GDI driver
 	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
@@ -366,7 +356,7 @@ pre-configure:
 		>> ${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 \
+	${CAT} ${FILESDIR}/epag.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for EPLASER driver
 	${ECHO_MSG} ">>>   adding ${EPLASER} driver to contrib.mak ..."
@@ -378,10 +368,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.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 GDI driver
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
@@ -431,7 +417,8 @@ pre-build:
 .endfor
 # for LIPS driver
 	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
-.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c gdevrpdl.c
+.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \
+	gdevnpdl.c gdevrpdl.c
 	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
 .endfor
 # for EPAG driver
@@ -453,11 +440,6 @@ pre-build:
 	mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
 	${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
-.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
@@ -568,13 +550,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${MJC}
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   installing ${NPDL} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${NPDL}
-.for i in gdevnpdl.jis
-	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${NPDL}
-.endfor
 # for GDI driver
 	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 79caa18be266..91dda8543b62 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -13,8 +13,7 @@ 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/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/Samsung-SmartGDI-all-GS.tar.gz) = 72ca1cf514f09aa4b131240722deee79
 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-gpl/files/epag.contrib.mak b/print/ghostscript-gpl/files/epag.contrib.mak
new file mode 100644
index 000000000000..2e6117ad4b51
--- /dev/null
+++ b/print/ghostscript-gpl/files/epag.contrib.mak
@@ -0,0 +1,8 @@
+### ------- Epson ESC/Page printer device ----------------- ###
+epag_=$(GLOBJ)gdevepag.$(OBJ)
+
+$(DD)epag.dev : $(epag_) $(DD)page.dev
+	$(SETPDEV) $(DD)epag $(epag_)
+
+$(GLOBJ)gdevepag.$(OBJ): $(GLSRC)gdevepag.c $(gdevprn_h) $(PDEVH)
+	$(GLCC) $(GLO_)gdevepag.$(OBJ) $(C_) $(GLSRC)gdevepag.c
diff --git a/print/ghostscript-gpl/files/patch-lips:gdevlips.mak b/print/ghostscript-gpl/files/patch-lips:gdevlips.mak
deleted file mode 100644
index 06630057330c..000000000000
--- a/print/ghostscript-gpl/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
-+++ lips/gdevlips.mak	Wed Feb 13 07:29:36 2002
-@@ -43,15 +43,6 @@
- $(GLOBJ)lp2000.dev: $(escpage_) $(DD)page.dev
- 	$(SETPDEV) $(DD)lp2000 $(escpage_)
- 
--### --- The NEC NPDL language printer device ------ ###
--
--npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
--$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
--
--$(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
--	$(SETPDEV) $(DD)npdl $(npdl_)
--	
- ### --- The RICOH RPDL language printer device ------ ###
- 
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 25314d5dfc08..0f4c855b1884 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -57,7 +57,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mje
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -517,7 +516,6 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
-%%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
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index 834327911bc7..ae54b4f496bc 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -251,7 +251,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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" \
+  "npdl"     "NEC Printer Description Language [LIPS]" "$status_npdl" \
   "oce9050"  "OCE 9050 printer" "$status_oce9050" \
   "oki182"   "Okidata MicroLine 182" "$status_oki182" \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 143c9f874e74..2f084312cbf4 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
@@ -18,7 +19,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gs_fonts,bjc250/} \
 		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.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 \
@@ -43,7 +43,6 @@ DISTFILES=	${GS_SRCS}:gs_srcs \
 		${EPAG_SRCS}:epag \
 		${EPLASER_SRCS}:eplaser \
 		${MJC_SRCS}:ports_jp \
-		${NPDL_SRCS}:npdl \
 		${GDI_SRCS}:gdi \
 		${LXM3200_SRCS}:lxm3200 \
 		${LX5000_SRCS}:lx5000 \
@@ -197,12 +196,6 @@ MJC_VERS=	0.8
 MJC_NAME=	gdevmjc-${MJC_VERS}
 MJC_SRCS=	${MJC_NAME}.tar.gz
 
-# NPDL - additional driver for NEC Printer Description Language printers
-NPDL=		npdl
-NPDL_VERS=	1.6.3
-NPDL_NAME=	gdevnpdl-${NPDL_VERS}
-NPDL_SRCS=	${NPDL_NAME}.tar.gz
-
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
 GDI_NAME=	Samsung-SmartGDI-all-GS
@@ -292,9 +285,6 @@ post-extract:
 	${ECHO_MSG} ">>>   extracting ${MJC_SRCS} ..."
 	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
 	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
-# for NPDL driver
-	${ECHO_MSG} ">>>   extracting ${NPDL_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${NPDL_SRCS}
 # for GDI driver
 	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
 	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
@@ -366,7 +356,7 @@ pre-configure:
 		>> ${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 \
+	${CAT} ${FILESDIR}/epag.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for EPLASER driver
 	${ECHO_MSG} ">>>   adding ${EPLASER} driver to contrib.mak ..."
@@ -378,10 +368,6 @@ pre-configure:
 	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.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 GDI driver
 	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
 	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
@@ -431,7 +417,8 @@ pre-build:
 .endfor
 # for LIPS driver
 	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
-.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c gdevrpdl.c
+.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \
+	gdevnpdl.c gdevrpdl.c
 	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
 .endfor
 # for EPAG driver
@@ -453,11 +440,6 @@ pre-build:
 	mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
 	${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   creating symlinks for ${NPDL} ..."
-.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
@@ -568,13 +550,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
 		${DOCSDIR}/${GS_VERSION}/${MJC}
 .endfor
-# for NPDL driver
-	${ECHO_MSG} ">>>   installing ${NPDL} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${NPDL}
-.for i in gdevnpdl.jis
-	${INSTALL_DATA} ${WRKSRC}/${NPDL_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${NPDL}
-.endfor
 # for GDI driver
 	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
 	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 79caa18be266..91dda8543b62 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -13,8 +13,7 @@ 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/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/Samsung-SmartGDI-all-GS.tar.gz) = 72ca1cf514f09aa4b131240722deee79
 MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
 MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf
 MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
diff --git a/print/ghostscript8/files/epag.contrib.mak b/print/ghostscript8/files/epag.contrib.mak
new file mode 100644
index 000000000000..2e6117ad4b51
--- /dev/null
+++ b/print/ghostscript8/files/epag.contrib.mak
@@ -0,0 +1,8 @@
+### ------- Epson ESC/Page printer device ----------------- ###
+epag_=$(GLOBJ)gdevepag.$(OBJ)
+
+$(DD)epag.dev : $(epag_) $(DD)page.dev
+	$(SETPDEV) $(DD)epag $(epag_)
+
+$(GLOBJ)gdevepag.$(OBJ): $(GLSRC)gdevepag.c $(gdevprn_h) $(PDEVH)
+	$(GLCC) $(GLO_)gdevepag.$(OBJ) $(C_) $(GLSRC)gdevepag.c
diff --git a/print/ghostscript8/files/patch-lips:gdevlips.mak b/print/ghostscript8/files/patch-lips:gdevlips.mak
deleted file mode 100644
index 06630057330c..000000000000
--- a/print/ghostscript8/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
-+++ lips/gdevlips.mak	Wed Feb 13 07:29:36 2002
-@@ -43,15 +43,6 @@
- $(GLOBJ)lp2000.dev: $(escpage_) $(DD)page.dev
- 	$(SETPDEV) $(DD)lp2000 $(escpage_)
- 
--### --- The NEC NPDL language printer device ------ ###
--
--npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
--$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
--
--$(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
--	$(SETPDEV) $(DD)npdl $(npdl_)
--	
- ### --- The RICOH RPDL language printer device ------ ###
- 
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 25314d5dfc08..0f4c855b1884 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -57,7 +57,6 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.mje
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/README.noz
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/mjc/cpem.doc
-%%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/npdl/gdevnpdl.jis
 share/ghostscript/%%GS_VERSION%%/doc/API.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
@@ -517,7 +516,6 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
 @unexec rmdir %D/share/ghostscript 2>/dev/null || true
-%%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
diff --git a/print/ghostscript8/scripts/configure b/print/ghostscript8/scripts/configure
index 834327911bc7..ae54b4f496bc 100644
--- a/print/ghostscript8/scripts/configure
+++ b/print/ghostscript8/scripts/configure
@@ -251,7 +251,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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" \
+  "npdl"     "NEC Printer Description Language [LIPS]" "$status_npdl" \
   "oce9050"  "OCE 9050 printer" "$status_oce9050" \
   "oki182"   "Okidata MicroLine 182" "$status_oki182" \
   "okiibm"   "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \