diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-03-10 02:37:52 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2018-03-10 02:37:52 +0000 |
| commit | 4438cfe64392fc7cf1a45f954b4ec5cdf05bcb8f (patch) | |
| tree | 03b4bab5f60d9955d319356ba5a730eb8a713589 | |
| parent | Add sysutils/asmctl: Apple System Management Controller (diff) | |
- Add NO_BITMAPS option
- Convert files/patch-conf.d_Makefile.in to sed patch
PR: 225744
Submitted by: lightside
Notes
Notes:
svn path=/head/; revision=464041
| -rw-r--r-- | x11-fonts/fontconfig/Makefile | 12 | ||||
| -rw-r--r-- | x11-fonts/fontconfig/files/patch-conf.d_Makefile.in | 10 | ||||
| -rw-r--r-- | x11-fonts/fontconfig/pkg-plist | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile index 3627005c4c9b..41bd70b62033 100644 --- a/x11-fonts/fontconfig/Makefile +++ b/x11-fonts/fontconfig/Makefile @@ -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 \ diff --git a/x11-fonts/fontconfig/files/patch-conf.d_Makefile.in b/x11-fonts/fontconfig/files/patch-conf.d_Makefile.in deleted file mode 100644 index 0df05e9a47b4..000000000000 --- a/x11-fonts/fontconfig/files/patch-conf.d_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- conf.d/Makefile.in.orig 2018-03-09 08:02:13 UTC -+++ conf.d/Makefile.in -@@ -364,6 +364,7 @@ CONF_LINKS = \ - 65-fonts-persian.conf \ - 65-nonlatin.conf \ - 69-unifont.conf \ -+ 70-no-bitmaps.conf \ - 80-delicious.conf \ - 90-synthetic.conf - diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist index 0ba4c2a8b730..3dbc84611362 100644 --- a/x11-fonts/fontconfig/pkg-plist +++ b/x11-fonts/fontconfig/pkg-plist @@ -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 |