From nobody Wed Oct 13 12:41:21 2021 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 9E7B9180EAA6; Wed, 13 Oct 2021 12:41:21 +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 4HTsbP461sz4gHj; Wed, 13 Oct 2021 12:41:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 6CB2227C1C; Wed, 13 Oct 2021 12:41:21 +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 19DCfLwR034925; Wed, 13 Oct 2021 12:41:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19DCfL6n034924; Wed, 13 Oct 2021 12:41:21 GMT (envelope-from git) Date: Wed, 13 Oct 2021 12:41:21 GMT Message-Id: <202110131241.19DCfL6n034924@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hajimu UMEMOTO Subject: git: 409142d12586 - main - japanese/font-{firge,hackgen}: fix install script 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: ume X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 409142d1258693d3b18975850f14025efd5fef9e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ume: URL: https://cgit.FreeBSD.org/ports/commit/?id=409142d1258693d3b18975850f14025efd5fef9e commit 409142d1258693d3b18975850f14025efd5fef9e Author: Hajimu UMEMOTO AuthorDate: 2021-10-13 12:35:09 +0000 Commit: Hajimu UMEMOTO CommitDate: 2021-10-13 12:39:57 +0000 japanese/font-{firge,hackgen}: fix install script --- japanese/font-firge/Makefile | 2 +- japanese/font-firge/files/pkg-install.in | 18 +++++++++++------- japanese/font-hackgen/Makefile | 2 +- japanese/font-hackgen/files/pkg-install.in | 18 +++++++++++------- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/japanese/font-firge/Makefile b/japanese/font-firge/Makefile index d6c8e31c3816..d86c6a50a188 100644 --- a/japanese/font-firge/Makefile +++ b/japanese/font-firge/Makefile @@ -1,6 +1,6 @@ PORTNAME= firge PORTVERSION= 0.2.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= japanese x11-fonts MASTER_SITES= https://github.com/yuru7/Firge/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ja-font- diff --git a/japanese/font-firge/files/pkg-install.in b/japanese/font-firge/files/pkg-install.in index 8790197d3730..bf0cfbf433d8 100644 --- a/japanese/font-firge/files/pkg-install.in +++ b/japanese/font-firge/files/pkg-install.in @@ -2,13 +2,17 @@ catfontsdir() { - while read _IN - do - case "${_IN}" in - *-misc-firge(|35)(|console)-*|[0-9]*|"") ;; - *) echo ${_IN} ;; - esac - done + while read _IN + do + case "${_IN}" in + *-misc-firge-* | *-misc-firgeconsole-* | \ + *-misc-firge35-* | *-misc-firge35console-* | [0-9]* | "") + ;; + *) + echo ${_IN} + ;; + esac + done } ROMA="" diff --git a/japanese/font-hackgen/Makefile b/japanese/font-hackgen/Makefile index 9e558a7040cb..dce3b9d7d331 100644 --- a/japanese/font-hackgen/Makefile +++ b/japanese/font-hackgen/Makefile @@ -1,6 +1,6 @@ PORTNAME= hackgen PORTVERSION= 2.5.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= japanese x11-fonts MASTER_SITES= https://github.com/yuru7/HackGen/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ja-font- diff --git a/japanese/font-hackgen/files/pkg-install.in b/japanese/font-hackgen/files/pkg-install.in index 5e5e8d76dc92..8f3475e37be2 100644 --- a/japanese/font-hackgen/files/pkg-install.in +++ b/japanese/font-hackgen/files/pkg-install.in @@ -2,13 +2,17 @@ catfontsdir() { - while read _IN - do - case "${_IN}" in - *-misc-hackgen(|35)(|console)-*|[0-9]*|"") ;; - *) echo ${_IN} ;; - esac - done + while read _IN + do + case "${_IN}" in + *-misc-hackgen-* | *-misc-hackgenconsole-* | \ + *-misc-hackgen35-* | *-misc-hackgen35console-* | [0-9]* | "") + ;; + *) + echo ${_IN} + ;; + esac + done } ROMA=""