o Update GDI driver

o Replace NPDL driver (currently unavailable at master site)
  with one included in LIPS driver

PR:		ports/54103
Submitted by:	Ports Fury

1 files changed, 5 insertions, 30 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 3a85a9c6a224..fd1d7ba39685 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
@@ -19,7 +20,6 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:gs_fonts/} \
 		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 \
@@ -48,7 +48,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 \
@@ -235,12 +234,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
@@ -267,7 +260,7 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
 
 .include <bsd.port.pre.mk>
-.SILENT:
+#.SILENT:
 
 pre-everything::
 .if !defined(A4)
@@ -343,9 +336,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}
@@ -425,7 +415,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 ..."
@@ -437,10 +427,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 \
@@ -514,7 +500,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
@@ -536,11 +523,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
@@ -697,13 +679,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}