Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2019 05:03:45 +0000 (UTC)
From:      Hiroki Sato <hrs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r521462 - head/japanese/font-ume
Message-ID:  <201912300503.xBU53jMF092138@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Dec 30 05:03:45 2019
New Revision: 521462
URL: https://svnweb.freebsd.org/changeset/ports/521462

Log:
  - Update to 0.0.670.
  - Use FONTPATHSPEC.
  - Use FONTSDIR consistently.

Modified:
  head/japanese/font-ume/Makefile
  head/japanese/font-ume/distinfo
  head/japanese/font-ume/pkg-plist

Modified: head/japanese/font-ume/Makefile
==============================================================================
--- head/japanese/font-ume/Makefile	Mon Dec 30 05:02:49 2019	(r521461)
+++ head/japanese/font-ume/Makefile	Mon Dec 30 05:03:45 2019	(r521462)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	ume
-PORTVERSION=	0.0.660
+PORTVERSION=	0.0.670
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	OSDN/${PORTNAME}-font/63494
+MASTER_SITES=	OSDN/${PORTNAME}-font/22212
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	umefont_${PORTVERSION:E}
 
@@ -14,28 +14,24 @@ LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/license.html
 
 USES=		fonts:fc tar:xz
-FONTNAME=	TTF
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-DATADIR=	${PREFIX}/share/font-${PORTNAME}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/*.ttf .
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${FILESDIR}/20-unhint-${PORTNAME}.conf \
-	    ${FILESDIR}/62-fonts-${PORTNAME}.conf \
+	${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \
+	    ${FILESDIR}/62-fonts-${FONTNAME}.conf \
 	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail
-	${LN} -s -f ../conf.avail/20-unhint-${PORTNAME}.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${PORTNAME}.conf
-	${LN} -s -f ../conf.avail/62-fonts-${PORTNAME}.conf \
-	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${PORTNAME}.conf
+	${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf
+	${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \
+	    ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf
 
 .include <bsd.port.mk>

Modified: head/japanese/font-ume/distinfo
==============================================================================
--- head/japanese/font-ume/distinfo	Mon Dec 30 05:02:49 2019	(r521461)
+++ head/japanese/font-ume/distinfo	Mon Dec 30 05:03:45 2019	(r521462)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483100776
-SHA256 (umefont_660.tar.xz) = 272d0f533417130ab32ece69efae1a1edeab3b21d2a1638a159e19b4cbaf1b30
-SIZE (umefont_660.tar.xz) = 5284680
+TIMESTAMP = 1577677387
+SHA256 (umefont_670.tar.xz) = c18513cb859995576896fed5462925194d79b9731ea52c60fe2622ee135a46a5
+SIZE (umefont_670.tar.xz) = 6900112

Modified: head/japanese/font-ume/pkg-plist
==============================================================================
--- head/japanese/font-ume/pkg-plist	Mon Dec 30 05:02:49 2019	(r521461)
+++ head/japanese/font-ume/pkg-plist	Mon Dec 30 05:03:45 2019	(r521462)
@@ -1,27 +1,5 @@
-%%DATADIR%%/ume-hgo4.ttf
-%%DATADIR%%/ume-pgc4.ttf
-%%DATADIR%%/ume-pgc5.ttf
-%%DATADIR%%/ume-pgo4.ttf
-%%DATADIR%%/ume-pgo5.ttf
-%%DATADIR%%/ume-pgs4.ttf
-%%DATADIR%%/ume-pgs5.ttf
-%%DATADIR%%/ume-pmo3.ttf
-%%DATADIR%%/ume-pms3.ttf
-%%DATADIR%%/ume-tgc4.ttf
-%%DATADIR%%/ume-tgc5.ttf
-%%DATADIR%%/ume-tgo4.ttf
-%%DATADIR%%/ume-tgo5.ttf
-%%DATADIR%%/ume-tgs4.ttf
-%%DATADIR%%/ume-tgs5.ttf
-%%DATADIR%%/ume-tmo3.ttf
-%%DATADIR%%/ume-tms3.ttf
-%%DATADIR%%/ume-ugo4.ttf
-%%DATADIR%%/ume-ugo5.ttf
-etc/fonts/conf.avail/20-unhint-ume.conf
-etc/fonts/conf.avail/62-fonts-ume.conf
-etc/fonts/conf.d/20-unhint-ume.conf
-etc/fonts/conf.d/62-fonts-ume.conf
 %%FONTSDIR%%/ume-hgo4.ttf
+%%FONTSDIR%%/ume-hgo5.ttf
 %%FONTSDIR%%/ume-pgc4.ttf
 %%FONTSDIR%%/ume-pgc5.ttf
 %%FONTSDIR%%/ume-pgo4.ttf
@@ -40,3 +18,7 @@ etc/fonts/conf.d/62-fonts-ume.conf
 %%FONTSDIR%%/ume-tms3.ttf
 %%FONTSDIR%%/ume-ugo4.ttf
 %%FONTSDIR%%/ume-ugo5.ttf
+etc/fonts/conf.avail/20-unhint-ume.conf
+etc/fonts/conf.avail/62-fonts-ume.conf
+etc/fonts/conf.d/20-unhint-ume.conf
+etc/fonts/conf.d/62-fonts-ume.conf



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