On 2016/04/23 16:34, patrick keshishian wrote:
> + symquotes - Build with symmetric single quotes.
> + centered_tilde - Build with centered ASCII tilde.
> + symquotes-centered_tilde - Build with both modifications.
I think this last line is a little confusing, it suggests there's
something unusual about this port - and if you're building it from
ports it won't work like that anyway - you would specify it like
`env FLAVOR="symquotes centered_tilde" make'.
Looking at the post-patch target, we don't actually need it at
all, see the diff below. I also included upstream's patch names in
DESCR in case somebody is looking for a variant by that name, and
tweaked the text above a little.
Although I am still in two minds about this strange spelling of
the word that most English-speakers in the world know as "centred".
OK with you Daniel? (and I guess, as maintainer, you get final
choice on spelling ;-)
Index: Makefile
===================================================================
RCS file: /cvs/ports/fonts/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 10 Mar 2016 07:22:46 -0000 1.31
+++ Makefile 24 Apr 2016 00:48:51 -0000
@@ -56,6 +56,9 @@
SUBDIR += spranq-ecofont-ttf
SUBDIR += symbola-ttf
SUBDIR += terminus-font
+ SUBDIR += terminus-font,symquotes
+ SUBDIR += terminus-font,symquotes,centered_tilde
+ SUBDIR += terminus-font,centered_tilde
SUBDIR += ubuntu-fonts
SUBDIR += un-fonts
SUBDIR += zh-arphicttf
Index: terminus-font/Makefile
===================================================================
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- terminus-font/Makefile 13 Nov 2015 20:18:25 -0000 1.10
+++ terminus-font/Makefile 24 Apr 2016 00:48:51 -0000
@@ -3,6 +3,7 @@
COMMENT = fixed width fonts especially for long hacking sessions
DISTNAME = terminus-font-4.40
+REVISION = 0
CATEGORIES = fonts x11
HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -24,13 +25,18 @@ FONTDIR = ${PREFIX}/share/fonts/terminu
USE_GMAKE = Yes
-FLAVORS = symquotes
+FLAVORS = symquotes centered_tilde
FLAVOR ?=
+.if ${FLAVOR:Mcentered_tilde}
+FLAVOR_PATCHES += ${WRKSRC}/alt/td1.diff
+.endif
+
.if ${FLAVOR:Msymquotes}
-post-patch:
- ${PATCH} -d ${WRKSRC} < ${WRKSRC}/alt/gq2.diff
+FLAVOR_PATCHES += ${WRKSRC}/alt/gq2.diff
.endif
+
+PATCH_LIST = patch-* ${FLAVOR_PATCHES}
do-install:
${GZIP_CMD} ${WRKSRC}/*.pcf
Index: terminus-font/pkg/DESCR
===================================================================
RCS file: /cvs/ports/fonts/terminus-font/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- terminus-font/pkg/DESCR 19 Jul 2011 09:16:08 -0000 1.1.1.1
+++ terminus-font/pkg/DESCR 24 Apr 2016 00:48:51 -0000
@@ -1,5 +1,6 @@
The Terminus font is a complete set of fixed-size fonts designed
-especially for the usage in terms.
+especially for use in terminals.
Flavors:
- symquotes - Build with symmetric single quotes.
+ symquotes - Build with symmetric single quotes (gq2)
+ centered_tilde - Build with centered ASCII tilde (td1)
