liberation-ttf: update to 2.1.1, use fonts.mk

* Wed Jun 03 2020 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
- Releasing liberation-fonts 2.1.1 version
- Few more fixes to Bugzilla #1072095: Liberation Sans renders most Latin combining characters incorrectly

* Mon Feb 10 2020 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
- Releasing liberation-fonts 2.1.0 version
- Updated release versioning scheme
- Resolved Bugzilla #1072095:   Liberation Sans renders most Latin combining characters incorrectly
- Resolved Pagure issue-11:     Combining diaerasis below does not work except U
- Resolved GitHub issue-19:     Incorrect glyph name mapped to unicode
- Resolved Pagure issue-5:      Incorrect glyph of Cent sign (U+00A2) in Sans and Mono style
- Resolved Pagure issue-28 :    U+25D2 and U+25D3 circle with lower / upper half black are backwards

* Mon Mar 4 2019 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
- Releasing liberation-fonts 2.00.5 version
- Resolved issue-10: Improving lowercase Cyrillic glyps localized for Macedonian and Serbian, Patch fix by Dimitrij Mijoski
- Resolved #1014357: U+266B incorrect glyph with extra beam
-- Added two new glyphs U+266C and U+2669
- Resolved issue-13: COMBINING LONG SOLIDUS OVERLAY (U+0338) not centred on base character.
- Validated Missing Points at Extrema, Non-integral coordinates, Wrong Direction issues for newly added and existing glyphs

* Mon Nov 05 2018 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
- Releasing liberation-fonts 2.00.4 version, it includes few bug fixes and enhancements as follows:
-- Added Bitcoin sign #1533798
-- Fixed Incorrect lowercase Cyrillic BE for Macedonian language in liberation v2 (look like Greek delta), Patch fix by Dimitrij Mijoski #1574410
-- Fixed Liberation Sans Mono Enhancement Request: Modification needed for "l" Character, Patch fix by Nikolaus Waxweiler #1574410

* Tue Sep 18 2018 Vishal Vijayraghavan <vishalvijayraghavan@gmail.com>
- Resolved #1574410:  Incorrect lowercase Cyrillic BE for Macedonian language in liberation v2 (look like Greek delta)
- Patch fix by Dimitrij Mijoski: https://pagure.io/liberation-fonts/pull-request/21
- Updated LiberationMono-Bold, LiberationMono-Regular, LiberationSans-Bold, LiberationSans-Regular, LiberationSerif-Bold, LiberationSerif-Regular

* Thu May 17 2018 Pravin Satpute <psatpute AT redhat DOT com> - 2.00.3
- Releasing liberation-fonts 2.00.3 version, it includes fix for few bugs.
- This release was pending from long time, will work on other open bugs
  post this release.

4 files changed, 42 insertions, 24 deletions

diff --git a/fonts/liberation-ttf/Makefile b/fonts/liberation-ttf/Makefile
index 6fba3b431ba..49a2589340a 100644
--- a/fonts/liberation-ttf/Makefile
+++ b/fonts/liberation-ttf/Makefile
@@ -1,33 +1,35 @@
-# $NetBSD: Makefile,v 1.15 2017/11/01 05:17:06 maya Exp $
+# $NetBSD: Makefile,v 1.16 2020/11/06 18:07:37 maya Exp $
 
