CVS commit: pkgsrc/fonts

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 21:56:35 UTC 2018

Modified Files:
        pkgsrc/fonts/cyberbase-ttf: Makefile PLIST
        pkgsrc/fonts/cyberbit-ttf: Makefile Makefile.common PLIST

Log Message:
cyberbit-ttf: Move documentation to where it belongs, bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/cyberbase-ttf/Makefile \
    pkgsrc/fonts/cyberbase-ttf/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/fonts/cyberbit-ttf/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/fonts/cyberbit-ttf/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/fonts/cyberbit-ttf/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/fonts/cyberbase-ttf/Makefile
diff -u pkgsrc/fonts/cyberbase-ttf/Makefile:1.8 pkgsrc/fonts/cyberbase-ttf/Makefile:1.9
--- pkgsrc/fonts/cyberbase-ttf/Makefile:1.8     Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyberbase-ttf/Makefile Sun Jan  7 21:56:35 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2018/01/07 21:56:35 rillig Exp $
 #
 
 PKGNAME=       cyberbase-ttf-2.0
-PKGREVISION=   7
+PKGREVISION=   8
 FONT_FILE=     Cyberbase.ZIP
 
 COMMENT=       Cyberbit minus CJK subset, for ISO-8859-x languages
Index: pkgsrc/fonts/cyberbase-ttf/PLIST
diff -u pkgsrc/fonts/cyberbase-ttf/PLIST:1.8 pkgsrc/fonts/cyberbase-ttf/PLIST:1.9
--- pkgsrc/fonts/cyberbase-ttf/PLIST:1.8        Mon Jan  1 22:29:30 2018
+++ pkgsrc/fonts/cyberbase-ttf/PLIST    Sun Jan  7 21:56:35 2018
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:30 rillig Exp $
-share/doc/html/cyberbit-ttf/ReadMe.htm
+@comment $NetBSD: PLIST,v 1.9 2018/01/07 21:56:35 rillig Exp $
+share/doc/cyberbit-ttf/ReadMe.htm
 share/fonts/X11/TTF/Cyberbas.ttf

Index: pkgsrc/fonts/cyberbit-ttf/Makefile
diff -u pkgsrc/fonts/cyberbit-ttf/Makefile:1.9 pkgsrc/fonts/cyberbit-ttf/Makefile:1.10
--- pkgsrc/fonts/cyberbit-ttf/Makefile:1.9      Sun Jun  1 16:35:32 2014
+++ pkgsrc/fonts/cyberbit-ttf/Makefile  Sun Jan  7 21:56:35 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/06/01 16:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2018/01/07 21:56:35 rillig Exp $
 #
 
 PKGNAME=       cyberbit-ttf-2.0
-PKGREVISION=   7
+PKGREVISION=   8
 FONT_FILE=     Cyberbit.ZIP
 
 COMMENT=       Multilingual TrueType font from Bitstream

Index: pkgsrc/fonts/cyberbit-ttf/Makefile.common
diff -u pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.28 pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.29
--- pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.28      Sat Jul  4 16:18:31 2015
+++ pkgsrc/fonts/cyberbit-ttf/Makefile.common   Sun Jan  7 21:56:35 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2015/07/04 16:18:31 joerg Exp $
+# $NetBSD: Makefile.common,v 1.29 2018/01/07 21:56:35 rillig Exp $
 #
 # used by fonts/cyberbit-ttf/Makefile
 # used by fonts/cyberbase-ttf/Makefile
@@ -25,14 +25,12 @@ DIST_SUBDIR=        cyberbit-ttf
 EXTRACT_ONLY=          ${FONT_FILE}
 #EXTRACT_OPTS_ZIP=     -Laq
 
-NO_CONFIGURE=  YES
-NO_BUILD=      YES
-
-FONTS_DIRS.ttf=        ${PREFIX}/share/fonts/X11/TTF
-DOCDIR=                ${PREFIX}/share/doc/html/cyberbit-ttf
+NO_CONFIGURE=  yes
+NO_BUILD=      yes
+AUTO_MKDIRS=   yes
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${FONTS_DIRS.ttf}
-       ${INSTALL_DATA} ${WRKDIR}/*.ttf ${DESTDIR}${FONTS_DIRS.ttf}
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKDIR}/*.ttf \
+               ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
+       ${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm \
+               ${DESTDIR}${PREFIX}/share/doc/cyberbit-ttf

Index: pkgsrc/fonts/cyberbit-ttf/PLIST
diff -u pkgsrc/fonts/cyberbit-ttf/PLIST:1.8 pkgsrc/fonts/cyberbit-ttf/PLIST:1.9
--- pkgsrc/fonts/cyberbit-ttf/PLIST:1.8 Mon Jan  1 22:29:30 2018
+++ pkgsrc/fonts/cyberbit-ttf/PLIST     Sun Jan  7 21:56:35 2018
@@ -1,3 +1,3 @@
-@comment $NetBSD: PLIST,v 1.8 2018/01/01 22:29:30 rillig Exp $
-share/doc/html/cyberbit-ttf/ReadMe.htm
+@comment $NetBSD: PLIST,v 1.9 2018/01/07 21:56:35 rillig Exp $
+share/doc/cyberbit-ttf/ReadMe.htm
 share/fonts/X11/TTF/Cyberbit.ttf