svn commit: r464041 - in head/x11-fonts/fontconfig: . files

[Hajimu UMEMOTO]

Author: ume
Date: Sat Mar 10 02:37:52 2018
New Revision: 464041
URL: https://svnweb.freebsd.org/changeset/ports/464041

Log:
  - Add NO_BITMAPS option
  - Convert files/patch-conf.d_Makefile.in to sed patch
  
  PR:		225744
  Submitted by:	lightside

Deleted:
  head/x11-fonts/fontconfig/files/patch-conf.d_Makefile.in
Modified:
  head/x11-fonts/fontconfig/Makefile
  head/x11-fonts/fontconfig/pkg-plist

Modified: head/x11-fonts/fontconfig/Makefile
==============================================================================
--- head/x11-fonts/fontconfig/Makefile	Sat Mar 10 01:16:20 2018	(r464040)
+++ head/x11-fonts/fontconfig/Makefile	Sat Mar 10 02:37:52 2018	(r464041)
@@ -50,6 +50,12 @@ PLIST_SUB=	PREFERRED_HINTING=${PREFERRED_HINTING}
 PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
 OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NO_BITMAPS
+OPTIONS_DEFAULT=HINTING_SLIGHT NO_BITMAPS
+OPTIONS_SUB=	yes
+
+NO_BITMAPS_DESC=	Reject bitmap fonts by default
+
 OPTIONS_SINGLE=	HINTING
 HINTING_DESC=	Preferred pixel hinting configuration
 .for opt in NONE SLIGHT MEDIUM FULL
@@ -57,7 +63,11 @@ OPTIONS_SINGLE_HINTING+=	HINTING_${opt}
 HINTING_${opt}_DESC=	${opt:tl}
 HINTING_${opt}_VARS=	PREFERRED_HINTING=${opt:tl}
 .endfor
-OPTIONS_DEFAULT=	HINTING_SLIGHT
+
+post-patch-NO_BITMAPS-on:
+	@${REINPLACE_CMD} -i '.bitmaps.bak' -e \
+		'/^CONF_LINKS =/s|$$|\${.newline}	70-no-bitmaps.conf \\|' \
+		${WRKSRC}/conf.d/Makefile.in
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/fc-*/*.1 \

Modified: head/x11-fonts/fontconfig/pkg-plist
==============================================================================
--- head/x11-fonts/fontconfig/pkg-plist	Sat Mar 10 01:16:20 2018	(r464040)
+++ head/x11-fonts/fontconfig/pkg-plist	Sat Mar 10 02:37:52 2018	(r464041)
@@ -53,7 +53,7 @@ etc/fonts/conf.d/60-latin.conf
 etc/fonts/conf.d/65-fonts-persian.conf
 etc/fonts/conf.d/65-nonlatin.conf
 etc/fonts/conf.d/69-unifont.conf
-etc/fonts/conf.d/70-no-bitmaps.conf
+%%NO_BITMAPS%%etc/fonts/conf.d/70-no-bitmaps.conf
 etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
 etc/fonts/conf.d/README