Subject: ms-ttf: get rid of license and upload restrictions and move font
To: None <tech-pkg@netbsd.org>
From: Jeremy C. Reed <reed@reedmedia.net>
List: tech-pkg
Date: 12/20/2004 22:46:51
May I commit the following?

It gets rid of the license and upload restrictions. (I emailed the list
about this in September.) And moved the files from lib/X11/fonts/TTF/ to
share/fonts/TTF/.

Index: fonts/ms-ttf/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/ms-ttf/Makefile,v
retrieving revision 1.10
diff -b -u -r1.10 Makefile
--- fonts/ms-ttf/Makefile	25 Jan 2004 20:34:16 -0000	1.10
+++ fonts/ms-ttf/Makefile	21 Dec 2004 06:44:29 -0000
@@ -2,7 +2,7 @@

 DISTNAME=	# empty
 PKGNAME=	ms-ttf-20020306
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=corefonts/}
 DISTFILES=	andale32.exe webdin32.exe trebuc32.exe georgi32.exe \
@@ -15,13 +15,6 @@

 BUILD_DEPENDS+=	cabextract-[0-9]*:../../archivers/cabextract

-LICENSE=        ms-ttf-license
-RESTRICTED=	No redistribution in altered form
-
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-NO_SRC_ON_CDROM=	${RESTRICTED}
-
 NO_CONFIGURE=   yes
 NO_BUILD=       yes

@@ -30,7 +23,7 @@
 EVAL_PREFIX+=	CABEXTRACT_PREFIX=cabextract
 CABEXTRACT_PREFIX_DEFAULT=${LOCALBASE}
 EXTRACT_CMD=	${CABEXTRACT_PREFIX}/bin/cabextract -q $${extract_file}
-FONTDIR=	${PREFIX}/lib/X11/fonts/TTF
+FONTDIR=	${PREFIX}/share/fonts/TTF
 DOCDIR=		${PREFIX}/share/doc/ms-ttf
 FONTS_TTF_DIRS=	${FONTDIR}

@@ -46,7 +39,7 @@
 	cd ${WRKSRC} && for f in *.ttf ; do \
 		${INSTALL_DATA} $$f ${FONTDIR}/$$f; \
 	done
-	${INSTALL_DATA} ${.CURDIR}/../../licenses/${LICENSE} ${DOCDIR}
+	${INSTALL_DATA} ${WRKSRC}/Licen.TXT ${DOCDIR}/ms-ttf-license

 .include "../../mk/fonts.mk"
 .include "../../mk/bsd.pkg.mk"
Index: fonts/ms-ttf/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/fonts/ms-ttf/PLIST,v
retrieving revision 1.5
diff -b -u -r1.5 PLIST
--- fonts/ms-ttf/PLIST	25 Jan 2004 20:34:16 -0000	1.5
+++ fonts/ms-ttf/PLIST	21 Dec 2004 06:44:29 -0000
@@ -1,33 +1,33 @@
 @comment $NetBSD: PLIST,v 1.5 2004/01/25 20:34:16 wiz Exp $
-lib/X11/fonts/TTF/AndaleMo.ttf
-lib/X11/fonts/TTF/AriBlk.ttf
-lib/X11/fonts/TTF/Arial.ttf
-lib/X11/fonts/TTF/Arialbd.ttf
-lib/X11/fonts/TTF/Arialbi.ttf
-lib/X11/fonts/TTF/Ariali.ttf
-lib/X11/fonts/TTF/Comic.ttf
-lib/X11/fonts/TTF/Comicbd.ttf
-lib/X11/fonts/TTF/Georgia.ttf
-lib/X11/fonts/TTF/Georgiab.ttf
-lib/X11/fonts/TTF/Georgiai.ttf
-lib/X11/fonts/TTF/Georgiaz.ttf
-lib/X11/fonts/TTF/Impact.ttf
-lib/X11/fonts/TTF/Times.ttf
-lib/X11/fonts/TTF/Timesbd.ttf
-lib/X11/fonts/TTF/Timesbi.ttf
-lib/X11/fonts/TTF/Timesi.ttf
-lib/X11/fonts/TTF/Trebucbd.ttf
-lib/X11/fonts/TTF/Verdana.ttf
-lib/X11/fonts/TTF/Verdanab.ttf
-lib/X11/fonts/TTF/Verdanai.ttf
-lib/X11/fonts/TTF/Verdanaz.ttf
-lib/X11/fonts/TTF/Webdings.ttf
-lib/X11/fonts/TTF/cour.ttf
-lib/X11/fonts/TTF/courbd.ttf
-lib/X11/fonts/TTF/courbi.ttf
-lib/X11/fonts/TTF/couri.ttf
-lib/X11/fonts/TTF/trebuc.ttf
-lib/X11/fonts/TTF/trebucbi.ttf
-lib/X11/fonts/TTF/trebucit.ttf
 share/doc/ms-ttf/ms-ttf-license
+share/fonts/TTF/AndaleMo.ttf
+share/fonts/TTF/AriBlk.ttf
+share/fonts/TTF/Arial.ttf
+share/fonts/TTF/Arialbd.ttf
+share/fonts/TTF/Arialbi.ttf
+share/fonts/TTF/Ariali.ttf
+share/fonts/TTF/Comic.ttf
+share/fonts/TTF/Comicbd.ttf
+share/fonts/TTF/Georgia.ttf
+share/fonts/TTF/Georgiab.ttf
+share/fonts/TTF/Georgiai.ttf
+share/fonts/TTF/Georgiaz.ttf
+share/fonts/TTF/Impact.ttf
+share/fonts/TTF/Times.ttf
+share/fonts/TTF/Timesbd.ttf
+share/fonts/TTF/Timesbi.ttf
+share/fonts/TTF/Timesi.ttf
+share/fonts/TTF/Trebucbd.ttf
+share/fonts/TTF/Verdana.ttf
+share/fonts/TTF/Verdanab.ttf
+share/fonts/TTF/Verdanai.ttf
+share/fonts/TTF/Verdanaz.ttf
+share/fonts/TTF/Webdings.ttf
+share/fonts/TTF/cour.ttf
+share/fonts/TTF/courbd.ttf
+share/fonts/TTF/courbi.ttf
+share/fonts/TTF/couri.ttf
+share/fonts/TTF/trebuc.ttf
+share/fonts/TTF/trebucbi.ttf
+share/fonts/TTF/trebucit.ttf
 @dirrm share/doc/ms-ttf