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

5 files changed, 16 insertions, 18 deletions

diff --git a/fonts/cyberbase-ttf/Makefile b/fonts/cyberbase-ttf/Makefile
index f7c0cae6eba..0fab6bb0639 100644
--- a/fonts/cyberbase-ttf/Makefile
+++ b/fonts/cyberbase-ttf/Makefile
@@ -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
diff --git a/fonts/cyberbase-ttf/PLIST b/fonts/cyberbase-ttf/PLIST
index 297e9c5107b..04b82249dc2 100644
--- a/fonts/cyberbase-ttf/PLIST
+++ b/fonts/cyberbase-ttf/PLIST
@@ -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
diff --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile
index b312be86f30..8084dba78af 100644
--- a/fonts/cyberbit-ttf/Makefile
+++ b/fonts/cyberbit-ttf/Makefile
@@ -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
diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common
index b4b8dbaafcf..b68f9f8f0dd 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -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
diff --git a/fonts/cyberbit-ttf/PLIST b/fonts/cyberbit-ttf/PLIST
index 6ec4ed7923f..522199f6efb 100644
--- a/fonts/cyberbit-ttf/PLIST
+++ b/fonts/cyberbit-ttf/PLIST
@@ -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