Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 27 Dec 2020 19:45:30 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559411 - head/x11-fonts/webfonts
Message-ID:  <202012271945.0BRJjUx1003020@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sun Dec 27 19:45:30 2020
New Revision: 559411
URL: https://svnweb.freebsd.org/changeset/ports/559411

Log:
  x11-fonts/webfonts: make Comic Sans optional
  
  PR:		252051
  Approved by:	olgeni (maintainer)

Modified:
  head/x11-fonts/webfonts/Makefile   (contents, props changed)
  head/x11-fonts/webfonts/pkg-plist   (contents, props changed)

Modified: head/x11-fonts/webfonts/Makefile
==============================================================================
--- head/x11-fonts/webfonts/Makefile	Sun Dec 27 19:44:19 2020	(r559410)
+++ head/x11-fonts/webfonts/Makefile	Sun Dec 27 19:45:30 2020	(r559411)
@@ -32,7 +32,8 @@ EXTRACT_CMD=		${LOCALBASE}/bin/cabextract
 EXTRACT_BEFORE_ARGS=	-qLF '[a-uw-z]*.ttf' -d ${WRKSRC}
 EXTRACT_AFTER_ARGS=
 
-OPTIONS_DEFINE=	EXTRAFONTS CLEARTYPE NEWVERDANA DOCS
+OPTIONS_DEFINE=	EXTRAFONTS CLEARTYPE NEWVERDANA DOCS COMIC
+OPTIONS_DEFAULT=	COMIC
 OPTIONS_SUB=	yes
 
 EXTRAFONTS_DESC=	Fonts licensed under MS Windows license
@@ -42,9 +43,12 @@ CLEARTYPE_DESC=	Install ClearType fonts
 CLEARTYPE_DISTFILES=	PowerPointViewer.exe:group3
 
 NEWVERDANA_DESC=	Install y2006 version of Verdana (broken bold N, W)
+COMIC_DESC=		Install Comic Sans
 
 SUB_FILES=	pkg-message
 
+NO_ARCH=	yes
+
 .include <bsd.port.options.mk>
 
 post-extract:
@@ -62,6 +66,9 @@ post-extract-NEWVERDANA-off:
 
 post-extract-NEWVERDANA-on:
 	${EXTRACT_CMD} -qLF 'v*.ttf' -d ${WRKSRC} ${_DISTDIR}/EUupdate.EXE
+
+post-extract-COMIC-off:
+	${RM} ${WRKSRC}/comic.ttf ${WRKSRC}/comicbd.ttf
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}

Modified: head/x11-fonts/webfonts/pkg-plist
==============================================================================
--- head/x11-fonts/webfonts/pkg-plist	Sun Dec 27 19:44:19 2020	(r559410)
+++ head/x11-fonts/webfonts/pkg-plist	Sun Dec 27 19:45:30 2020	(r559411)
@@ -17,8 +17,8 @@
 %%CLEARTYPE%%%%FONTSDIR%%/candarab.ttf
 %%CLEARTYPE%%%%FONTSDIR%%/candarai.ttf
 %%CLEARTYPE%%%%FONTSDIR%%/candaraz.ttf
-%%FONTSDIR%%/comic.ttf
-%%FONTSDIR%%/comicbd.ttf
+%%COMIC%%%%FONTSDIR%%/comic.ttf
+%%COMIC%%%%FONTSDIR%%/comicbd.ttf
 %%CLEARTYPE%%%%FONTSDIR%%/consola.ttf
 %%CLEARTYPE%%%%FONTSDIR%%/consolab.ttf
 %%CLEARTYPE%%%%FONTSDIR%%/consolai.ttf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012271945.0BRJjUx1003020>