- Update DISTNAME/MASTER_SITE of samsung-gdi driver

- Add workaround for the problem that ps2epsi doesn't work

PR:		37285
Submitted by:	Ports Fury

8 files changed, 32 insertions, 10 deletions

diff --git a/print/ghostscript-gnu/Makefile b/print/ghostscript-gnu/Makefile
index 1572c0259a36..7813ba66771e 100644
--- a/print/ghostscript-gnu/Makefile
+++ b/print/ghostscript-gnu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
@@ -19,7 +19,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/:eplaser \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
-		http://www.linuxprinting.org/download/printing/:gdi \
+		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/ \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs653/
 MASTER_SITE_SUBDIR=	${PORTNAME} \
@@ -196,7 +196,7 @@ NPDL_SRCS=	${NPDL_NAME}.tar.gz
 
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
-GDI_NAME=	samsung-gdi-driver
+GDI_NAME=	samsung-gdi-driver-gs5.50
 GDI_SRCS=	${GDI_NAME}.tar.gz
 
 # contributed uniprint profiles
diff --git a/print/ghostscript-gnu/distinfo b/print/ghostscript-gnu/distinfo
index f53d605bdb5e..1c0209555274 100644
--- a/print/ghostscript-gnu/distinfo
+++ b/print/ghostscript-gnu/distinfo
@@ -16,4 +16,4 @@ MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
-MD5 (ghostscript/samsung-gdi-driver.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
+MD5 (ghostscript/samsung-gdi-driver-gs5.50.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
diff --git a/print/ghostscript-gnu/files/patch-lib:ps2epsi.ps b/print/ghostscript-gnu/files/patch-lib:ps2epsi.ps
new file mode 100644
index 000000000000..8e150354428c
--- /dev/null
+++ b/print/ghostscript-gnu/files/patch-lib:ps2epsi.ps
@@ -0,0 +1,11 @@
+--- lib/ps2epsi.ps.orig	Tue Jun  5 15:31:41 2001
++++ lib/ps2epsi.ps	Sat Apr 20 15:57:44 2002
+@@ -52,7 +52,7 @@
+   /ps2epsi
+    {				% Open the file
+      outfile (w) file /epsifile exch def
+-     //systemdict /.setsafe known { .setsafe } if
++%     //systemdict /.setsafe known { .setsafe } if
+ 					% Get the device parameters
+      currentdevice getdeviceprops .dicttomark
+      /HWSize get aload pop
diff --git a/print/ghostscript-gnu/pkg-plist b/print/ghostscript-gnu/pkg-plist
index 7739c0053e1e..8d03be52540f 100644
--- a/print/ghostscript-gnu/pkg-plist
+++ b/print/ghostscript-gnu/pkg-plist
@@ -529,7 +529,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
-@dirrm share/ghostscript
+@unexec rmdir %D/share/ghostscript 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc
diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 1572c0259a36..7813ba66771e 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.53
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
@@ -19,7 +19,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		http://www.humblesoft.com/pub/:epag \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/:eplaser \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
-		http://www.linuxprinting.org/download/printing/:gdi \
+		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/ \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs653/
 MASTER_SITE_SUBDIR=	${PORTNAME} \
@@ -196,7 +196,7 @@ NPDL_SRCS=	${NPDL_NAME}.tar.gz
 
 # GDI - additional driver for Samsung SmartGDI laser printers
 GDI=		gdi
-GDI_NAME=	samsung-gdi-driver
+GDI_NAME=	samsung-gdi-driver-gs5.50
 GDI_SRCS=	${GDI_NAME}.tar.gz
 
 # contributed uniprint profiles
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index f53d605bdb5e..1c0209555274 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -16,4 +16,4 @@ MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 MD5 (ghostscript/eplaser-3.0.1-651.tgz) = 3baf7b0ba2fea5ea354906ab43caf254
 MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
 MD5 (ghostscript/gdevnpdl-1.6.3.tar.gz) = 6c8dad13d07bbaf6e951d6d2d6b8a9f2
-MD5 (ghostscript/samsung-gdi-driver.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
+MD5 (ghostscript/samsung-gdi-driver-gs5.50.tar.gz) = d85da4a9e26f2d751a22b6f1e19fc6d1
diff --git a/print/ghostscript7/files/patch-lib:ps2epsi.ps b/print/ghostscript7/files/patch-lib:ps2epsi.ps
new file mode 100644
index 000000000000..8e150354428c
--- /dev/null
+++ b/print/ghostscript7/files/patch-lib:ps2epsi.ps
@@ -0,0 +1,11 @@
+--- lib/ps2epsi.ps.orig	Tue Jun  5 15:31:41 2001
++++ lib/ps2epsi.ps	Sat Apr 20 15:57:44 2002
+@@ -52,7 +52,7 @@
+   /ps2epsi
+    {				% Open the file
+      outfile (w) file /epsifile exch def
+-     //systemdict /.setsafe known { .setsafe } if
++%     //systemdict /.setsafe known { .setsafe } if
+ 					% Get the device parameters
+      currentdevice getdeviceprops .dicttomark
+      /HWSize get aload pop
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 7739c0053e1e..8d03be52540f 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -529,7 +529,7 @@ share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/%%GS_VERSION%%/examples
 @dirrm share/ghostscript/%%GS_VERSION%%/doc
 @dirrm share/ghostscript/%%GS_VERSION%%
-@dirrm share/ghostscript
+@unexec rmdir %D/share/ghostscript 2>/dev/null || true
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/pcl3
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/npdl
 %%PORTDOCS%%@dirrm share/doc/ghostscript/%%GS_VERSION%%/mjc