From 8ec5031dcd24e62e418ee27c68d4e2746cafa880 Mon Sep 17 00:00:00 2001 From: salo Date: Thu, 17 Apr 2003 15:07:55 +0000 Subject: Bump PKGREVISION: use fonts.mk to correctly update fonts.dir, delint. Update checksum for Readme.wri (can't really tell what 513 bytes were changed in that binary mess). --- fonts/cyberbase-ttf/Makefile | 7 ++++--- fonts/cyberbase-ttf/distinfo | 6 +++--- fonts/cyberbit-ttf/Makefile | 6 ++++-- fonts/cyberbit-ttf/Makefile.common | 22 ++++++++++++---------- fonts/cyberbit-ttf/distinfo | 6 +++--- 5 files changed, 26 insertions(+), 21 deletions(-) (limited to 'fonts') diff --git a/fonts/cyberbase-ttf/Makefile b/fonts/cyberbase-ttf/Makefile index 5ec4f624822..f51c630db9e 100644 --- a/fonts/cyberbase-ttf/Makefile +++ b/fonts/cyberbase-ttf/Makefile @@ -1,12 +1,13 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/11 15:56:52 jschauma Exp $ - -.include "../cyberbit-ttf/Makefile.common" +# $NetBSD: Makefile,v 1.2 2003/04/17 15:07:55 salo Exp $ +# PKGNAME= cyberbase-ttf-2.0 +PKGREVISION= 1 FONT_FILE= Cyberbase.ZIP COMMENT= Cyberbit minus CJK subset, for ISO-8859-x languages CONFLICTS= cyberbit-ttf-* +.include "../../fonts/cyberbit-ttf/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/cyberbase-ttf/distinfo b/fonts/cyberbase-ttf/distinfo index b7750d53554..4f2a3c0ec99 100644 --- a/fonts/cyberbase-ttf/distinfo +++ b/fonts/cyberbase-ttf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/11 15:56:52 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2003/04/17 15:07:55 salo Exp $ SHA1 (cyberbit-ttf/Cyberbase.ZIP) = f9532030c51596b5f4527068e19dee2349fc2849 Size (cyberbit-ttf/Cyberbase.ZIP) = 174219 bytes @@ -8,5 +8,5 @@ SHA1 (cyberbit-ttf/Orders.wri) = 0e883131eea2ae9da62e4e42e189047f26f8b3ec Size (cyberbit-ttf/Orders.wri) = 9216 bytes SHA1 (cyberbit-ttf/ReadMe.htm) = d735e16e0ffdf9fedf836dff62a3298f59616ce5 Size (cyberbit-ttf/ReadMe.htm) = 34832 bytes -SHA1 (cyberbit-ttf/Readme.wri) = 079dd905895b12c1d34673da95942c14f5d0d98b -Size (cyberbit-ttf/Readme.wri) = 39552 bytes +SHA1 (cyberbit-ttf/Readme.wri) = 48cf286248d48eb4e71e9490770b6717b7bd1316 +Size (cyberbit-ttf/Readme.wri) = 40065 bytes diff --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile index 8d4e4275cdd..2efef05087d 100644 --- a/fonts/cyberbit-ttf/Makefile +++ b/fonts/cyberbit-ttf/Makefile @@ -1,11 +1,13 @@ -# $NetBSD: Makefile,v 1.1.1.1 2002/08/11 15:54:57 jschauma Exp $ +# $NetBSD: Makefile,v 1.2 2003/04/17 15:07:56 salo Exp $ +# PKGNAME= cyberbit-ttf-2.0 +PKGREVISION= 1 FONT_FILE= Cyberbit.ZIP COMMENT= multilingual TrueType font from Bitstream CONFLICTS= cyberbase-ttf-* -.include "Makefile.common" +.include "../../fonts/cyberbit-ttf/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/cyberbit-ttf/Makefile.common b/fonts/cyberbit-ttf/Makefile.common index dd2c0976278..5e63d67a34a 100644 --- a/fonts/cyberbit-ttf/Makefile.common +++ b/fonts/cyberbit-ttf/Makefile.common @@ -1,8 +1,8 @@ -# $NetBSD: Makefile.common,v 1.6 2003/04/15 15:08:21 wiz Exp $ +# $NetBSD: Makefile.common,v 1.7 2003/04/17 15:07:56 salo Exp $ +# DISTNAME= # empty CATEGORIES= fonts -WRKSRC= ${WRKDIR} MASTER_SITES= ftp://ftp.mirror.ac.uk/sites/ftp.netscape.com/pub/communicator/extras/fonts/windows/ \ ftp://ftp.riken.go.jp/pub/net/netscape/communicator/extras/fonts/windows/ \ ftp://ftp.man.poznan.pl/mirrors/mirrorsite.netscape.com/netscape/communicator/extras/fonts/windows/ \ @@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.mirror.ac.uk/sites/ftp.netscape.com/pub/communicator/ext DISTFILES= ${FONT_FILE} ${DOC_FILES} MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.bitstream.com +HOMEPAGE= http://www.bitstream.com/ BUILD_DEPENDS+= unzip-[0-9]*:../../archivers/unzip @@ -30,18 +30,20 @@ DIST_SUBDIR= cyberbit-ttf EXTRACT_CMD= ${LOCALBASE}/bin/unzip -Laq $${extract_file} EXTRACT_ONLY= ${FONT_FILE} -NO_PATCH= yes -NO_CONFIGURE= yes -NO_BUILD= yes -USE_X11BASE= yes -FONTDIR= ${PREFIX}/lib/X11/fonts/TrueType +USE_X11BASE= YES +NO_CONFIGURE= YES +NO_BUILD= YES + +FONTS_TTF_DIRS= ${PREFIX}/lib/X11/fonts/TrueType DOCDIR= ${PREFIX}/share/doc/cyberbit-ttf do-install: - ${INSTALL_DATA_DIR} ${FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTDIR} + ${INSTALL_DATA_DIR} ${FONTS_TTF_DIRS} + ${INSTALL_DATA} ${WRKDIR}/*.ttf ${FONTS_TTF_DIRS} ${INSTALL_DATA_DIR} ${DOCDIR} for f in ${DOC_FILES}; do \ ${INSTALL_DATA} ${_DISTDIR}/$$f ${DOCDIR}; \ done + +.include "../../mk/fonts.mk" diff --git a/fonts/cyberbit-ttf/distinfo b/fonts/cyberbit-ttf/distinfo index b183d506c10..a176216b29c 100644 --- a/fonts/cyberbit-ttf/distinfo +++ b/fonts/cyberbit-ttf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/08/11 15:54:57 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2003/04/17 15:07:56 salo Exp $ SHA1 (cyberbit-ttf/Cyberbit.ZIP) = ad75fc3c634f6d39ba1f9fe400895a7132e31d1b Size (cyberbit-ttf/Cyberbit.ZIP) = 6427108 bytes @@ -8,5 +8,5 @@ SHA1 (cyberbit-ttf/Orders.wri) = 0e883131eea2ae9da62e4e42e189047f26f8b3ec Size (cyberbit-ttf/Orders.wri) = 9216 bytes SHA1 (cyberbit-ttf/ReadMe.htm) = d735e16e0ffdf9fedf836dff62a3298f59616ce5 Size (cyberbit-ttf/ReadMe.htm) = 34832 bytes -SHA1 (cyberbit-ttf/Readme.wri) = 079dd905895b12c1d34673da95942c14f5d0d98b -Size (cyberbit-ttf/Readme.wri) = 39552 bytes +SHA1 (cyberbit-ttf/Readme.wri) = 48cf286248d48eb4e71e9490770b6717b7bd1316 +Size (cyberbit-ttf/Readme.wri) = 40065 bytes -- cgit v1.2.3