CVS commit: pkgsrc/fonts

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Apr  6 08:44:07 UTC 2019

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

Log Message:
cyberbase-ttf: convert to fonts.mk


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

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.9 pkgsrc/fonts/cyberbase-ttf/Makefile:1.10
--- pkgsrc/fonts/cyberbase-ttf/Makefile:1.9     Sun Jan  7 21:56:35 2018
+++ pkgsrc/fonts/cyberbase-ttf/Makefile Sat Apr  6 08:44:07 2019
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/01/07 21:56:35 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.10 2019/04/06 08:44:07 wiz Exp $
 
 PKGNAME=       cyberbase-ttf-2.0
 PKGREVISION=   8
@@ -7,7 +6,7 @@ FONT_FILE=      Cyberbase.ZIP
 
 COMMENT=       Cyberbit minus CJK subset, for ISO-8859-x languages
 
-CONFLICTS=     cyberbit-ttf-*
+CONFLICTS=     cyberbit-ttf-[0-9]*
 
 .include "../../fonts/cyberbit-ttf/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/cyberbit-ttf/Makefile
diff -u pkgsrc/fonts/cyberbit-ttf/Makefile:1.10 pkgsrc/fonts/cyberbit-ttf/Makefile:1.11
--- pkgsrc/fonts/cyberbit-ttf/Makefile:1.10     Sun Jan  7 21:56:35 2018
+++ pkgsrc/fonts/cyberbit-ttf/Makefile  Sat Apr  6 08:44:07 2019
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/01/07 21:56:35 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.11 2019/04/06 08:44:07 wiz Exp $
 
 PKGNAME=       cyberbit-ttf-2.0
 PKGREVISION=   8
@@ -7,7 +6,7 @@ FONT_FILE=      Cyberbit.ZIP
 
 COMMENT=       Multilingual TrueType font from Bitstream
 
-CONFLICTS=     cyberbase-ttf-*
+CONFLICTS=     cyberbase-ttf-[0-9]*
 
 .include "../../fonts/cyberbit-ttf/Makefile.common"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/fonts/cyberbit-ttf/Makefile.common
diff -u pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.29 pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.30
--- pkgsrc/fonts/cyberbit-ttf/Makefile.common:1.29      Sun Jan  7 21:56:35 2018
+++ pkgsrc/fonts/cyberbit-ttf/Makefile.common   Sat Apr  6 08:44:07 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2018/01/07 21:56:35 rillig Exp $
+# $NetBSD: Makefile.common,v 1.30 2019/04/06 08:44:07 wiz Exp $
 #
 # used by fonts/cyberbit-ttf/Makefile
 # used by fonts/cyberbase-ttf/Makefile
@@ -23,14 +23,11 @@ USE_TOOLS+=     unzip
 DIST_SUBDIR=   cyberbit-ttf
 
 EXTRACT_ONLY=          ${FONT_FILE}
-#EXTRACT_OPTS_ZIP=     -Laq
 
-NO_CONFIGURE=  yes
-NO_BUILD=      yes
-AUTO_MKDIRS=   yes
-
-do-install:
-       ${INSTALL_DATA} ${WRKDIR}/*.ttf \
-               ${DESTDIR}${PREFIX}/share/fonts/X11/TTF
+INSTALLATION_DIRS+=    share/doc/cyberbit-ttf
+
+post-install:
        ${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm \
                ${DESTDIR}${PREFIX}/share/doc/cyberbit-ttf
+
+.include "../../mk/fonts.mk"