Bump PKGREVISION: remove licensing related paragraph from DESCR, don't fetch

and install files in Microsoft Write format, license is now in pkgsrc/licenses

5 files changed, 14 insertions, 31 deletions

diff --git a/fonts/cyberbit-ttf/DESCR b/fonts/cyberbit-ttf/DESCR
index 0474796f0c9..1b8f1d0b51b 100644
--- a/fonts/cyberbit-ttf/DESCR
+++ b/fonts/cyberbit-ttf/DESCR
@@ -1,11 +1,8 @@
-Bitstream Cyberbit is a TrueType font. It is an international font,
-containing characters from many languages. Each character is encoded with its
-Unicode value, according to Unicode 2.0 standards.
+Bitstream Cyberbit is a TrueType font. It is an international font, containing
+characters from many languages. Each character is encoded with its Unicode
+value, according to Unicode 2.0 standards.
 
 Cyberbit was developed by Bitstream to provide Unicode Consortium members with
 a test font. It is therefore distributed freely to customers that need advanced
 multilingual fonts for testing and other non-commercial uses. Customers that
 wish to use Cyberbit for other purposes must license the font from Bitstream.
-
-Please see the License.wri file that accompanies Cyberbit for details. If you
-install and use Cyberbit, you are bound by the terms of that License.
diff --git a/fonts/cyberbit-ttf/Makefile b/fonts/cyberbit-ttf/Makefile
index 2efef05087d..598f5dfb370 100644
--- a/fonts/cyberbit-ttf/Makefile
+++ b/fonts/cyberbit-ttf/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2003/04/17 15:07:56 salo Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/22 09:44:59 salo Exp $
 #
 
 PKGNAME=	cyberbit-ttf-2.0
-PKGREVISION=	1
+PKGREVISION=	2
 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 5e63d67a34a..26cbcb85259 100644
--- a/fonts/cyberbit-ttf/Makefile.common
+++ b/fonts/cyberbit-ttf/Makefile.common
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile.common,v 1.7 2003/04/17 15:07:56 salo Exp $
+# $NetBSD: Makefile.common,v 1.8 2003/04/22 09:44:59 salo Exp $
 #
 
 DISTNAME=	# empty
 CATEGORIES=	fonts
 MASTER_SITES=	ftp://ftp.mirror.ac.uk/sites/ftp.netscape.com/pub/communicator/extras/fonts/windows/ \
+		http://sunsite.compapp.dcu.ie/pub/netscape/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/ \
 		ftp://ftp.uni-hamburg.de/pub/soft/infosystems/www/clients/netscape/communicator/extras/fonts/windows/ \
 		ftp://ftp-au.netscape.com/pub/communicator/extras/fonts/windows/
-DISTFILES=	${FONT_FILE} ${DOC_FILES}
+DISTFILES=	${FONT_FILE} ReadMe.htm
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.bitstream.com/
@@ -22,10 +23,6 @@ NO_SRC_ON_FTP=  ${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=  ${RESTRICTED}
 
-#BROKEN=		MASTER_SITES is unstable, and we can't mirror DISTFILES.
-
-DOC_FILES=	License.wri Orders.wri ReadMe.htm Readme.wri
-
 DIST_SUBDIR=	cyberbit-ttf
 
 EXTRACT_CMD=	${LOCALBASE}/bin/unzip -Laq $${extract_file}
@@ -36,14 +33,12 @@ NO_CONFIGURE=	YES
 NO_BUILD=	YES
 
 FONTS_TTF_DIRS=	${PREFIX}/lib/X11/fonts/TrueType
-DOCDIR=		${PREFIX}/share/doc/cyberbit-ttf
+DOCDIR=		${PREFIX}/share/doc/html/cyberbit-ttf
 
 do-install:
 	${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
+	${INSTALL_DATA} ${_DISTDIR}/ReadMe.htm ${DOCDIR}
 
 .include "../../mk/fonts.mk"
diff --git a/fonts/cyberbit-ttf/PLIST b/fonts/cyberbit-ttf/PLIST
index 4d22c09aaa9..50050306c23 100644
--- a/fonts/cyberbit-ttf/PLIST
+++ b/fonts/cyberbit-ttf/PLIST
@@ -1,8 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/09 16:01:22 tron Exp $
+@comment $NetBSD: PLIST,v 1.3 2003/04/22 09:44:59 salo Exp $
 lib/X11/fonts/TrueType/cyberbit.ttf
-share/doc/cyberbit-ttf/License.wri
-share/doc/cyberbit-ttf/Orders.wri
-share/doc/cyberbit-ttf/ReadMe.htm
-share/doc/cyberbit-ttf/Readme.wri
-@dirrm share/doc/cyberbit-ttf
+share/doc/html/cyberbit-ttf/ReadMe.htm
+@dirrm share/doc/html/cyberbit-ttf
 @unexec ${RMDIR} -p %D/lib/X11/fonts/TrueType 2> /dev/null || ${TRUE}
diff --git a/fonts/cyberbit-ttf/distinfo b/fonts/cyberbit-ttf/distinfo
index a176216b29c..6d5ed354802 100644
--- a/fonts/cyberbit-ttf/distinfo
+++ b/fonts/cyberbit-ttf/distinfo
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.2 2003/04/17 15:07:56 salo Exp $
+$NetBSD: distinfo,v 1.3 2003/04/22 09:44:59 salo Exp $
 
 SHA1 (cyberbit-ttf/Cyberbit.ZIP) = ad75fc3c634f6d39ba1f9fe400895a7132e31d1b
 Size (cyberbit-ttf/Cyberbit.ZIP) = 6427108 bytes
-SHA1 (cyberbit-ttf/License.wri) = 2fafe9c17d9b198b2993c65d123b65ace5d44c37
-Size (cyberbit-ttf/License.wri) = 7168 bytes
-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) = 48cf286248d48eb4e71e9490770b6717b7bd1316
-Size (cyberbit-ttf/Readme.wri) = 40065 bytes