Date: Fri, 30 Sep 2016 15:48:15 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422993 - branches/2016Q3/devel/rlvm Message-ID: <201609301548.u8UFmFtX012292@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Sep 30 15:48:15 2016 New Revision: 422993 URL: https://svnweb.freebsd.org/changeset/ports/422993 Log: MFH: r422992 devel/rlvm: fix font handling Even CLANNAD (Steam HD edition) didn't work[1], so... - Force at least one supported font to be installed - Chase paths for MONA after rename in r397892 - Don't look under PREFIX, other packages are under LOCALBASE [1] rlvm doesn't use fontconfig, so it happily crashed without leaving any error on terminal to assist troubleshooting if one of the listed fonts couldn't be found. Approved by: ports-secteam "runtime" blanket Modified: branches/2016Q3/devel/rlvm/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/devel/rlvm/Makefile ============================================================================== --- branches/2016Q3/devel/rlvm/Makefile Fri Sep 30 15:36:13 2016 (r422992) +++ branches/2016Q3/devel/rlvm/Makefile Fri Sep 30 15:48:15 2016 (r422993) @@ -2,6 +2,7 @@ PORTNAME= rlvm PORTVERSION= 0.14.0.20150425 +PORTREVISION= 1 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -35,15 +36,16 @@ CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/ LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps) OPTIONS_DEFINE= DEBUG DOCS NLS TEST -OPTIONS_GROUP= JAPANESE_FONT -OPTIONS_GROUP_JAPANESE_FONT=KOCHI MONA SAZANAMI +OPTIONS_DEFAULT=MONA +OPTIONS_MULTI= JAPANESE_FONT +OPTIONS_MULTI_JAPANESE_FONT=KOCHI MONA SAZANAMI OPTIONS_SUB= yes JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font) KOCHI_DESC= kochi-gothic-subst.ttf from japanese/font-kochi KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/kochi-gothic-subst.ttf:japanese/font-kochi -MONA_DESC= mona.ttf from japanese/monafonts-ttf -MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/TrueType/mona.ttf:japanese/monafonts-ttf +MONA_DESC= mona.ttf from japanese/font-mona-ttf +MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/mona.ttf:japanese/font-mona-ttf SAZANAMI_DESC= sazanami-gothic.ttf from japanese/font-sazanami SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/sazanami-gothic.ttf:japanese/font-sazanami @@ -59,13 +61,12 @@ TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra post-patch: @${GREP} -Flr 'utf8cpp/' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.utf8cpp -e 's,utf8cpp/,,' -# Default to TTF/ subdir where japanese/ fonts are often installed - @${GREP} -Flr '/usr/share' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ - -i .bak.paths \ - -e 's,/usr/share,${PREFIX}/share,' \ + @${REINPLACE_CMD} -e 's,/usr/share,${PREFIX}/share,' \ + ${WRKSRC}/src/platforms/gtk/gtk_rlvm_instance.cc + @${REINPLACE_CMD} -e 's,/usr/share,${LOCALBASE}/share,' \ -e 's,truetype/ttf-dejavu,dejavu,' \ - -e 's,truetype/mona,TrueType,' \ - -e 's,truetype/[^/"]*,TTF,' + -e 's,truetype/[^/"]*/,TTF/,' \ + ${WRKSRC}/src/utilities/find_font_file.cc pre-install-TEST-on: (cd ${WRKSRC} && build/${PORTNAME}_unittests)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609301548.u8UFmFtX012292>