From nobody Fri Feb 11 17:33:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id CC28E19ABD8C; Fri, 11 Feb 2022 17:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JwLLf5Mgfz4qm9; Fri, 11 Feb 2022 17:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644600810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVBR4kYqUCOCJlfIbmYv2BHn288ebrHgSoBzn7KElAs=; b=GCBW6j1Uxdgk99hsOE9MBNgaULSHnRjDDXcjEopSU8nVNRZYYnchRuMiukB04HHqOIWwHn Ug/88Uw9TMVTf8tVDLTLE//9nkmxKf+a3XvxFGsPep9CKJWtAaVL8FNtubuk7t6GYPAR+1 ABOtZBm4TxDsieu29BZQiQL5057b6k9k/wMZrC0ipZaTMvJG6T8KqwDUbroPY/gXCYcBBk GPbaFkzPTUt2WhagbDnBSU2+6eD/bqj6MYnhfVEnG02hI+7HdTH23dDj7ZtCdFdQtrMJnv cbYRF2nfYSZkPHayodMPwRol5HMgUW5uS+13CH+1jwasRoGuG17agHej/SOBMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98792185F5; Fri, 11 Feb 2022 17:33:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21BHXUi4087776; Fri, 11 Feb 2022 17:33:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BHXUTG087775; Fri, 11 Feb 2022 17:33:30 GMT (envelope-from git) Date: Fri, 11 Feb 2022 17:33:30 GMT Message-Id: <202202111733.21BHXUTG087775@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jung-uk Kim Subject: git: 834be35d6c80 - main - korean/nanumfonts: Fix package name collisions List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 834be35d6c8056194d1db566dddcea5df2597926 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644600810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DVBR4kYqUCOCJlfIbmYv2BHn288ebrHgSoBzn7KElAs=; b=WDMDurmk1nl2F4VXi/25ZjJWJWnkefQ08zNKxDzhGjNRwQU12Phu266V5N15pRas2prAbo VS/1BSsJ95r5gdSRI10lcELJlIaWYca99QAISbTA9868loOsWgLYV9zUjBduYfGCGHfEfZ TlxpcMzxd71fLqJF1Xh9JbvdxundN9Q8GEu2CUA99zDiuEiFI5SneJncFUePgJcQ/ehYJz kkuWOGzn+2hI0RBpUIoHfI+zEUocXIXkRVTWQUnzOjBMWPU1qGR+tIJhRv5KgMgV14Zua/ HcyLsJToCzMSYsHWU3aDAS3D4pMHgk+5Y5EBmmoUKn7bDJUxhbi9duNJMRHHwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644600810; a=rsa-sha256; cv=none; b=l44GNVQH5PJ6RUyM5bTc+WVQbjOOMavE7JmdEUjy3OlOkpcRGCYH5CAM/h30cLVHeFRO+D mRXh4rfK0gAOKJlKZcC0aKu8qluyRFIP81QghwmJwrAqslAhaYg7zWyUgEMNh3mFOWFFse DAi558zaTRSDJdOjeXSJ5GqUCcYzMQ/H5a0ZuJvCfyZxbiGdPVow7nGZMurK21OgZsuLsp 67N4aKWnBePgMnYGyXVEh6Us5uk99+FwuWZdVBh90t98n+2Kx3KNk6cgLldOIEY1N73xuJ U9iSEDPF/0wNdrj7WvAtkxNQo5yho0GRR4oUMwC48Ap7WOtZ/L6aiGLXnGqoeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=834be35d6c8056194d1db566dddcea5df2597926 commit 834be35d6c8056194d1db566dddcea5df2597926 Author: Jung-uk Kim AuthorDate: 2022-02-11 17:31:03 +0000 Commit: Jung-uk Kim 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}