Update to 201404: Add Okuda font.

Based on diff by Tim Larson.

3 files changed, 24 insertions, 12 deletions

diff --git a/fonts/pixel-sagas-startrek/Makefile b/fonts/pixel-sagas-startrek/Makefile
index ee877ace7f2..d611de03f0b 100644
--- a/fonts/pixel-sagas-startrek/Makefile
+++ b/fonts/pixel-sagas-startrek/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2014/02/27 14:50:30 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2014/04/02 21:26:29 wiz Exp $
 
-DISTNAME=	pixels-sagas-startrek-201312
+DISTNAME=	pixels-sagas-startrek-201404
 CATEGORIES=	fonts
 MASTER_SITES=	http://www.pixelsagas.com/files/
 DISTFILES+=	PS_Font_Fontana.zip
 DISTFILES+=	PS_Font_Jefferies.zip
 DISTFILES+=	PS_Font_Montalban.zip
+DISTFILES+=	PS_Font_Okuda.zip
 DISTFILES+=	PS_Font_Probert.zip
 DISTFILES+=	PS_Font_Roddenberry.zip
 DISTFILES+=	PS_Font_Sternbach.zip
@@ -23,14 +24,18 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_SRC_ON_FTP=	${RESTRICTED}
 
 WRKSRC=		${WRKDIR}
+OTFPATH=	lib/X11/fonts/OTF
 TTFPATH=	lib/X11/fonts/TTF
+FONTS_DIRS.otf+=	${PREFIX}/${OTFPATH:Q}
 FONTS_DIRS.ttf+=	${PREFIX}/${TTFPATH:Q}
-INSTALLATION_DIRS=	${TTFPATH:Q}
+INSTALLATION_DIRS=	${OTFPATH:Q} ${TTFPATH:Q}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
 do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.otf:Q}
 	${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf:Q}
-	${INSTALL_DATA} ${WRKSRC}/*.[OoTt][Tt][Ff] ${DESTDIR}${FONTS_DIRS.ttf:Q}
+	${INSTALL_DATA} ${WRKSRC}/*.[Oo][Tt][Ff] ${DESTDIR}${FONTS_DIRS.otf:Q}
+	${INSTALL_DATA} ${WRKSRC}/*.[Tt][Tt][Ff] ${DESTDIR}${FONTS_DIRS.ttf:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/pixel-sagas-startrek/PLIST b/fonts/pixel-sagas-startrek/PLIST
index 32b9211e1be..d6b1633c89c 100644
--- a/fonts/pixel-sagas-startrek/PLIST
+++ b/fonts/pixel-sagas-startrek/PLIST
@@ -1,4 +1,14 @@
-@comment $NetBSD: PLIST,v 1.2 2014/02/27 14:50:30 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/04/02 21:26:29 wiz Exp $
+lib/X11/fonts/OTF/Okuda Bold Italic.otf
+lib/X11/fonts/OTF/Okuda Bold.otf
+lib/X11/fonts/OTF/Okuda Italic.otf
+lib/X11/fonts/OTF/Okuda.otf
+lib/X11/fonts/OTF/Probert Black Italic.otf
+lib/X11/fonts/OTF/Probert Black.otf
+lib/X11/fonts/OTF/Probert Bold Italic.otf
+lib/X11/fonts/OTF/Probert Bold.otf
+lib/X11/fonts/OTF/Probert Italic.otf
+lib/X11/fonts/OTF/Probert.otf
 lib/X11/fonts/TTF/Fontana Bold Italic.ttf
 lib/X11/fonts/TTF/Fontana Bold.ttf
 lib/X11/fonts/TTF/Fontana Italic.ttf
@@ -11,12 +21,6 @@ lib/X11/fonts/TTF/Montalban Condensed Italic.ttf
 lib/X11/fonts/TTF/Montalban Condensed.ttf
 lib/X11/fonts/TTF/Montalban Italic.ttf
 lib/X11/fonts/TTF/Montalban.ttf
-lib/X11/fonts/TTF/Probert Black Italic.otf
-lib/X11/fonts/TTF/Probert Black.otf
-lib/X11/fonts/TTF/Probert Bold Italic.otf
-lib/X11/fonts/TTF/Probert Bold.otf
-lib/X11/fonts/TTF/Probert Italic.otf
-lib/X11/fonts/TTF/Probert.otf
 lib/X11/fonts/TTF/Roddenberry Italic.ttf
 lib/X11/fonts/TTF/Roddenberry.ttf
 lib/X11/fonts/TTF/Sternbach Italic.ttf
diff --git a/fonts/pixel-sagas-startrek/distinfo b/fonts/pixel-sagas-startrek/distinfo
index 8bf72345eb4..741812f9b07 100644
--- a/fonts/pixel-sagas-startrek/distinfo
+++ b/fonts/pixel-sagas-startrek/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2014/02/27 14:50:30 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/04/02 21:26:29 wiz Exp $
 
 SHA1 (PS_Font_Fontana.zip) = 231e24e3f618a98be36b185873b709b024c4497d
 RMD160 (PS_Font_Fontana.zip) = 4057fb90ceca3fafa5a7d34d9cbc56f410068a2c
@@ -9,6 +9,9 @@ Size (PS_Font_Jefferies.zip) = 38705 bytes
 SHA1 (PS_Font_Montalban.zip) = 72f7d8418065a3f8e007d419d6af2e3589b794cf
 RMD160 (PS_Font_Montalban.zip) = f568f3d781980857cf8c35c88eb7dcdf44ccb743
 Size (PS_Font_Montalban.zip) = 44884 bytes
+SHA1 (PS_Font_Okuda.zip) = 3fd7192995884f3eb2ee8b71c3b21fcf8fcf864a
+RMD160 (PS_Font_Okuda.zip) = e464b88588481c87ad241811216e7b2329e0f0b4
+Size (PS_Font_Okuda.zip) = 46446 bytes
 SHA1 (PS_Font_Probert.zip) = afa2df478eb69bd3841207eac29aad132d3598af
 RMD160 (PS_Font_Probert.zip) = 2b47ef2b267699a62aaaae5e2596f326e934669b
 Size (PS_Font_Probert.zip) = 74185 bytes