Update to 2.00.0

* Change to Google croscore font 1.21.0 base
* Change license to the SIL Open Font License, Version 1.1

Changelog:
"On Jul 18 Liberation fonts 2.00.0 version is released based
on croscore fonts to resolve long standing licensing problem and
also get more coverage present in croscore fonts."

3 files changed, 19 insertions, 16 deletions

diff --git a/fonts/liberation-ttf/Makefile b/fonts/liberation-ttf/Makefile
index 116aa126033..6b872cab87f 100644
--- a/fonts/liberation-ttf/Makefile
+++ b/fonts/liberation-ttf/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/12/07 10:30:32 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2012/10/01 11:14:22 ryoon Exp $
 #
 
-DISTNAME=	liberation-fonts-ttf-1.07.1
-PKGREVISION=	1
+DISTNAME=	liberation-fonts-ttf-2.00.0
 PKGNAME=	${DISTNAME:S/-fonts//}
 CATEGORIES=	fonts
 MASTER_SITES=	https://fedorahosted.org/releases/l/i/liberation-fonts/ \
@@ -11,10 +10,14 @@ MASTER_SITES=	https://fedorahosted.org/releases/l/i/liberation-fonts/ \
 MAINTAINER=	bartosz.kuzma@gmail.com
 HOMEPAGE=	http://www.redhat.com/promo/fonts/
 COMMENT=	TrueType fonts from RedHat
-LICENSE=	gnu-gpl-v2 # with some exception
+LICENSE=	open-font-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+# Force using "curl" for fetching the distribution file. It is only available
+# over HTTPS and "curl" is the only fetch program which always supports HTTPS.
+FETCH_USING=	curl
+
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
 
@@ -30,7 +33,8 @@ do-install:
 		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f ; \
 	done
 
-	${INSTALL_DATA} ${WRKSRC}/COPYING ${WRKSRC}/License.txt \
+	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog \
+		${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/TODO \
 		${DESTDIR}${DOCDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/liberation-ttf/PLIST b/fonts/liberation-ttf/PLIST
index b6164711839..b4ae850090a 100644
--- a/fonts/liberation-ttf/PLIST
+++ b/fonts/liberation-ttf/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2011/03/05 19:16:46 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/01 11:14:22 ryoon Exp $
 lib/X11/fonts/TTF/LiberationMono-Bold.ttf
 lib/X11/fonts/TTF/LiberationMono-BoldItalic.ttf
 lib/X11/fonts/TTF/LiberationMono-Italic.ttf
@@ -7,13 +7,12 @@ lib/X11/fonts/TTF/LiberationSans-Bold.ttf
 lib/X11/fonts/TTF/LiberationSans-BoldItalic.ttf
 lib/X11/fonts/TTF/LiberationSans-Italic.ttf
 lib/X11/fonts/TTF/LiberationSans-Regular.ttf
-lib/X11/fonts/TTF/LiberationSansNarrow-Bold.ttf
-lib/X11/fonts/TTF/LiberationSansNarrow-BoldItalic.ttf
-lib/X11/fonts/TTF/LiberationSansNarrow-Italic.ttf
-lib/X11/fonts/TTF/LiberationSansNarrow-Regular.ttf
 lib/X11/fonts/TTF/LiberationSerif-Bold.ttf
 lib/X11/fonts/TTF/LiberationSerif-BoldItalic.ttf
 lib/X11/fonts/TTF/LiberationSerif-Italic.ttf
 lib/X11/fonts/TTF/LiberationSerif-Regular.ttf
-share/doc/liberation-ttf/COPYING
-share/doc/liberation-ttf/License.txt
+share/doc/liberation-ttf/AUTHORS
+share/doc/liberation-ttf/ChangeLog
+share/doc/liberation-ttf/LICENSE
+share/doc/liberation-ttf/README
+share/doc/liberation-ttf/TODO
diff --git a/fonts/liberation-ttf/distinfo b/fonts/liberation-ttf/distinfo
index 6b59c588a37..3422933ae4b 100644
--- a/fonts/liberation-ttf/distinfo
+++ b/fonts/liberation-ttf/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/10/22 08:50:18 ryoon Exp $
+$NetBSD: distinfo,v 1.5 2012/10/01 11:14:22 ryoon Exp $
 
-SHA1 (liberation-fonts-ttf-1.07.1.tar.gz) = 935bf5d6748b465d2d540884af67fb5dfd59fc4a
-RMD160 (liberation-fonts-ttf-1.07.1.tar.gz) = d4dd5ad660ba5747de8e65892583427014aebaa2
-Size (liberation-fonts-ttf-1.07.1.tar.gz) = 1326668 bytes
+SHA1 (liberation-fonts-ttf-2.00.0.tar.gz) = 1d56c6f319401012e53818fa6e9e26ebf6429da0
+RMD160 (liberation-fonts-ttf-2.00.0.tar.gz) = 7a0ec5ffc77d962c8ce394eadbf00ccf7455e741
+Size (liberation-fonts-ttf-2.00.0.tar.gz) = 2302736 bytes