Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2019 04:51:16 +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: r521451 - in head/japanese/font-mona-ttf: . files
Message-ID:  <201912300451.xBU4pGxr084788@repo.freebsd.org>

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

Log:
  - Add LICENSE.
  - Use FONTPATHSPEC.
  - Remove pkg-install to modify fonts.dir.
  - Use FONTSDIR consistently.

Deleted:
  head/japanese/font-mona-ttf/files/pkg-install.in
Modified:
  head/japanese/font-mona-ttf/Makefile

Modified: head/japanese/font-mona-ttf/Makefile
==============================================================================
--- head/japanese/font-mona-ttf/Makefile	Mon Dec 30 04:49:27 2019	(r521450)
+++ head/japanese/font-mona-ttf/Makefile	Mon Dec 30 04:51:16 2019	(r521451)
@@ -3,6 +3,7 @@
 
 PORTNAME=	mona
 PORTVERSION=	2.90
+PORTREVISION=	1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	SF/monafont/monafont/monafont-${PORTVERSION}
 PKGNAMEPREFIX=	ja-font-
@@ -12,27 +13,20 @@ DISTNAME=	monafont-ttf-${PORTVERSION}
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	TrueType Kanji fonts
 
+LICENSE=	PD
+
 USES=		fonts:fc zip
-FONTNAME=	TTF
+FONTPATHSPEC=	${FONTNAME}:pri=60
+FONTNAME=	${PORTNAME}${PKGNAMESUFFIX}
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
-SUB_FILES=	pkg-install
-SUB_LIST=	DIRFILE="${DATADIR}/fonts.dir"
-PKGINSTALL=	${WRKDIR}/pkg-install
-PKGDEINSTALL=	${WRKDIR}/pkg-install
-MAKE_ENV=	FONTSDIR=${FONTSDIR:S,${PREFIX},,}
-PLIST_FILES=	%%DATADIR%%/fonts.dir \
-		%%DATADIR%%/mona.ttf \
-		%%FONTSDIR%%/mona.ttf
+PLIST_FILES=	${FONTSDIR:S,${PREFIX}/,,}/fonts.dir \
+		${FONTSDIR:S,${PREFIX}/,,}/mona.ttf
 
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/mona.ttf ${FILESDIR}/fonts.dir \
-	    ${STAGEDIR}${DATADIR}
-
 	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${STAGEDIR}${FONTSDIR} && \
-	    ${LN} -s ../../../${DATADIR_REL}/*.ttf .
+	${INSTALL_DATA} ${WRKSRC}/mona.ttf ${FILESDIR}/fonts.dir \
+	    ${STAGEDIR}${FONTSDIR}
 
 .include <bsd.port.mk>



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