Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 13 Oct 2021 12:41:21 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: 409142d12586 - main - japanese/font-{firge,hackgen}: fix install script
Message-ID:  <202110131241.19DCfL6n034924@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=409142d1258693d3b18975850f14025efd5fef9e

commit 409142d1258693d3b18975850f14025efd5fef9e
Author:     Hajimu UMEMOTO <ume@FreeBSD.org>
AuthorDate: 2021-10-13 12:35:09 +0000
Commit:     Hajimu UMEMOTO <ume@FreeBSD.org>
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=""



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110131241.19DCfL6n034924>