Date: Wed, 20 Mar 2024 11:57:11 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 00191c7947e3 - main - japanese/sourcehansans-otf: Update to 2.001 Message-ID: <202403201157.42KBvBcK064289@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=00191c7947e39104f6fef2f3abf7bdf2f6339b5f commit 00191c7947e39104f6fef2f3abf7bdf2f6339b5f Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2024-03-20 10:36:37 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> CommitDate: 2024-03-20 11:56:41 +0000 japanese/sourcehansans-otf: Update to 2.001 - Convert japanese/sourcehansans-otf as the master port. - Convert the following ports as the slave ports: chinese/sourcehansans-sc-otf chinese/sourcehansans-tc-otf korean/sourcehansans-otf PR: 237291 Reported by: Hyun Hwang <hyun@caffeinated.codes> --- chinese/sourcehansans-sc-otf/Makefile | 36 ++-------------------- chinese/sourcehansans-sc-otf/distinfo | 3 -- chinese/sourcehansans-sc-otf/files/pkg-message.in | 7 ----- chinese/sourcehansans-tc-otf/Makefile | 36 ++-------------------- chinese/sourcehansans-tc-otf/distinfo | 3 -- chinese/sourcehansans-tc-otf/files/pkg-message.in | 7 ----- japanese/sourcehansans-otf/Makefile | 26 ++++++++++------ japanese/sourcehansans-otf/distinfo | 6 ++-- korean/sourcehansans-otf/Makefile | 37 ++--------------------- korean/sourcehansans-otf/distinfo | 3 -- korean/sourcehansans-otf/files/pkg-message.in | 7 ----- 11 files changed, 28 insertions(+), 143 deletions(-) diff --git a/chinese/sourcehansans-sc-otf/Makefile b/chinese/sourcehansans-sc-otf/Makefile index 0cce5de59d6d..3217d8a9b547 100644 --- a/chinese/sourcehansans-sc-otf/Makefile +++ b/chinese/sourcehansans-sc-otf/Makefile @@ -1,48 +1,18 @@ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R CATEGORIES= chinese x11-fonts PKGNAMESUFFIX= -sc-otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; # actual prefixing is done by the `chinese' category itself. #PKGNAMEPREFIX= zh- -MAINTAINER= hyun@caffeinated.codes COMMENT= Simplified Chinese font by Adobe designed for user interfaces -WWW= https://github.com/adobe-fonts/source-han-sans -LICENSE= OFL11 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USES= fonts -USE_GITHUB= yes -GH_ACCOUNT= adobe-fonts -GH_PROJECT= source-han-sans - -NO_ARCH= yes -NO_BUILD= yes -SUB_FILES= pkg-message - -OPTIONS_DEFINE= HW -OPTIONS_SINGLE= TYPE -OPTIONS_SINGLE_TYPE= FULL SUBSET -OPTIONS_DEFAULT= FULL -OPTIONS_SUB= yes - -HW_DESC= Install the half-width font in addition to the full font -FULL_DESC= Install the full font (can display all CJK) SUBSET_DESC= Install the subset font (can display SC only) -SUBSET_PREVENTS= HW -SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font FULL_VARS= FONTNAME=SourceHanSansSC SRCFONTSDIR=OTF/SimplifiedChinese SUBSET_VARS= FONTNAME=SourceHanSansCN SRCFONTSDIR=SubsetOTF/CN -do-install: - @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR} +SHS_HW_LANG= SimplifiedChinese -post-install-HW-on: - ${INSTALL_DATA} ${WRKSRC}/OTF/SimplifiedChineseHW/*.otf ${STAGEDIR}${FONTSDIR} +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/chinese/sourcehansans-sc-otf/distinfo b/chinese/sourcehansans-sc-otf/distinfo deleted file mode 100644 index 4a60feacb6f4..000000000000 --- a/chinese/sourcehansans-sc-otf/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1543452538 -SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8 -SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207 diff --git a/chinese/sourcehansans-sc-otf/files/pkg-message.in b/chinese/sourcehansans-sc-otf/files/pkg-message.in index 153f61da885a..0f30336c6adc 100644 --- a/chinese/sourcehansans-sc-otf/files/pkg-message.in +++ b/chinese/sourcehansans-sc-otf/files/pkg-message.in @@ -1,11 +1,4 @@ [ { type: install - message: <<EOM -You can start using the font by following this instruction: - -Add the following line to the "Files" section of your X.org configuration file: - - FontPath "%%FONTSDIR%%/" -EOM } ] diff --git a/chinese/sourcehansans-tc-otf/Makefile b/chinese/sourcehansans-tc-otf/Makefile index 5d783919ae88..9b77c1c11cf5 100644 --- a/chinese/sourcehansans-tc-otf/Makefile +++ b/chinese/sourcehansans-tc-otf/Makefile @@ -1,48 +1,18 @@ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R CATEGORIES= chinese x11-fonts PKGNAMESUFFIX= -tc-otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; # actual prefixing is done by the `chinese' category itself. #PKGNAMEPREFIX= zh- -MAINTAINER= hyun@caffeinated.codes COMMENT= Traditional Chinese font by Adobe designed for user interfaces -WWW= https://github.com/adobe-fonts/source-han-sans -LICENSE= OFL11 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USES= fonts -USE_GITHUB= yes -GH_ACCOUNT= adobe-fonts -GH_PROJECT= source-han-sans - -NO_ARCH= yes -NO_BUILD= yes -SUB_FILES= pkg-message - -OPTIONS_DEFINE= HW -OPTIONS_SINGLE= TYPE -OPTIONS_SINGLE_TYPE= FULL SUBSET -OPTIONS_DEFAULT= FULL -OPTIONS_SUB= yes - -HW_DESC= Install the half-width font in addition to the full font -FULL_DESC= Install the full font (can display all CJK) SUBSET_DESC= Install the subset font (can display TC only) -SUBSET_PREVENTS= HW -SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font FULL_VARS= FONTNAME=SourceHanSansTC SRCFONTSDIR=OTF/TraditionalChinese SUBSET_VARS= FONTNAME=SourceHanSansTW SRCFONTSDIR=SubsetOTF/TW -do-install: - @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR} +SHS_HW_LANG= TraditionalChinese -post-install-HW-on: - ${INSTALL_DATA} ${WRKSRC}/OTF/TraditionalChineseHW/*.otf ${STAGEDIR}${FONTSDIR} +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/chinese/sourcehansans-tc-otf/distinfo b/chinese/sourcehansans-tc-otf/distinfo deleted file mode 100644 index f94135bd5cdd..000000000000 --- a/chinese/sourcehansans-tc-otf/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1543452799 -SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8 -SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207 diff --git a/chinese/sourcehansans-tc-otf/files/pkg-message.in b/chinese/sourcehansans-tc-otf/files/pkg-message.in index 153f61da885a..0f30336c6adc 100644 --- a/chinese/sourcehansans-tc-otf/files/pkg-message.in +++ b/chinese/sourcehansans-tc-otf/files/pkg-message.in @@ -1,11 +1,4 @@ [ { type: install - message: <<EOM -You can start using the font by following this instruction: - -Add the following line to the "Files" section of your X.org configuration file: - - FontPath "%%FONTSDIR%%/" -EOM } ] diff --git a/japanese/sourcehansans-otf/Makefile b/japanese/sourcehansans-otf/Makefile index 58e91b6b56d1..e3a0c2c19e96 100644 --- a/japanese/sourcehansans-otf/Makefile +++ b/japanese/sourcehansans-otf/Makefile @@ -1,15 +1,15 @@ PORTNAME= sourcehansans -PORTVERSION= 2.000 +PORTVERSION= 2.001 DISTVERSIONSUFFIX= R -CATEGORIES= japanese x11-fonts -PKGNAMESUFFIX= -otf +CATEGORIES?= japanese x11-fonts +PKGNAMESUFFIX?= -otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; # actual prefixing is done by the `japanese' category itself. -#PKGNAMEPREFIX= ja- +#PKGNAMEPREFIX?= ja- MAINTAINER= hyun@caffeinated.codes -COMMENT= Japanese font by Adobe designed for user interfaces -WWW= https://github.com/adobe-fonts/source-han-sans +COMMENT?= Japanese font by Adobe designed for user interfaces +WWW= https://github.com/adobe-fonts/source-han-sans LICENSE= OFL11 LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -31,18 +31,24 @@ OPTIONS_SUB= yes HW_DESC= Install the half-width font in addition to the full font FULL_DESC= Install the full font (can display all CJK) -SUBSET_DESC= Install the subset font (can display Japanese only) +SUBSET_DESC?= Install the subset font (can display Japanese only) SUBSET_PREVENTS= HW SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font -FULL_VARS= FONTNAME=SourceHanSans SRCFONTSDIR=OTF/Japanese -SUBSET_VARS= FONTNAME=SourceHanSansJP SRCFONTSDIR=SubsetOTF/JP +FULL_VARS?= FONTNAME=SourceHanSans SRCFONTSDIR=OTF/Japanese +SUBSET_VARS?= FONTNAME=SourceHanSansJP SRCFONTSDIR=SubsetOTF/JP + +SHS_HW_LANG?= Japanese + +# These are to maintain correct pkg description and file list for slave ports +DESCR= ${.CURDIR}/pkg-descr +PLIST= ${.CURDIR}/pkg-plist do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR} post-install-HW-on: - ${INSTALL_DATA} ${WRKSRC}/OTF/JapaneseHW/*.otf ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/OTF/${SHS_HW_LANG}HW/*.otf ${STAGEDIR}${FONTSDIR} .include <bsd.port.mk> diff --git a/japanese/sourcehansans-otf/distinfo b/japanese/sourcehansans-otf/distinfo index e1a2d0c34143..978c5839cd50 100644 --- a/japanese/sourcehansans-otf/distinfo +++ b/japanese/sourcehansans-otf/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1543452172 -SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8 -SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207 +TIMESTAMP = 1555284203 +SHA256 (adobe-fonts-source-han-sans-2.001R_GH0.tar.gz) = 7c515573dd6784d9d2be564f50e0b9bbee4ad560a853ab87a25532b1d8a03582 +SIZE (adobe-fonts-source-han-sans-2.001R_GH0.tar.gz) = 2230965559 diff --git a/korean/sourcehansans-otf/Makefile b/korean/sourcehansans-otf/Makefile index 8c22ece6df5e..a762322ef1b8 100644 --- a/korean/sourcehansans-otf/Makefile +++ b/korean/sourcehansans-otf/Makefile @@ -1,48 +1,17 @@ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R CATEGORIES= korean x11-fonts -PKGNAMESUFFIX= -otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; # actual prefixing is done by the `korean' category itself. #PKGNAMEPREFIX= ko- -MAINTAINER= hyun@caffeinated.codes COMMENT= Korean font by Adobe designed for user interfaces -WWW= https://github.com/adobe-fonts/source-han-sans -LICENSE= OFL11 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt - -USES= fonts -USE_GITHUB= yes -GH_ACCOUNT= adobe-fonts -GH_PROJECT= source-han-sans - -NO_ARCH= yes -NO_BUILD= yes -SUB_FILES= pkg-message - -OPTIONS_DEFINE= HW -OPTIONS_SINGLE= TYPE -OPTIONS_SINGLE_TYPE= FULL SUBSET -OPTIONS_DEFAULT= FULL -OPTIONS_SUB= yes - -HW_DESC= Install the half-width font in addition to the full font -FULL_DESC= Install the full font (can display all CJK) SUBSET_DESC= Install the subset font (can display Korean only) -SUBSET_PREVENTS= HW -SUBSET_PREVENTS_MSG= Half-width can only be installed in addition to the full font FULL_VARS= FONTNAME=SourceHanSansK SRCFONTSDIR=OTF/Korean SUBSET_VARS= FONTNAME=SourceHanSansKR SRCFONTSDIR=SubsetOTF/KR -do-install: - @${MKDIR} ${STAGEDIR}${FONTSDIR} - ${INSTALL_DATA} ${WRKSRC}/${SRCFONTSDIR}/*.otf ${STAGEDIR}${FONTSDIR} +SHS_HW_LANG= Korean -post-install-HW-on: - ${INSTALL_DATA} ${WRKSRC}/OTF/KoreanHW/*.otf ${STAGEDIR}${FONTSDIR} +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/korean/sourcehansans-otf/distinfo b/korean/sourcehansans-otf/distinfo deleted file mode 100644 index 0899d4345168..000000000000 --- a/korean/sourcehansans-otf/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1543377352 -SHA256 (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 3c4dae5225605a90f115570d1c6a86eea8e6b04057297a5566f72f4e48ed0aa8 -SIZE (adobe-fonts-source-han-sans-2.000R_GH0.tar.gz) = 2093662207 diff --git a/korean/sourcehansans-otf/files/pkg-message.in b/korean/sourcehansans-otf/files/pkg-message.in index 153f61da885a..0f30336c6adc 100644 --- a/korean/sourcehansans-otf/files/pkg-message.in +++ b/korean/sourcehansans-otf/files/pkg-message.in @@ -1,11 +1,4 @@ [ { type: install - message: <<EOM -You can start using the font by following this instruction: - -Add the following line to the "Files" section of your X.org configuration file: - - FontPath "%%FONTSDIR%%/" -EOM } ]
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403201157.42KBvBcK064289>