From eb48c2ee0d93e35ab6fe42ed818a624a6fd1e91e Mon Sep 17 00:00:00 2001
From: ryoon <ryoon@pkgsrc.org>
Date: Wed, 19 Jul 2017 04:01:58 +0000
Subject: Install separated Symbol and Dingbats fonts

* Bump PKGREVISION
* Fix PR pkg/52421
---
 fonts/urw-fonts/Makefile | 23 ++++++++++++++++++++---
 fonts/urw-fonts/PLIST    |  6 +++++-
 fonts/urw-fonts/distinfo | 18 +++++++++++++-----
 3 files changed, 38 insertions(+), 9 deletions(-)

(limited to 'fonts/urw-fonts')

diff --git a/fonts/urw-fonts/Makefile b/fonts/urw-fonts/Makefile
index 12d1c835bb3..37e3ce46a99 100644
--- a/fonts/urw-fonts/Makefile
+++ b/fonts/urw-fonts/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2016/08/24 10:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2017/07/19 04:01:58 ryoon Exp $
 
 DISTNAME=	urw-fonts-2.0
+PKGREVISION=	1
 CATEGORIES=	fonts
 MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-fonts-2.0.tar.bz2/c5cc8237e4289fc6ebeaa296174fa504/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,6 +11,19 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Standard postscript fonts (cyrillicized)
 LICENSE=	gnu-gpl-v2
 
+DIST_SUBDIR=	${PKGNAME_NOREV}
+
+URW_DINGBATS=	urw-dingbats.tar.bz2
+SITES.${URW_DINGBATS}=	http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-dingbats.tar.bz2/5115d797f66c7414a08b5300aae64273/
+
+URW_SYMBOL=	urw-symbol.tar.bz2
+SITES.${URW_SYMBOL}=	http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-symbol.tar.bz2/efb9216f950612419874f37b63d80ae3/
+
+#URW_TWEAKS=	urw-tweaks.tar.bz2
+#SITES.${URW_TWEAKS}=	http://pkgs.fedoraproject.org/repo/pkgs/urw-fonts/urw-tweaks.tar.bz2/bf5a7e18737c3a8152f4f0c3aa6fa8fa/
+
+DISTFILES=	${DEFAULT_DISTFILES} ${URW_DINGBATS} ${URW_SYMBOL} #${URW_TWEAKS}
+
 WRKSRC=		${WRKDIR}/fonts
 USE_LANGUAGES=	# none
 NO_BUILD=	yes
@@ -17,12 +31,15 @@ FONTS_DIR=	${PREFIX}/share/fonts/urw
 INSTALLATION_DIRS= share/fonts/urw
 
 do-install:
+	for dir in ${WRKSRC} ${WRKDIR}; \
+	do \
 	for ext in afm pfb; \
 	do \
-		for f in ${WRKSRC}/*.$${ext}; \
+		for f in $${dir}/*.$${ext}; \
 		do \
 			${INSTALL_DATA} $${f} ${DESTDIR}${FONTS_DIR}; \
 		done; \
-	done
+	done; \
+	done;
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/urw-fonts/PLIST b/fonts/urw-fonts/PLIST
index 7caf492981e..62e5dea1d62 100644
--- a/fonts/urw-fonts/PLIST
+++ b/fonts/urw-fonts/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/08/24 10:29:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/07/19 04:01:58 ryoon Exp $
 share/fonts/urw/a010013l.afm
 share/fonts/urw/a010013l.pfb
 share/fonts/urw/a010015l.afm
@@ -23,6 +23,8 @@ share/fonts/urw/c059033l.afm
 share/fonts/urw/c059033l.pfb
 share/fonts/urw/c059036l.afm
 share/fonts/urw/c059036l.pfb
+share/fonts/urw/d050000l.afm
+share/fonts/urw/d050000l.pfb
 share/fonts/urw/n019003l.afm
 share/fonts/urw/n019003l.pfb
 share/fonts/urw/n019004l.afm
@@ -63,5 +65,7 @@ share/fonts/urw/p052023l.afm
 share/fonts/urw/p052023l.pfb
 share/fonts/urw/p052024l.afm
 share/fonts/urw/p052024l.pfb
+share/fonts/urw/s050000l.afm
+share/fonts/urw/s050000l.pfb
 share/fonts/urw/z003034l.afm
 share/fonts/urw/z003034l.pfb
diff --git a/fonts/urw-fonts/distinfo b/fonts/urw-fonts/distinfo
index d6864d66b26..19106602c00 100644
--- a/fonts/urw-fonts/distinfo
+++ b/fonts/urw-fonts/distinfo
@@ -1,6 +1,14 @@
-$NetBSD: distinfo,v 1.4 2016/08/24 10:29:50 wiz Exp $
+$NetBSD: distinfo,v 1.5 2017/07/19 04:01:58 ryoon Exp $
 
-SHA1 (urw-fonts-2.0.tar.bz2) = b7755509b7bd313da037afe986fc84d616493180
-RMD160 (urw-fonts-2.0.tar.bz2) = d28b6d4556c21abba25e437200395daec57db908
-SHA512 (urw-fonts-2.0.tar.bz2) = 374698eb9a7cd874c55f69f45faed7a68c5e850100fc2ba5aef48aaafe0cf95c95212c562805e3f51f6261297976bccde68f8c7ce80d40c21ee2dd6db12d06dc
-Size (urw-fonts-2.0.tar.bz2) = 3763965 bytes
+SHA1 (urw-fonts-2.0/urw-dingbats.tar.bz2) = d836d5a0c4bed43078564e994ec2efd403d2655e
+RMD160 (urw-fonts-2.0/urw-dingbats.tar.bz2) = b8a0c6fe913c13d9d49dfe90d616634bb21a49e5
+SHA512 (urw-fonts-2.0/urw-dingbats.tar.bz2) = 97f84407738340489b6f226a2a8815cff6049a7e26d9d39464bce30c3caf68676da6dc75663d7657988c09cfd80148080454e829e13a3470c7000377b0126e71
+Size (urw-fonts-2.0/urw-dingbats.tar.bz2) = 45897 bytes
+SHA1 (urw-fonts-2.0/urw-fonts-2.0.tar.bz2) = b7755509b7bd313da037afe986fc84d616493180
+RMD160 (urw-fonts-2.0/urw-fonts-2.0.tar.bz2) = d28b6d4556c21abba25e437200395daec57db908
+SHA512 (urw-fonts-2.0/urw-fonts-2.0.tar.bz2) = 374698eb9a7cd874c55f69f45faed7a68c5e850100fc2ba5aef48aaafe0cf95c95212c562805e3f51f6261297976bccde68f8c7ce80d40c21ee2dd6db12d06dc
+Size (urw-fonts-2.0/urw-fonts-2.0.tar.bz2) = 3763965 bytes
+SHA1 (urw-fonts-2.0/urw-symbol.tar.bz2) = 0c0367c4a3456bc8565afe38db580025a4661fc1
+RMD160 (urw-fonts-2.0/urw-symbol.tar.bz2) = ae19d73e3e4f510b18b4705d9be0e440aed9baa8
+SHA512 (urw-fonts-2.0/urw-symbol.tar.bz2) = d5876743d8d4b48083882955d97f01e534a867952fc6184e8220f93d9e0ce1d6d4a636867c76d2383b553dba1e967c798b773a47f67bd577afd25220cb2c5e9d
+Size (urw-fonts-2.0/urw-symbol.tar.bz2) = 33496 bytes
-- 
cgit v1.2.3