Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2019 04:59:32 +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: r521458 - head/japanese/font-sazanami
Message-ID:  <201912300459.xBU4xWV5086072@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hrs
Date: Mon Dec 30 04:59:31 2019
New Revision: 521458
URL: https://svnweb.freebsd.org/changeset/ports/521458

Log:
  - Add LICENSE.
  - Use FONTPATHSPEC.
  - Use FONTSDIR consistently.

Modified:
  head/japanese/font-sazanami/Makefile
  head/japanese/font-sazanami/pkg-plist

Modified: head/japanese/font-sazanami/Makefile
==============================================================================
--- head/japanese/font-sazanami/Makefile	Mon Dec 30 04:58:41 2019	(r521457)
+++ head/japanese/font-sazanami/Makefile	Mon Dec 30 04:59:31 2019	(r521458)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sazanami
 PORTVERSION=	20040629
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	OSDN/efont/10087
 PKGNAMEPREFIX=	ja-font-
@@ -10,36 +10,35 @@ PKGNAMEPREFIX=	ja-font-
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Sazanami Japanese TrueType fonts
 
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/README
+
 USES=		fonts:fc tar:bzip2
-FONTNAME=	TTF
+FONTPATHSPEC=	${FONTNAME}:unscaled: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}
 PORTDOCS=	README doc
 
 OPTIONS_DEFINE=	DOCS
 
 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
 
 post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/japanese/font-sazanami/pkg-plist
==============================================================================
--- head/japanese/font-sazanami/pkg-plist	Mon Dec 30 04:58:41 2019	(r521457)
+++ head/japanese/font-sazanami/pkg-plist	Mon Dec 30 04:59:31 2019	(r521458)
@@ -1,8 +1,6 @@
-%%DATADIR%%/sazanami-mincho.ttf
-%%DATADIR%%/sazanami-gothic.ttf
+%%FONTSDIR%%/sazanami-mincho.ttf
+%%FONTSDIR%%/sazanami-gothic.ttf
 etc/fonts/conf.avail/20-unhint-sazanami.conf
 etc/fonts/conf.avail/62-fonts-sazanami.conf
 etc/fonts/conf.d/20-unhint-sazanami.conf
 etc/fonts/conf.d/62-fonts-sazanami.conf
-%%FONTSDIR%%/sazanami-mincho.ttf
-%%FONTSDIR%%/sazanami-gothic.ttf



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