Date: Sat, 20 Aug 2022 05:59:32 GMT
From: Hajimu UMEMOTO <ume@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: d2d0838e8296 - main - japanese/font-hackgen{,-nf}: update to 2.7.0.
Message-ID: <202208200559.27K5xWCU008377@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=d2d0838e82966a5a3cf0480e0152e72491c0ae24 commit d2d0838e82966a5a3cf0480e0152e72491c0ae24 Author: Hajimu UMEMOTO <ume@FreeBSD.org> AuthorDate: 2022-08-20 05:58:00 +0000 Commit: Hajimu UMEMOTO <ume@FreeBSD.org> CommitDate: 2022-08-20 05:58:00 +0000 japanese/font-hackgen{,-nf}: update to 2.7.0. --- MOVED | 1 + japanese/Makefile | 2 +- japanese/font-hackgen-nerd/Makefile | 62 ------------ japanese/font-hackgen-nerd/distinfo | 3 - .../files/20-unhint-hackgen-nerd.conf | 35 ------- .../files/62-fonts-hackgen-nerd.conf | 17 ---- japanese/font-hackgen-nerd/files/pkg-install.in | 104 --------------------- japanese/font-hackgen-nerd/pkg-plist | 12 --- japanese/font-hackgen-nf/Makefile | 49 ++++++++++ japanese/font-hackgen-nf/distinfo | 3 + .../pkg-descr | 0 japanese/font-hackgen-nf/pkg-plist | 8 ++ japanese/font-hackgen/Makefile | 2 +- japanese/font-hackgen/distinfo | 6 +- 14 files changed, 66 insertions(+), 238 deletions(-) diff --git a/MOVED b/MOVED index 23c819368181..314f5270d9db 100644 --- a/MOVED +++ b/MOVED @@ -17540,3 +17540,4 @@ mail/roundcube-umich||2022-08-05|Removed, broken and no upstream updates games/exult|games/exult-devel|2022-08-06|Follow 1.9.x devel snapshots science/openkim|science/openkim-models|2022-08-07|Retire obsolete science/openkim, users should install science/openkim-models instead net/zeroconf-ioslave|net/kio-zeroconf|2022-08-18|Renamed upstream +japanese/font-hackgen-nerd|japanese/font-hackgen-nf|2022-08-20|Renamed upstream diff --git a/japanese/Makefile b/japanese/Makefile index 78dbade03e85..a12848d09389 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -69,7 +69,7 @@ SUBDIR += font-genjyuugothic SUBDIR += font-genshingothic SUBDIR += font-hackgen - SUBDIR += font-hackgen-nerd + SUBDIR += font-hackgen-nf SUBDIR += font-ipa SUBDIR += font-ipa-uigothic SUBDIR += font-ipaex diff --git a/japanese/font-hackgen-nerd/Makefile b/japanese/font-hackgen-nerd/Makefile deleted file mode 100644 index 7fb4624a8993..000000000000 --- a/japanese/font-hackgen-nerd/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -PORTNAME= hackgen-nerd -PORTVERSION= 2.6.3 -PORTREVISION= 0 -CATEGORIES= japanese x11-fonts -MASTER_SITES= https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/ -PKGNAMEPREFIX= ja-font- -DISTNAME= HackGenNerd_v${DISTVERSION} - -MAINTAINER= ume@FreeBSD.org -COMMENT= HackGenNerd is a composite font of Hack and GenJyuu-Gothic - -LICENSE= OFL11 - -USES= fonts:fc zip -FONTPATHSPEC= ${FONTNAME}:pri=60 -NO_ARCH= yes -NO_BUILD= yes -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-install -SUB_FILES= pkg-install -WRKSRC= ${WRKDIR}/${DISTNAME} - -OPTIONS_MULTI= FONT_FAMILY -OPTIONS_MULTI_FONT_FAMILY= HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS -OPTIONS_DEFAULT= HACKGENERD HACKGENERD_CONS HACKGEN35NERD HACKGEN35NERD_CONS -OPTIONS_SUB= yes -HACKGENERD_DESC= HackGenNerd -HACKGENERD_CONS_DESC= HackGenNerd Console -HACKGEN35NERD_DESC= HackGen35Nerd -HACKGEN35NERD_CONS_DESC= HackGen35Nerd Console - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MHACKGENERD} -HACKGEN_FONTS+= HackGenNerd-Regular HackGenNerd-Bold -.endif -.if ${PORT_OPTIONS:MHACKGENERD_CONS} -HACKGEN_FONTS+= HackGenNerdConsole-Regular HackGenNerdConsole-Bold -.endif -.if ${PORT_OPTIONS:MHACKGEN35NERD} -HACKGEN_FONTS+= HackGen35Nerd-Regular HackGen35Nerd-Bold -.endif -.if ${PORT_OPTIONS:MHACKGEN35NERD_CONS} -HACKGEN_FONTS+= HackGen35NerdConsole-Regular HackGen35NerdConsole-Bold -.endif - -do-install: - ${MKDIR} ${STAGEDIR}${FONTSDIR} -.for FONT in ${HACKGEN_FONTS} - ${INSTALL_DATA} ${WRKSRC}/${FONT}.ttf ${STAGEDIR}${FONTSDIR} -.endfor - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.d - ${INSTALL_DATA} ${FILESDIR}/20-unhint-${FONTNAME}.conf \ - ${FILESDIR}/62-fonts-${FONTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.avail - ${LN} -s -f ../conf.avail/20-unhint-${FONTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/20-unhint-${FONTNAME}.conf - ${LN} -s -f ../conf.avail/62-fonts-${FONTNAME}.conf \ - ${STAGEDIR}${PREFIX}/etc/fonts/conf.d/62-fonts-${FONTNAME}.conf - -.include <bsd.port.mk> diff --git a/japanese/font-hackgen-nerd/distinfo b/japanese/font-hackgen-nerd/distinfo deleted file mode 100644 index 777b81597b82..000000000000 --- a/japanese/font-hackgen-nerd/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1650988367 -SHA256 (HackGenNerd_v2.6.3.zip) = 3120f82ac2a7b742acd863425c080031d7cd8f5716403ea582adc4b5193bf691 -SIZE (HackGenNerd_v2.6.3.zip) = 44042691 diff --git a/japanese/font-hackgen-nerd/files/20-unhint-hackgen-nerd.conf b/japanese/font-hackgen-nerd/files/20-unhint-hackgen-nerd.conf deleted file mode 100644 index e20d9f657c78..000000000000 --- a/japanese/font-hackgen-nerd/files/20-unhint-hackgen-nerd.conf +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <match target="font"> - <or> - <test name="family"> - <string>HackGenNerd-Regular</string> - </test> - <test name="family"> - <string>HackGenNerd-Bold</string> - </test> - <test name="family"> - <string>HackGenNerdConsole-Regular</string> - </test> - <test name="family"> - <string>HackGenNerdConsole-Bold</string> - </test> - <test name="family"> - <string>HackGen35Nerd-Regular</string> - </test> - <test name="family"> - <string>HackGen35Nerd-Bold</string> - </test> - <test name="family"> - <string>HackGen35NerdConsole-Regular</string> - </test> - <test name="family"> - <string>HackGen35NerdConsole-Bold</string> - </test> - </or> - <edit name="autohint"> - <bool>false</bool> - </edit> - </match> -</fontconfig> diff --git a/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf b/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf deleted file mode 100644 index 42dc59291e3c..000000000000 --- a/japanese/font-hackgen-nerd/files/62-fonts-hackgen-nerd.conf +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<fontconfig> - <alias> - <family>monospace</family> - <prefer> - <family>HackGenNerd-Regular</family> - <family>HackGenNerd-Bold</family> - <family>HackGenNerdConsole-Regular</family> - <family>HackGenNerdConsole-Bold</family> - <family>HackGen35Nerd-Regular</family> - <family>HackGen35Nerd-Bold</family> - <family>HackGen35NerdConsole-Regular</family> - <family>HackGen35NerdConsole-Bold</family> - </prefer> - </alias> -</fontconfig> diff --git a/japanese/font-hackgen-nerd/files/pkg-install.in b/japanese/font-hackgen-nerd/files/pkg-install.in deleted file mode 100644 index 361b0b0c62c6..000000000000 --- a/japanese/font-hackgen-nerd/files/pkg-install.in +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -catfontsdir() -{ - while read _IN - do - case "${_IN}" in - *-misc-hackgen*nerd*-*|[0-9]*|"") ;; - *) echo ${_IN} ;; - esac - done -} - -ROMA="" -BOLD="ds=y" -RITA="ai=0.08" -ROBL="ai=0.08" - -make_xlfd() -{ - _enc=$1 - _file=$2 - _vendor=$3 - _fname=$4 - _poc=$5 - _weight=$6 - - case "${_poc}:${_enc}" in - p:jisx0201.1976-*) PFIX="bw=0.5" ;; - c:jisx0201.1976-*) PFIX="bw=0.5" ;; - p:*) PFIX="" ;; - c:*) PFIX="" ;; - esac - - set -- "" ${_weight}-r \ - ${RITA} ${_weight}-ri \ - ${ROBL} ${_weight}-ro - while [ $# != 0 ]; do - _prefix="${PFIX}:$1"; shift - _variant=$1; shift - [ ${index_type} = "scale" -a ${_prefix} != ":" ] && continue - printf "%s:%s -%s-%s-%s-normal--0-0-0-0-%s-0-%s\n" \ - $_prefix $_file $_vendor "$_fname" $_variant $_poc $_enc - done | sed -e 's,::,:,g' -e 's,^:,,' -} - -addentries() -{ - for ENC in iso8859-1 iso10646-1 jisx0201.1976-0 jisx0208.1983-0 jisx0208.1990-0 jisx0208.1997-0 jisx0213.2004-1 - do - make_xlfd $ENC HackGenNerd-Regular.ttf misc "hackgennerd" m medium - make_xlfd $ENC HackGenNerd-Bold.ttf misc "hackgennerd" m bold - make_xlfd $ENC HackGenNerdConsole-Regular.ttf misc "hackgennerdconsole" m medium - make_xlfd $ENC HackGenNerdConsole-Bold.ttf misc "hackgennerdconsole" m bold - make_xlfd $ENC HackGen35Nerd-Regular.ttf misc "hackgen35nerd" m medium - make_xlfd $ENC HackGen35Nerd-Bold.ttf misc "hackgen35nerd" m bold - make_xlfd $ENC HackGen35NerdConsole-Regular.ttf misc "hackgen35nerdconsole" m medium - make_xlfd $ENC HackgEn35NerdConsole-Bold.ttf misc "hackgen35nerdconsole" m bold - done -} - -nfonts() -{ - _L=0; while read _IN; do _L=$((${_L}+1)); done; echo ${_L} -} - -install_fontsdir() -{ - index_type=${1:-"dir"} - index="fonts.${index_type}" - tmpfile="${index}.tmp" - touch ${index} - (catfontsdir < ${index}; addentries ${index_type}) > ${tmpfile} - nfonts < ${tmpfile} > ${index} - cat ${tmpfile} >> ${index} - rm -f ${tmpfile} -} - -deinstall_fontsdir() -{ - index_type=${1:-"dir"} - index="fonts.${index_type}" - tmpfile="${index}.tmp" - catfontsdir < ${index} > ${tmpfile} - nfonts < ${tmpfile} > ${index} - cat ${tmpfile} >> ${index} - rm -f ${tmpfile} - if [ -r ${index} -a $(wc -l < ${index}) = 1 ]; then - rm -f ${index} - fi -} - -case "$2" in -POST-INSTALL) - cd %%FONTSDIR%% - install_fontsdir dir - install_fontsdir scale - ;; -POST-DEINSTALL) - cd %%FONTSDIR%% - deinstall_fontsdir dir - deinstall_fontsdir scale - ;; -esac diff --git a/japanese/font-hackgen-nerd/pkg-plist b/japanese/font-hackgen-nerd/pkg-plist deleted file mode 100644 index e4e69c211e0d..000000000000 --- a/japanese/font-hackgen-nerd/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -etc/fonts/conf.avail/20-unhint-hackgen-nerd.conf -etc/fonts/conf.avail/62-fonts-hackgen-nerd.conf -etc/fonts/conf.d/20-unhint-hackgen-nerd.conf -etc/fonts/conf.d/62-fonts-hackgen-nerd.conf -%%HACKGENERD%%%%FONTSDIR%%/HackGenNerd-Regular.ttf -%%HACKGENERD%%%%FONTSDIR%%/HackGenNerd-Bold.ttf -%%HACKGENERD_CONS%%%%FONTSDIR%%/HackGenNerdConsole-Regular.ttf -%%HACKGENERD_CONS%%%%FONTSDIR%%/HackGenNerdConsole-Bold.ttf -%%HACKGEN35NERD%%%%FONTSDIR%%/HackGen35Nerd-Regular.ttf -%%HACKGEN35NERD%%%%FONTSDIR%%/HackGen35Nerd-Bold.ttf -%%HACKGEN35NERD_CONS%%%%FONTSDIR%%/HackGen35NerdConsole-Regular.ttf -%%HACKGEN35NERD_CONS%%%%FONTSDIR%%/HackGen35NerdConsole-Bold.ttf diff --git a/japanese/font-hackgen-nf/Makefile b/japanese/font-hackgen-nf/Makefile new file mode 100644 index 000000000000..b648a0aebbae --- /dev/null +++ b/japanese/font-hackgen-nf/Makefile @@ -0,0 +1,49 @@ +PORTNAME= hackgen-nf +PORTVERSION= 2.7.0 +PORTREVISION= 0 +CATEGORIES= japanese x11-fonts +MASTER_SITES= https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/ +PKGNAMEPREFIX= ja-font- +DISTNAME= HackGen_NF_v${DISTVERSION} + +MAINTAINER= ume@FreeBSD.org +COMMENT= HackGen_NF is a composite font of Hack and GenJyuu-Gothic + +LICENSE= OFL11 + +USES= fonts:fc zip +NO_ARCH= yes +NO_BUILD= yes +WRKSRC= ${WRKDIR}/${DISTNAME} + +OPTIONS_MULTI= FONT_FAMILY +OPTIONS_MULTI_FONT_FAMILY= HACKGEN_NF HACKGEN_NFJ HACKGEN35_NF HACKGEN35_NFJ +OPTIONS_DEFAULT= HACKGEN_NF HACKGEN_NFJ HACKGEN35_NF HACKGEN35_NFJ +OPTIONS_SUB= yes +HACKGEN_NF_DESC= HackGenConsoleNF +HACKGEN_NFJ_DESC= HackGenConsoleNFJ +HACKGEN35_NF_DESC= HackGen35ConsoleNF +HACKGEN35_NFJ_DESC= HackGen35ConsoleNFJ + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MHACKGEN_NF} +HACKGEN_FONTS+= HackGenConsoleNF-Regular HackGenConsoleNF-Bold +.endif +.if ${PORT_OPTIONS:MHACKGEN_NFJ} +HACKGEN_FONTS+= HackGenConsoleNFJ-Regular HackGenConsoleNFJ-Bold +.endif +.if ${PORT_OPTIONS:MHACKGEN35_NF} +HACKGEN_FONTS+= HackGen35ConsoleNF-Regular HackGen35ConsoleNF-Bold +.endif +.if ${PORT_OPTIONS:MHACKGEN35_NFJ} +HACKGEN_FONTS+= HackGen35ConsoleNFJ-Regular HackGen35ConsoleNFJ-Bold +.endif + +do-install: + ${MKDIR} ${STAGEDIR}${FONTSDIR} +.for FONT in ${HACKGEN_FONTS} + ${INSTALL_DATA} ${WRKSRC}/${FONT}.ttf ${STAGEDIR}${FONTSDIR} +.endfor + +.include <bsd.port.mk> diff --git a/japanese/font-hackgen-nf/distinfo b/japanese/font-hackgen-nf/distinfo new file mode 100644 index 000000000000..b330ec92bbd8 --- /dev/null +++ b/japanese/font-hackgen-nf/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1660971356 +SHA256 (HackGen_NF_v2.7.0.zip) = 58f9b5b652ebbb0e07a2bae1d8ad1177848ec8b961519e4fecdb464524b73f7c +SIZE (HackGen_NF_v2.7.0.zip) = 44124034 diff --git a/japanese/font-hackgen-nerd/pkg-descr b/japanese/font-hackgen-nf/pkg-descr similarity index 100% rename from japanese/font-hackgen-nerd/pkg-descr rename to japanese/font-hackgen-nf/pkg-descr diff --git a/japanese/font-hackgen-nf/pkg-plist b/japanese/font-hackgen-nf/pkg-plist new file mode 100644 index 000000000000..ee780be2bfeb --- /dev/null +++ b/japanese/font-hackgen-nf/pkg-plist @@ -0,0 +1,8 @@ +%%HACKGEN_NF%%%%FONTSDIR%%/HackGenConsoleNF-Regular.ttf +%%HACKGEN_NF%%%%FONTSDIR%%/HackGenConsoleNF-Bold.ttf +%%HACKGEN_NFJ%%%%FONTSDIR%%/HackGenConsoleNFJ-Regular.ttf +%%HACKGEN_NFJ%%%%FONTSDIR%%/HackGenConsoleNFJ-Bold.ttf +%%HACKGEN35_NF%%%%FONTSDIR%%/HackGen35ConsoleNF-Regular.ttf +%%HACKGEN35_NF%%%%FONTSDIR%%/HackGen35ConsoleNF-Bold.ttf +%%HACKGEN35_NFJ%%%%FONTSDIR%%/HackGen35ConsoleNFJ-Regular.ttf +%%HACKGEN35_NFJ%%%%FONTSDIR%%/HackGen35ConsoleNFJ-Bold.ttf diff --git a/japanese/font-hackgen/Makefile b/japanese/font-hackgen/Makefile index 3a14d33beffb..7c531876a112 100644 --- a/japanese/font-hackgen/Makefile +++ b/japanese/font-hackgen/Makefile @@ -1,5 +1,5 @@ PORTNAME= hackgen -PORTVERSION= 2.6.3 +PORTVERSION= 2.7.0 PORTREVISION= 0 CATEGORIES= japanese x11-fonts MASTER_SITES= https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/ diff --git a/japanese/font-hackgen/distinfo b/japanese/font-hackgen/distinfo index 0ae92a40e479..aa3952e28ffe 100644 --- a/japanese/font-hackgen/distinfo +++ b/japanese/font-hackgen/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650988353 -SHA256 (HackGen_v2.6.3.zip) = 2b1c751abe318c44e2a3b22137fa31c18765a1c4e07962a8d1e05e7d5908241a -SIZE (HackGen_v2.6.3.zip) = 40456710 +TIMESTAMP = 1660971026 +SHA256 (HackGen_v2.7.0.zip) = 8939de201fe35189358091259bab53dd607c10783b92a4b784e68ac392f92bc3 +SIZE (HackGen_v2.7.0.zip) = 40456677
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208200559.27K5xWCU008377>