Update to 8.11 (improvments and additions of Cyrillic glyphs)

3 files changed, 23 insertions, 38 deletions

diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index 81e0c95283f..fd0e4126be0 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2004/05/31 16:47:48 minskim Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/30 14:54:00 dillo Exp $
 
-DISTNAME=		ghostscript-fonts-6.0
+DISTNAME=		ghostscript-fonts-8.11
 CATEGORIES=		fonts
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/
@@ -17,7 +17,7 @@ COMMENT=		Postscript fonts for Aladdin Ghostscript
 #  To avoid unnecessarily downloading distfiles, do not change these
 #  when upgrading the port unless the symlinks/files really change.
 #
-GS_FONTS_STD=		ghostscript-fonts-std-6.0.tar.gz
+GS_FONTS_STD=		ghostscript-fonts-std-8.11.tar.gz
 GS_FONTS_OTHER=		ghostscript-fonts-other-6.0.tar.gz
 
 CONFLICTS=		ghostscript-[0-5]* ghostscript-x11-[0-5]*
@@ -25,22 +25,24 @@ CONFLICTS=		ghostscript-[0-5]* ghostscript-x11-[0-5]*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=		ghostscript
-EXTRACT_ONLY=		# empty
-NO_CONFIGURE=		# defined
-NO_BUILD=		# defined
+NO_CONFIGURE=		YES
+NO_BUILD=		YES
+WRKSRC=			${WRKDIR}/fonts
+
+FONTS_DIR=		${PREFIX}/share/ghostscript/fonts
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
-	@cd ${PREFIX}/share/ghostscript;				\
-	for file in ${GS_FONTS_STD} ${GS_FONTS_OTHER}; do		\
-		extract_file="${_DISTDIR}/$${file}";			\
-		${EXTRACT_CMD};						\
-	done
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
-		${PREFIX}/share/ghostscript/fonts/
-	@for file in ${PREFIX}/share/ghostscript/fonts/*; do		\
-		${CHMOD} ${SHAREMODE} $${file};				\
-		${CHOWN} ${SHAREOWN}:${SHAREGRP} $${file};		\
+	${INSTALL_DATA_DIR} ${FONTS_DIR}
+	for ext in afm gsf pfa pfb pfm;				\
+	do							\
+		for f in ${WRKSRC}/*.$${ext};			\
+		do						\
+			${INSTALL_DATA} $${f} ${FONTS_DIR};	\
+		done;						\
 	done
+	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${FONTS_DIR}
+	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${FONTS_DIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${FONTS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-fonts/PLIST b/fonts/ghostscript-fonts/PLIST
index f2279a8a2cd..6545e72972a 100644
--- a/fonts/ghostscript-fonts/PLIST
+++ b/fonts/ghostscript-fonts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:48:59 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/05/30 14:54:00 dillo Exp $
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -33,19 +33,14 @@ share/ghostscript/fonts/bchri.afm
 share/ghostscript/fonts/bchri.pfa
 share/ghostscript/fonts/c059013l.afm
 share/ghostscript/fonts/c059013l.pfb
-share/ghostscript/fonts/c059013l.pfm
 share/ghostscript/fonts/c059016l.afm
 share/ghostscript/fonts/c059016l.pfb
-share/ghostscript/fonts/c059016l.pfm
 share/ghostscript/fonts/c059033l.afm
 share/ghostscript/fonts/c059033l.pfb
-share/ghostscript/fonts/c059033l.pfm
 share/ghostscript/fonts/c059036l.afm
 share/ghostscript/fonts/c059036l.pfb
-share/ghostscript/fonts/c059036l.pfm
 share/ghostscript/fonts/d050000l.afm
 share/ghostscript/fonts/d050000l.pfb
-share/ghostscript/fonts/d050000l.pfm
 share/ghostscript/fonts/fcyr.afm
 share/ghostscript/fonts/fcyr.gsf
 share/ghostscript/fonts/fcyri.afm
@@ -106,13 +101,10 @@ share/ghostscript/fonts/n019024l.pfb
 share/ghostscript/fonts/n019024l.pfm
 share/ghostscript/fonts/n019043l.afm
 share/ghostscript/fonts/n019043l.pfb
-share/ghostscript/fonts/n019043l.pfm
 share/ghostscript/fonts/n019044l.afm
 share/ghostscript/fonts/n019044l.pfb
-share/ghostscript/fonts/n019044l.pfm
 share/ghostscript/fonts/n019063l.afm
 share/ghostscript/fonts/n019063l.pfb
-share/ghostscript/fonts/n019063l.pfm
 share/ghostscript/fonts/n019064l.afm
 share/ghostscript/fonts/n019064l.pfb
 share/ghostscript/fonts/n019064l.pfm
@@ -130,35 +122,26 @@ share/ghostscript/fonts/n021024l.pfb
 share/ghostscript/fonts/n021024l.pfm
 share/ghostscript/fonts/n022003l.afm
 share/ghostscript/fonts/n022003l.pfb
-share/ghostscript/fonts/n022003l.pfm
 share/ghostscript/fonts/n022004l.afm
 share/ghostscript/fonts/n022004l.pfb
-share/ghostscript/fonts/n022004l.pfm
 share/ghostscript/fonts/n022023l.afm
 share/ghostscript/fonts/n022023l.pfb
-share/ghostscript/fonts/n022023l.pfm
 share/ghostscript/fonts/n022024l.afm
 share/ghostscript/fonts/n022024l.pfb
-share/ghostscript/fonts/n022024l.pfm
 share/ghostscript/fonts/p052003l.afm
 share/ghostscript/fonts/p052003l.pfb
-share/ghostscript/fonts/p052003l.pfm
 share/ghostscript/fonts/p052004l.afm
 share/ghostscript/fonts/p052004l.pfb
-share/ghostscript/fonts/p052004l.pfm
 share/ghostscript/fonts/p052023l.afm
 share/ghostscript/fonts/p052023l.pfb
-share/ghostscript/fonts/p052023l.pfm
 share/ghostscript/fonts/p052024l.afm
 share/ghostscript/fonts/p052024l.pfb
-share/ghostscript/fonts/p052024l.pfm
 share/ghostscript/fonts/putb.pfa
 share/ghostscript/fonts/putbi.pfa
 share/ghostscript/fonts/putr.pfa
 share/ghostscript/fonts/putri.pfa
 share/ghostscript/fonts/s050000l.afm
 share/ghostscript/fonts/s050000l.pfb
-share/ghostscript/fonts/s050000l.pfm
 share/ghostscript/fonts/u003043t.afm
 share/ghostscript/fonts/u003043t.gsf
 share/ghostscript/fonts/u003043t.pfm
diff --git a/fonts/ghostscript-fonts/distinfo b/fonts/ghostscript-fonts/distinfo
index 8bf66db0366..334a9d25905 100644
--- a/fonts/ghostscript-fonts/distinfo
+++ b/fonts/ghostscript-fonts/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 19:18:27 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/05/30 14:54:00 dillo Exp $
 
-SHA1 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = a990603330ac08ebb85624a695a6658ffcebfa8f
-RMD160 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 817e5e01f92bb509d7a75ffc6508185eae71f14d
-Size (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 1881034 bytes
+SHA1 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 2a7198e8178b2e7dba87cb5794da515200b568f5
+RMD160 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 10a19a10d0388bc084a7c1d3da845068d7169054
+Size (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 3752871 bytes
 SHA1 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = da62dfcb9c10d96743c7e30c1eebe7166489798c
 RMD160 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = ab60dbf71e7d91283a106c3df381cadfe173082f
 Size (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 796086 bytes