Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2019 04:37:19 +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: r521440 - head/japanese/font-ipamjm
Message-ID:  <201912300437.xBU4bJxH072300@repo.freebsd.org>

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

Log:
  - Update to 00601.
  - Use FONTPATHSPEC.
  - Add LICENSE.
  - Update MASTER_SITES.
  - Use FONTSDIR consistently.

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

Modified: head/japanese/font-ipamjm/Makefile
==============================================================================
--- head/japanese/font-ipamjm/Makefile	Mon Dec 30 04:35:34 2019	(r521439)
+++ head/japanese/font-ipamjm/Makefile	Mon Dec 30 04:37:19 2019	(r521440)
@@ -1,53 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	ipamjm
-PORTVERSION=	00301
-PORTREVISION=	2
+PORTVERSION=	00601
 CATEGORIES=	japanese x11-fonts
-MASTER_SITES=	http://dl.mojikiban.ipa.go.jp/IPAmjMincho/
+MASTER_SITES=	https://mojikiban.ipa.go.jp/OSCDL/IPAmjMincho/
 PKGNAMEPREFIX=	ja-font-
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	IPAmj Mincho Japanese fonts
 
-BROKEN=		unfetchable
-
-LICENSE=	IPAFLAv1
+LICENSE=	IPAFONTLICv1.0
 LICENSE_NAME=	IPA Font License Agreement v1.0
 LICENSE_FILE=	${WRKSRC}/IPA_Font_License_Agreement_v1.0.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		fonts:fc zip
-FONTNAME=	OTF
+FONTPATHSPEC=	${FONTNAME}:pri=60
 NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-install
 SUB_FILES=	pkg-install
-DATADIR=	${PREFIX}/share/font-${PORTNAME}
-PORTDOCS=	Readme_${PORTNAME}003.01.txt
+PORTDOCS=	Readme.txt
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/ipamjm.ttf ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && ${LN} -s -f \
-	    ../../../${DATADIR_REL}/ipamjm.ttf .
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ipamjm.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} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/japanese/font-ipamjm/distinfo
==============================================================================
--- head/japanese/font-ipamjm/distinfo	Mon Dec 30 04:35:34 2019	(r521439)
+++ head/japanese/font-ipamjm/distinfo	Mon Dec 30 04:37:19 2019	(r521440)
@@ -1,2 +1,3 @@
-SHA256 (ipamjm00301.zip) = 036929d12ea36dce50915b36a1a9c3f8983a87c585305eaac1888aaceba18d64
-SIZE (ipamjm00301.zip) = 31097786
+TIMESTAMP = 1577675236
+SHA256 (ipamjm00601.zip) = 35494e0f2896f38b3f7369a8421a895cea6440a42c0a66ac95eab47d6ed25b68
+SIZE (ipamjm00601.zip) = 31225985

Modified: head/japanese/font-ipamjm/pkg-plist
==============================================================================
--- head/japanese/font-ipamjm/pkg-plist	Mon Dec 30 04:35:34 2019	(r521439)
+++ head/japanese/font-ipamjm/pkg-plist	Mon Dec 30 04:37:19 2019	(r521440)
@@ -1,4 +1,3 @@
-%%DATADIR%%/ipamjm.ttf
 etc/fonts/conf.avail/20-unhint-ipamjm.conf
 etc/fonts/conf.avail/62-fonts-ipamjm.conf
 etc/fonts/conf.d/20-unhint-ipamjm.conf



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