From owner-svn-ports-all@freebsd.org Fri Sep 30 15:36:14 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 634C2C02FC6; Fri, 30 Sep 2016 15:36:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 27AB8D3B; Fri, 30 Sep 2016 15:36:14 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8UFaD6Q008104; Fri, 30 Sep 2016 15:36:13 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8UFaDkk008103; Fri, 30 Sep 2016 15:36:13 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201609301536.u8UFaDkk008103@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 30 Sep 2016 15:36:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422992 - head/devel/rlvm X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2016 15:36:14 -0000 Author: jbeich Date: Fri Sep 30 15:36:13 2016 New Revision: 422992 URL: https://svnweb.freebsd.org/changeset/ports/422992 Log: 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. Modified: head/devel/rlvm/Makefile (contents, props changed) Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Fri Sep 30 14:44:51 2016 (r422991) +++ head/devel/rlvm/Makefile Fri Sep 30 15:36:13 2016 (r422992) @@ -4,6 +4,7 @@ PORTNAME= rlvm DISTVERSIONPREFIX= release- DISTVERSION= 0.14-67 DISTVERSIONSUFFIX= -g9350209 +PORTREVISION= 1 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -39,15 +40,16 @@ EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS} EXTRA_PATCHES_FreeBSD_gcc= ${PATCHDIR}/extra-patch-gcc48 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 @@ -63,13 +65,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)