Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 31 Jan 2015 16:48:41 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378220 - in head/japanese/font-ricty: . files
Message-ID:  <201501311648.t0VGmfwY072625@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: jbeich
Date: Sat Jan 31 16:48:41 2015
New Revision: 378220
URL: https://svnweb.freebsd.org/changeset/ports/378220
QAT: https://qat.redports.org/buildarchive/r378220/

Log:
  - Update to 3.2.4 [1]
  - Drop @dirrm* from pkg-plist [1]
  - Drop redundant post-install [2]
  - Only remove fonts.dir lines belonging to the port [2]
  - Avoid writing under ~/.config/fontforge during build [2]
  
  PR:		195845
  Differential Revision:	https://reviews.freebsd.org/D1745
  Submitted by:	Koichiro IWAO (maintainer) [1]
  Approved by:	Koichiro IWAO (maintainer) [2]
  Approved by:	bapt (mentor)

Modified:
  head/japanese/font-ricty/Makefile
  head/japanese/font-ricty/distinfo
  head/japanese/font-ricty/files/pkg-install.in
  head/japanese/font-ricty/pkg-plist

Modified: head/japanese/font-ricty/Makefile
==============================================================================
--- head/japanese/font-ricty/Makefile	Sat Jan 31 16:19:46 2015	(r378219)
+++ head/japanese/font-ricty/Makefile	Sat Jan 31 16:48:41 2015	(r378220)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ricty
-PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTVERSION=	3.2.4
 CATEGORIES=	japanese x11-fonts
 PKGNAMEPREFIX=	ja-font-
 
@@ -18,9 +17,8 @@ BUILD_DEPENDS=	${LOCALBASE}/${X_FONTSDIR
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	yascentur
-GH_COMMIT=	${GH_TAGNAME}
 GH_PROJECT=	Ricty
-GH_TAGNAME=	0fd7047
+GH_COMMIT=	c22daa9
 
 NO_PACKAGE=	redistribution is not allowed
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -55,7 +53,7 @@ RUN_DEPENDS+=	${DATADIR}/RictyDiscord-Re
 .endif
 
 do-build:
-	cd ${WRKSRC} &&\
+	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
 		${SH} ${WRKSRC}/ricty_generator.sh \
 			${PREFIX}/${X_FONTSDIR}/OTF/Inconsolata.otf \
 			${PREFIX}/${X_FONTSDIR}/TTF/migu-1m-regular.ttf \
@@ -99,8 +97,4 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${X_FONTSDIR}/TTF
-	${SETENV} PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
 .include <bsd.port.mk>

Modified: head/japanese/font-ricty/distinfo
==============================================================================
--- head/japanese/font-ricty/distinfo	Sat Jan 31 16:19:46 2015	(r378219)
+++ head/japanese/font-ricty/distinfo	Sat Jan 31 16:48:41 2015	(r378220)
@@ -1,2 +1,2 @@
-SHA256 (ricty-3.2.3.tar.gz) = cd51e941c59a13a5b42302e5b135db7fead06ddf69ca700453bf16a4eeadb95d
-SIZE (ricty-3.2.3.tar.gz) = 14708
+SHA256 (ricty-3.2.4.tar.gz) = c226ace2933bdf15b31318298486c494e0e53f422b91feb09ae5ec56d51ed9b4
+SIZE (ricty-3.2.4.tar.gz) = 256833

Modified: head/japanese/font-ricty/files/pkg-install.in
==============================================================================
--- head/japanese/font-ricty/files/pkg-install.in	Sat Jan 31 16:19:46 2015	(r378219)
+++ head/japanese/font-ricty/files/pkg-install.in	Sat Jan 31 16:48:41 2015	(r378220)
@@ -7,7 +7,8 @@ catfontsdir ()
     while read _IN
     do
       case "${_IN}" in
-      *-Ricty*) ;;
+%%RICTY%%   *-Ricty-*) ;;
+%%DISCORD%% *-Ricty\ Discord-*) ;;
       *)       echo ${_IN} ;;
       esac
     done

Modified: head/japanese/font-ricty/pkg-plist
==============================================================================
--- head/japanese/font-ricty/pkg-plist	Sat Jan 31 16:19:46 2015	(r378219)
+++ head/japanese/font-ricty/pkg-plist	Sat Jan 31 16:48:41 2015	(r378220)
@@ -2,13 +2,10 @@
 %%RICTY%%%%DATADIR%%/Ricty-Regular.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Bold.ttf
 %%DISCORD%%%%DATADIR%%/RictyDiscord-Regular.ttf
-@dirrm %%DATADIR%%
 %%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Bold.ttf
 %%RICTY%%%%LOCAL_FONTSDIR%%/TTF/Ricty-Regular.ttf
 %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
 %%DISCORD%%%%LOCAL_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
-@dirrmtry %%LOCAL_FONTSDIR%%/TTF
-@dirrmtry %%LOCAL_FONTSDIR%%
 %%RICTY%%etc/fonts/conf.avail/20-unhint-ricty.conf
 %%RICTY%%etc/fonts/conf.avail/62-fonts-ricty.conf
 %%RICTY%%etc/fonts/conf.d/20-unhint-ricty.conf
@@ -22,4 +19,3 @@
 %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Bold.ttf
 %%DISCORD%%%%X_FONTSDIR%%/TTF/RictyDiscord-Regular.ttf
 @fc %%X_FONTSDIR%%/TTF
-@dirrmtry %%X_FONTSDIR%%/TTF

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501311648.t0VGmfwY072625>