Date: Fri, 11 Feb 2022 17:33:30 GMT From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 834be35d6c80 - main - korean/nanumfonts: Fix package name collisions Message-ID: <202202111733.21BHXUTG087775@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=834be35d6c8056194d1db566dddcea5df2597926 commit 834be35d6c8056194d1db566dddcea5df2597926 Author: Jung-uk Kim <jkim@FreeBSD.org> AuthorDate: 2022-02-11 17:31:03 +0000 Commit: Jung-uk Kim <jkim@FreeBSD.org> CommitDate: 2022-02-11 17:31:03 +0000 korean/nanumfonts: Fix package name collisions Reported by: antoine --- korean/nanum-barun-gothic/Makefile | 4 ++-- korean/nanum-barun-pen/Makefile | 4 ++-- korean/nanum-brush/Makefile | 4 ++-- korean/nanum-gothic-eco/Makefile | 4 ++-- korean/nanum-gothic/Makefile | 4 ++-- korean/nanum-myeongjo-eco/Makefile | 4 ++-- korean/nanum-myeongjo/Makefile | 4 ++-- korean/nanum-pen/Makefile | 4 ++-- korean/nanum-square-round/Makefile | 4 ++-- korean/nanum-square/Makefile | 4 ++-- korean/nanumfonts/Makefile.common | 11 ++++++----- 11 files changed, 26 insertions(+), 25 deletions(-) diff --git a/korean/nanum-barun-gothic/Makefile b/korean/nanum-barun-gothic/Makefile index 86e2da4ceb23..b008a3408201 100644 --- a/korean/nanum-barun-gothic/Makefile +++ b/korean/nanum-barun-gothic/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -barun-gothic -FONTDESC= NanumBarunGothic +NANUM_FONTDESC= NanumBarunGothic +NANUM_FONTNAME= barun-gothic .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-barun-pen/Makefile b/korean/nanum-barun-pen/Makefile index 78156f165630..aeaec6082a89 100644 --- a/korean/nanum-barun-pen/Makefile +++ b/korean/nanum-barun-pen/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -barun-pen -FONTDESC= NanumBarunpen +NANUM_FONTDESC= NanumBarunpen +NANUM_FONTNAME= barun-pen .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-brush/Makefile b/korean/nanum-brush/Makefile index ade4e7ea6dfa..b5742f90c504 100644 --- a/korean/nanum-brush/Makefile +++ b/korean/nanum-brush/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -brush -FONTDESC= NanumBrush +NANUM_FONTDESC= NanumBrush +NANUM_FONTNAME= brush .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-gothic-eco/Makefile b/korean/nanum-gothic-eco/Makefile index 2359bee264a9..c45e0559c43b 100644 --- a/korean/nanum-gothic-eco/Makefile +++ b/korean/nanum-gothic-eco/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -gothic-eco -FONTDESC= NanumGothicEco +NANUM_FONTDESC= NanumGothicEco +NANUM_FONTNAME= gothic-eco .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-gothic/Makefile b/korean/nanum-gothic/Makefile index 1db5d51b77f2..63c8c129f080 100644 --- a/korean/nanum-gothic/Makefile +++ b/korean/nanum-gothic/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -gothic -FONTDESC= NanumGothic +NANUM_FONTDESC= NanumGothic +NANUM_FONTNAME= gothic .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-myeongjo-eco/Makefile b/korean/nanum-myeongjo-eco/Makefile index 72e2926980ca..856c69936104 100644 --- a/korean/nanum-myeongjo-eco/Makefile +++ b/korean/nanum-myeongjo-eco/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -myeongjo-eco -FONTDESC= NanumMyeongjoEco +NANUM_FONTDESC= NanumMyeongjoEco +NANUM_FONTNAME= myeongjo-eco .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-myeongjo/Makefile b/korean/nanum-myeongjo/Makefile index 219d899395ab..8ca511b43186 100644 --- a/korean/nanum-myeongjo/Makefile +++ b/korean/nanum-myeongjo/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -myeongjo -FONTDESC= NanumMyeongjo +NANUM_FONTDESC= NanumMyeongjo +NANUM_FONTNAME= myeongjo .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-pen/Makefile b/korean/nanum-pen/Makefile index ba283a110043..5ef377451275 100644 --- a/korean/nanum-pen/Makefile +++ b/korean/nanum-pen/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -pen -FONTDESC= NanumPen +NANUM_FONTDESC= NanumPen +NANUM_FONTNAME= pen .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-square-round/Makefile b/korean/nanum-square-round/Makefile index 5a959bd13f52..20e88ede1095 100644 --- a/korean/nanum-square-round/Makefile +++ b/korean/nanum-square-round/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -square-round -FONTDESC= NanumSquareRound +NANUM_FONTDESC= NanumSquareRound +NANUM_FONTNAME= square-round .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanum-square/Makefile b/korean/nanum-square/Makefile index b791e4bf7280..269526bde0bb 100644 --- a/korean/nanum-square/Makefile +++ b/korean/nanum-square/Makefile @@ -1,4 +1,4 @@ -PKGNAMESUFFIX= -square -FONTDESC= NanumSquare +NANUM_FONTDESC= NanumSquare +NANUM_FONTNAME= square .include "${.CURDIR}/../../korean/nanumfonts/Makefile.common" diff --git a/korean/nanumfonts/Makefile.common b/korean/nanumfonts/Makefile.common index 30205cfeec60..a2ba43c65be9 100644 --- a/korean/nanumfonts/Makefile.common +++ b/korean/nanumfonts/Makefile.common @@ -3,18 +3,19 @@ DISTVERSION?= 20220210 CATEGORIES= korean x11-fonts MASTER_SITES= https://hangeul.naver.com/hangeul_static/webfont/zips/ \ LOCAL/jkim +PKGNAMESUFFIX= -${NANUM_FONTNAME} DISTNAME?= ${PORTNAME}${PKGNAMESUFFIX} DIST_SUBDIR= ${PORTNAME}/${DISTVERSION} -COMMENT= ${FONTDESC} Hangul fonts (${WEBFONT:tu}) MAINTAINER= jkim@FreeBSD.org +COMMENT= ${NANUM_FONTDESC} Hangul fonts (${FLAVOR:tu}) LICENSE= OFL11 LICENSE_FILE= ${FILESDIR}/LICENSE -#FLAVORS= otf ttf -#FLAVOR?= ${FLAVORS:[2]} -WEBFONT= ttf +FLAVORS= otf ttf +FLAVOR?= ${FLAVORS:[2]} +otf_PKGNAMESUFFIX= -${NANUM_FONTNAME}-${FLAVOR} DESCR= ${.CURDIR}/../../korean/nanumfonts/pkg-descr FILESDIR= ${.CURDIR}/../../korean/nanumfonts/files @@ -24,7 +25,7 @@ USES= fonts zip do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/*.${WEBFONT} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.${FLAVOR} ${STAGEDIR}${FONTSDIR} @${FIND} ${STAGEDIR}${FONTSDIR} -not -type d | ${SORT} | \ ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202111733.21BHXUTG087775>