Index: chinese/sourcehansans-sc-otf/Makefile =================================================================== --- chinese/sourcehansans-sc-otf/Makefile (revision 498909) +++ chinese/sourcehansans-sc-otf/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf + CATEGORIES= chinese x11-fonts PKGNAMESUFFIX= -sc-otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; @@ -9,41 +8,13 @@ # 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 -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} - -.include +.include "${MASTERDIR}/Makefile" Index: chinese/sourcehansans-sc-otf/distinfo =================================================================== --- chinese/sourcehansans-sc-otf/distinfo (revision 498909) +++ chinese/sourcehansans-sc-otf/distinfo (nonexistent) @@ -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 Property changes on: chinese/sourcehansans-sc-otf/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: chinese/sourcehansans-sc-otf/files/pkg-message.in =================================================================== --- chinese/sourcehansans-sc-otf/files/pkg-message.in (revision 498909) +++ chinese/sourcehansans-sc-otf/files/pkg-message.in (nonexistent) @@ -1,7 +0,0 @@ - -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%%/" - Property changes on: chinese/sourcehansans-sc-otf/files/pkg-message.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: chinese/sourcehansans-tc-otf/Makefile =================================================================== --- chinese/sourcehansans-tc-otf/Makefile (revision 498909) +++ chinese/sourcehansans-tc-otf/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf + CATEGORIES= chinese x11-fonts PKGNAMESUFFIX= -tc-otf # Note: the following PKGNAMEPREFIX is here only for self-documenting purpose; @@ -9,41 +8,13 @@ # 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 -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} - -.include +.include "${MASTERDIR}/Makefile" Index: chinese/sourcehansans-tc-otf/distinfo =================================================================== --- chinese/sourcehansans-tc-otf/distinfo (revision 498909) +++ chinese/sourcehansans-tc-otf/distinfo (nonexistent) @@ -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 Property changes on: chinese/sourcehansans-tc-otf/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: chinese/sourcehansans-tc-otf/files/pkg-message.in =================================================================== --- chinese/sourcehansans-tc-otf/files/pkg-message.in (revision 498909) +++ chinese/sourcehansans-tc-otf/files/pkg-message.in (nonexistent) @@ -1,7 +0,0 @@ - -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%%/" - Property changes on: chinese/sourcehansans-tc-otf/files/pkg-message.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: japanese/sourcehansans-otf/Makefile =================================================================== --- japanese/sourcehansans-otf/Makefile (revision 498909) +++ japanese/sourcehansans-otf/Makefile (working copy) @@ -1,16 +1,16 @@ # $FreeBSD$ 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 +COMMENT?= Japanese font by Adobe designed for user interfaces LICENSE= OFL11 LICENSE_FILE= ${WRKSRC}/LICENSE.txt @@ -32,18 +32,24 @@ 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 Index: japanese/sourcehansans-otf/distinfo =================================================================== --- japanese/sourcehansans-otf/distinfo (revision 498909) +++ japanese/sourcehansans-otf/distinfo (working copy) @@ -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 Index: korean/sourcehansans-otf/Makefile =================================================================== --- korean/sourcehansans-otf/Makefile (revision 498909) +++ korean/sourcehansans-otf/Makefile (working copy) @@ -1,49 +1,19 @@ # $FreeBSD$ -PORTNAME= sourcehansans -PORTVERSION= 2.000 -DISTVERSIONSUFFIX= R +MASTERDIR= ${.CURDIR}/../../japanese/sourcehansans-otf + 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 -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} - -.include +.include "${MASTERDIR}/Makefile" Index: korean/sourcehansans-otf/distinfo =================================================================== --- korean/sourcehansans-otf/distinfo (revision 498909) +++ korean/sourcehansans-otf/distinfo (nonexistent) @@ -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 Property changes on: korean/sourcehansans-otf/distinfo ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: korean/sourcehansans-otf/files/pkg-message.in =================================================================== --- korean/sourcehansans-otf/files/pkg-message.in (revision 498909) +++ korean/sourcehansans-otf/files/pkg-message.in (nonexistent) @@ -1,7 +0,0 @@ - -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%%/" - Property changes on: korean/sourcehansans-otf/files/pkg-message.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property