Apply official patches to "ghostscript" package as suggested by John Kohl

in PR pkg/8000.

2 files changed, 38 insertions, 13 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index 2eda31aa0d2..d4f530fcc69 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 1999/04/26 19:25:05 garbled Exp $
+# $NetBSD: Makefile,v 1.37 1999/07/18 21:54:17 tron Exp $
 #
 
 DISTNAME=	ghostscript-5.50
@@ -10,6 +10,11 @@ MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${PDF_SEC}
 
+PATCH_SITES=	http://www.cs.wisc.edu/~ghost/aladdin/relnotes/gs550/
+PATCHFILES=	990524.txt 990220c.txt 990220b.txt 990220a.txt 990220.txt \
+		990120a.txt 990120.txt 990117.txt 990115a.txt 981222.txt \
+		981221.txt 981220.txt
+
 MAINTAINER=	explorer@netbsd.org
 HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
 
@@ -20,6 +25,7 @@ DEPENDS=	png-1.0.3:../../graphics/png
 .include "../../mk/bsd.prefs.mk"
 
 USE_X11=	yes
+DIST_SUBDIR=	${DISTNAME:C/-.*$//}
 EXTRACT_ONLY=	${GS_SOURCES}
 WRKSRC=		${WRKDIR}/gs5.50
 MAKEFILE=	unix-gcc.mak
@@ -55,9 +61,16 @@ PAPERSIZE_DEF=	-DA4
 SCRIPT_SUFFIX=	.batch
 
 post-extract:
-	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
-	cd ${WRKSRC} && unzip -uLa ${DISTDIR}/${HP850_DRV}
-	${CP} ${DISTDIR}/${PDF_SEC} ${WRKSRC}
+	${LN} -fs ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
+	cd ${WRKSRC} && unzip -uLa ${_DISTDIR}/${HP850_DRV}
+	${LN} -fs ${_DISTDIR}/${PDF_SEC} ${WRKSRC}
+
+pre-patch:
+	@${LN} -fs . ${WRKSRC}/lib
+	@${LN} -fs . ${WRKSRC}/src
+
+post-patch:
+	@${RM} -f ${WRKSRC}/lib ${WRKSRC}/src
 
 do-configure:
 	@${SETENV} WRKSRC=${WRKSRC} PREFIX=${PREFIX} \
@@ -70,9 +83,9 @@ do-build:
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
-			${GTAR} -xzf ${DISTDIR}/${GS_FONTS_STD})
+			${GTAR} -xzf ${_DISTDIR}/${GS_FONTS_STD})
 	(cd ${PREFIX}/share/ghostscript/fonts ; \
-			${GTAR} -xzf ${DISTDIR}/${GS_FONTS_OTHER})
+			${GTAR} -xzf ${_DISTDIR}/${GS_FONTS_OTHER})
 
 post-install:
 	strip ${PREFIX}/bin/gs
diff --git a/print/ghostscript5/files/md5 b/print/ghostscript5/files/md5
index 30a48b3b0fc..729d948a9ec 100644
--- a/print/ghostscript5/files/md5
+++ b/print/ghostscript5/files/md5
@@ -1,8 +1,20 @@
-$NetBSD: md5,v 1.10 1998/11/29 16:34:27 frueauf Exp $
+$NetBSD: md5,v 1.11 1999/07/18 21:54:17 tron Exp $
 
-MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
-MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
-MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
-MD5 (ghostscript-fonts-std-5.10a.tar.gz) = 8462a429e2672d332a510da076dca6d2
-MD5 (hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
-MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
+MD5 (ghostscript/ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
+MD5 (ghostscript/ghostscript-fonts-std-5.10a.tar.gz) = 8462a429e2672d332a510da076dca6d2
+MD5 (ghostscript/ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
+MD5 (ghostscript/hp8xxs13.zip) = e46bcac0aed0c511c8cc88a1093cc586
+MD5 (ghostscript/pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
+MD5 (ghostscript/990524.txt) = fa938c0f9a5c2848ca040b0ad3ecf1ac
+MD5 (ghostscript/990220c.txt) = e6b7f7b715d63e32688ed0917d8bf6fc
+MD5 (ghostscript/990220b.txt) = 7cd107c186b55882b22c327188989d2b
+MD5 (ghostscript/990220a.txt) = 4bed19ad536bba3af11e88a505ef961f
+MD5 (ghostscript/990220.txt) = 31c83637d4399061143d129779156fd1
+MD5 (ghostscript/990120a.txt) = 534d0c5a224d9cce5ff227f3b42b2d53
+MD5 (ghostscript/990120.txt) = f00e04f5e2fba2d8807389202afbf8c0
+MD5 (ghostscript/990117.txt) = 02a27b0cae8bd0515421e969f04367ee
+MD5 (ghostscript/990115a.txt) = d17193d1c2b5ed1394ee2dc91718f240
+MD5 (ghostscript/981222.txt) = bd67e74a8d447ece00a270f353d1a8e7
+MD5 (ghostscript/981221.txt) = 8c68a8473c5e9cc2c89d2060245d9aa8
+MD5 (ghostscript/981220.txt) = 8e03acdfa175a02bddb4bd5e3cb249a4