svn commit: r515711 - head/x11-fonts/monoid

[Mateusz Piotrowski]

Author: 0mp
Date: Sat Oct 26 16:03:31 2019
New Revision: 515711
URL: https://svnweb.freebsd.org/changeset/ports/515711

Log:
  Install Monoisome font as well
  
  I am adding the Monoisome font to the port, which is a mix of Monoid
  and Font Awesome making it possible to see icons in the text.

Modified:
  head/x11-fonts/monoid/Makefile
  head/x11-fonts/monoid/distinfo
  head/x11-fonts/monoid/pkg-descr
  head/x11-fonts/monoid/pkg-plist

Modified: head/x11-fonts/monoid/Makefile
==============================================================================
--- head/x11-fonts/monoid/Makefile	Sat Oct 26 15:25:52 2019	(r515710)
+++ head/x11-fonts/monoid/Makefile	Sat Oct 26 16:03:31 2019	(r515711)
@@ -1,23 +1,25 @@
 # $FreeBSD$
 
 PORTNAME=	monoid
-DISTVERSIONPREFIX=	v
 DISTVERSION=	0.61
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://github.com/larsenwork/monoid/raw/${RELEASE_HASH}/
-DISTFILES=	${FONTNAME}${EXTRACT_SUFX} \
-		${FONTNAME}-Tight${EXTRACT_SUFX} \
-		${FONTNAME}-HalfTight${EXTRACT_SUFX} \
-		${FONTNAME}-HalfLoose${EXTRACT_SUFX} \
-		${FONTNAME}-Loose${EXTRACT_SUFX}
-DIST_SUBDIR=	${PORTNAME}-${DISTVERSIONFULL}
+MASTER_SITES=	https://github.com/larsenwork/monoid/raw/${RELEASE_HASH}/:monoid \
+		https://github.com/larsenwork/monoid/raw/${DISTVERSION}/Monoisome/:monoisome
+DISTFILES=	${FONTNAME}${EXTRACT_SUFX}:monoid \
+		${FONTNAME}-Tight${EXTRACT_SUFX}:monoid \
+		${FONTNAME}-HalfTight${EXTRACT_SUFX}:monoid \
+		${FONTNAME}-HalfLoose${EXTRACT_SUFX}:monoid \
+		${FONTNAME}-Loose${EXTRACT_SUFX}:monoid \
+		Monoisome-Regular.ttf:monoisome
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
+EXTRACT_ONLY=	${DISTFILES:M*\:monoid:S/:monoid//}
 
 MAINTAINER=	0mp at FreeBSD.org
 COMMENT=	Coding font with alternates, ligatures and contextual positioning
 
 # The license is in the README file, which is not downloaded.
-LICENSE=	MIT OFL11
-LICENSE_COMB=	dual
+LICENSE=	OFL11
 
 USES=		fonts zip
 
@@ -28,6 +30,10 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 RELEASE_HASH=	2db2d289f4e61010dd3f44e09918d9bb32fb96fd
+
+post-extract:
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Monoisome-Regular.ttf \
+		${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}

Modified: head/x11-fonts/monoid/distinfo
==============================================================================
--- head/x11-fonts/monoid/distinfo	Sat Oct 26 15:25:52 2019	(r515710)
+++ head/x11-fonts/monoid/distinfo	Sat Oct 26 16:03:31 2019	(r515711)
@@ -1,11 +1,13 @@
-TIMESTAMP = 1572102001
-SHA256 (monoid-v0.61/Monoid.zip) = c28acd76ae1f0244f7c869bf1ba3272da3eb900dd50fbbd368265468a1a34794
-SIZE (monoid-v0.61/Monoid.zip) = 145031
-SHA256 (monoid-v0.61/Monoid-Tight.zip) = c2abf6a212cf027b4fa07141641156c4eb231ffb38cb510de481bbe82115d548
-SIZE (monoid-v0.61/Monoid-Tight.zip) = 145480
-SHA256 (monoid-v0.61/Monoid-HalfTight.zip) = d32c6ba277b9a700f1c72fb5f10d150cebb113c0a35fd7cdae01bbddabc9a283
-SIZE (monoid-v0.61/Monoid-HalfTight.zip) = 145762
-SHA256 (monoid-v0.61/Monoid-HalfLoose.zip) = 3461c88097b8a07cfdf50765a827bd5edd8fcedbed3a48cd05c538d376ec58a9
-SIZE (monoid-v0.61/Monoid-HalfLoose.zip) = 145348
-SHA256 (monoid-v0.61/Monoid-Loose.zip) = 51238c5027182a8d993a0a58a2cb68a2e96209ee93105ee7653cabe87885c637
-SIZE (monoid-v0.61/Monoid-Loose.zip) = 145290
+TIMESTAMP = 1572105265
+SHA256 (monoid-0.61/Monoid.zip) = c28acd76ae1f0244f7c869bf1ba3272da3eb900dd50fbbd368265468a1a34794
+SIZE (monoid-0.61/Monoid.zip) = 145031
+SHA256 (monoid-0.61/Monoid-Tight.zip) = c2abf6a212cf027b4fa07141641156c4eb231ffb38cb510de481bbe82115d548
+SIZE (monoid-0.61/Monoid-Tight.zip) = 145480
+SHA256 (monoid-0.61/Monoid-HalfTight.zip) = d32c6ba277b9a700f1c72fb5f10d150cebb113c0a35fd7cdae01bbddabc9a283
+SIZE (monoid-0.61/Monoid-HalfTight.zip) = 145762
+SHA256 (monoid-0.61/Monoid-HalfLoose.zip) = 3461c88097b8a07cfdf50765a827bd5edd8fcedbed3a48cd05c538d376ec58a9
+SIZE (monoid-0.61/Monoid-HalfLoose.zip) = 145348
+SHA256 (monoid-0.61/Monoid-Loose.zip) = 51238c5027182a8d993a0a58a2cb68a2e96209ee93105ee7653cabe87885c637
+SIZE (monoid-0.61/Monoid-Loose.zip) = 145290
+SHA256 (monoid-0.61/Monoisome-Regular.ttf) = 0aedac5663ea33f5a7d5c802408ff0ee16cf62b680f9e05980ccd2ba40040930
+SIZE (monoid-0.61/Monoisome-Regular.ttf) = 254384

Modified: head/x11-fonts/monoid/pkg-descr
==============================================================================
--- head/x11-fonts/monoid/pkg-descr	Sat Oct 26 15:25:52 2019	(r515710)
+++ head/x11-fonts/monoid/pkg-descr	Sat Oct 26 16:03:31 2019	(r515711)
@@ -7,4 +7,6 @@ big apertures and supersized operators + punctuation.
 Monoid comes in regular, bold, oblique and retina versions with >750 latin,
 greek, cyrillic, ligature, alternate and Powerline glyphs.
 
+The port includes the Monoisome font (Monoid + Font Awesome).
+
 WWW: https://larsenwork.com/monoid

Modified: head/x11-fonts/monoid/pkg-plist
==============================================================================
--- head/x11-fonts/monoid/pkg-plist	Sat Oct 26 15:25:52 2019	(r515710)
+++ head/x11-fonts/monoid/pkg-plist	Sat Oct 26 16:03:31 2019	(r515711)
@@ -18,3 +18,4 @@
 %%FONTSDIR%%/Monoid-Retina-Loose.ttf
 %%FONTSDIR%%/Monoid-Retina-Tight.ttf
 %%FONTSDIR%%/Monoid-Retina.ttf
+%%FONTSDIR%%/Monoisome-Regular.ttf