-DISTNAME=	liberation-fonts-ttf-2.00.1
+DISTNAME=	liberation-fonts-ttf-2.1.1
 PKGNAME=	${DISTNAME:S/-fonts//}
-PKGREVISION=	1
 CATEGORIES=	fonts
-MASTER_SITES=	https://releases.pagure.org/liberation-fonts/
+MASTER_SITES=	${MASTER_SITE_GITHUB:=liberationfonts/}
+GITHUB_PROJECT=	liberation-fonts
 
 MAINTAINER=	bartosz.kuzma@gmail.com
 HOMEPAGE=	http://www.redhat.com/promo/fonts/
 COMMENT=	TrueType fonts from RedHat
 LICENSE=	ofl-v1.1
 
-NO_BUILD=	yes
+USE_TOOLS+=	gmake
+
 NO_CONFIGURE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-ttf//}
 
-DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
-FONTDIR=	${PREFIX}/share/fonts/X11/TTF
-FONTS_DIRS.ttf=	${FONTDIR}
+DOCSDIR=	${PREFIX}/share/doc/${PKGBASE}
 
-INSTALLATION_DIRS=	${DOCDIR} ${FONTDIR}
+INSTALLATION_DIRS+=	${DOCSDIR}
 
-do-install:
-	set -e; \
-	cd ${WRKSRC} && for f in *.ttf ; do \
-		${INSTALL_DATA} $$f ${DESTDIR}${FONTDIR}/$$f ; \
-	done
+BUILD_DEPENDS+=	${PYPKGPREFIX}-fonttools-[0-9]*:../../fonts/py-fonttools
+BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 
-	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${WRKSRC}/ChangeLog \
-		${WRKSRC}/LICENSE ${WRKSRC}/README ${WRKSRC}/TODO \
-		${DESTDIR}${DOCDIR}
+REPLACE_PYTHON+=	scripts/setisFixedPitch-fonttools.py
+
+do-install:
+.for docfile in AUTHORS LICENSE README.md TODO ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${docfile} ${DESTDIR}${DOCSDIR}
+.endfor
 
+.include "../../mk/fonts.mk"
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/liberation-ttf/PLIST b/fonts/liberation-ttf/PLIST
index 80a97885aa7..c7551dd813b 100644
--- a/fonts/liberation-ttf/PLIST
+++ b/fonts/liberation-ttf/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:29:32 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2020/11/06 18:07:37 maya Exp $
 share/doc/liberation-ttf/AUTHORS
 share/doc/liberation-ttf/ChangeLog
 share/doc/liberation-ttf/LICENSE
-share/doc/liberation-ttf/README
+share/doc/liberation-ttf/README.md
 share/doc/liberation-ttf/TODO
 share/fonts/X11/TTF/LiberationMono-Bold.ttf
 share/fonts/X11/TTF/LiberationMono-BoldItalic.ttf
diff --git a/fonts/liberation-ttf/distinfo b/fonts/liberation-ttf/distinfo
index 98f7261402f..678fb2dc9fe 100644
--- a/fonts/liberation-ttf/distinfo
+++ b/fonts/liberation-ttf/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 20:44:36 agc Exp $
+$NetBSD: distinfo,v 1.8 2020/11/06 18:07:37 maya Exp $
 
-SHA1 (liberation-fonts-ttf-2.00.1.tar.gz) = 84b40d7f8bb0cd085dd70b3abed197133d761557
-RMD160 (liberation-fonts-ttf-2.00.1.tar.gz) = 99ee3851f3f1ae9a431541de5765312f01ef19d7
-SHA512 (liberation-fonts-ttf-2.00.1.tar.gz) = 52dce5cf2c35165f81c903f2c7245d7f0e37a37eeb4003a015d8cc2404728f17ff4d723ddc5d4b6a6c03044d7ec97b98cf4eecfbc91607fcfed6e0aaff260739
-Size (liberation-fonts-ttf-2.00.1.tar.gz) = 2285857 bytes
+SHA1 (liberation-fonts-ttf-2.1.1.tar.gz) = 174ece9fffa955cc3450d269eae2f2fd0156c85d
+RMD160 (liberation-fonts-ttf-2.1.1.tar.gz) = 17f3fcf745df4b47f488e9aae1fcb9614da3dd38
+SHA512 (liberation-fonts-ttf-2.1.1.tar.gz) = 25de431b1ce71b9dd710757430ad3a5c370ce3e7f3a172fec96dbe578e778c8653c949c973382d791cef1807c7f7bf966784254ebb53e09169f861e3d35d16de
+Size (liberation-fonts-ttf-2.1.1.tar.gz) = 4993547 bytes
+SHA1 (patch-Makefile) = ce9a1af13c773de0a6ccf4823bb21ef54e677112
diff --git a/fonts/liberation-ttf/patches/patch-Makefile b/fonts/liberation-ttf/patches/patch-Makefile
new file mode 100644
index 00000000000..80377db6e62
--- /dev/null
+++ b/fonts/liberation-ttf/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.1 2020/11/06 18:07:37 maya Exp $
+
+Allow overriding python.
+
+--- Makefile.orig	2020-06-08 04:37:53.000000000 +0000
++++ Makefile
+@@ -4,7 +4,7 @@
+ # 4web:                        dtto for TTF, WOFF, SVG, and EOT
+ 
+ FONTFORGE    = fontforge
+-PYTHON       = python3
++PYTHON       ?= python3
+ FONTLINT     = fontlint
+ 
+ # TTF->EOT converters in fallback order