Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 27 Feb 2024 10:50:01 GMT
From:      Felix Palmen <zirias@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 903018febdf2 - main - x11-fonts/ibmfonts: Update to 0.2.0
Message-ID:  <202402271050.41RAo193082769@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias:

URL: https://cgit.FreeBSD.org/ports/commit/?id=903018febdf2512ae90b27cb70187f2c26e44c6e

commit 903018febdf2512ae90b27cb70187f2c26e44c6e
Author:     Felix Palmen <zirias@FreeBSD.org>
AuthorDate: 2024-02-27 10:48:05 +0000
Commit:     Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2024-02-27 10:49:30 +0000

    x11-fonts/ibmfonts: Update to 0.2.0
    
    Both previously optional patches were incorporated upstream, so the port
    options are gone.
---
 x11-fonts/ibmfonts/Makefile              | 21 +++------------
 x11-fonts/ibmfonts/distinfo              |  6 ++---
 x11-fonts/ibmfonts/files/patch-configure | 45 --------------------------------
 x11-fonts/ibmfonts/pkg-descr             |  2 +-
 4 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/x11-fonts/ibmfonts/Makefile b/x11-fonts/ibmfonts/Makefile
index 8d1977fd4d26..74629e395a26 100644
--- a/x11-fonts/ibmfonts/Makefile
+++ b/x11-fonts/ibmfonts/Makefile
@@ -1,6 +1,7 @@
-PORTNAME=	ibmfonts
-DISTVERSION=	0.1
-CATEGORIES=	x11-fonts
+PORTNAME=		ibmfonts
+DISTVERSIONPREFIX=	v
+DISTVERSION=		0.2.0
+CATEGORIES=		x11-fonts
 
 MAINTAINER=	zirias@FreeBSD.org
 COMMENT=	IBM Fonts in PCF format
@@ -23,18 +24,4 @@ CONFIGURE_ARGS=	--bsd-make \
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		VT100 XFTFIX
-OPTIONS_DEFAULT=	VT100 XFTFIX
-VT100_DESC=		Remove glyphs at 00-1F confusable for VT100 drawing
-XFTFIX_DESC=		Fix Xft names removing repeated IBM in FAMILY_NAME
-
-post-patch-VT100-on:
-	@${REINPLACE_CMD} \
-		-e 's/CHARS 782/CHARS 750/' -e 's/uni0000.*/space/' \
-		-e '/ENCODING 0/,/STARTCHAR space/d' ${WRKSRC}/bdf/*.bdf
-
-post-patch-XFTFIX-on:
-	@${REINPLACE_CMD} \
-		's/FAMILY_NAME "IBM /FAMILY_NAME "/' ${WRKSRC}/bdf/*.bdf
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/ibmfonts/distinfo b/x11-fonts/ibmfonts/distinfo
index 7cff1a4a5c6b..0ced3abfe4be 100644
--- a/x11-fonts/ibmfonts/distinfo
+++ b/x11-fonts/ibmfonts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1708027202
-SHA256 (farsil-ibmfonts-0.1_GH0.tar.gz) = 86f6d295561947f7e0a42e6e2bd405f63625095353468c6a6e752c0cba727dc9
-SIZE (farsil-ibmfonts-0.1_GH0.tar.gz) = 253247
+TIMESTAMP = 1709030618
+SHA256 (farsil-ibmfonts-v0.2.0_GH0.tar.gz) = 70f9d9d668c304916b0ab2601564ff303720526d090b5929ab712d777420a653
+SIZE (farsil-ibmfonts-v0.2.0_GH0.tar.gz) = 243979
diff --git a/x11-fonts/ibmfonts/files/patch-configure b/x11-fonts/ibmfonts/files/patch-configure
deleted file mode 100644
index ac79f2e3333e..000000000000
--- a/x11-fonts/ibmfonts/files/patch-configure
+++ /dev/null
@@ -1,45 +0,0 @@
---- configure.orig	2016-11-07 10:04:21 UTC
-+++ configure
-@@ -6,22 +6,20 @@ OBJDIR=""
- INSTALLDIR=""
- MAKEVAR="gnu"
- 
--eval set -- "`getopt -o p:i:o:s:b --long prefix:,objdir:,srcdir:,installdir:,bsd-make -n "$0" -- "$@"`"
--
- while true ; do
-     case "$1" in
--        -p|--prefix)
--            PREFIX="$2"; shift 2 ;;
--        -o|--objdir)
--            OBJDIR="$2"; shift 2 ;;
--        -s|--srcdir)
--            SRCDIR="$2"; shift 2 ;;
--        -b|--bsd-make)
-+        --prefix=*)
-+            PREFIX="${1#*=}"; shift ;;
-+        --objdir=*)
-+            OBJDIR="${1#*=}"; shift ;;
-+        --srcdir=*)
-+            SRCDIR="${1#*=}"; shift ;;
-+        --bsd-make)
-             MAKEVAR="bsd"; shift ;;
--        -i|--installdir)
--            INSTALLDIR="$2"; shift 2 ;;
--        --)
--            shift; break ;;
-+        --installdir=*)
-+            INSTALLDIR="${1#*=}"; shift ;;
-+        '')
-+            break ;;
-         *)
-             exit 1 ;;
-     esac
-@@ -104,7 +102,7 @@ clean:
- 
- install: all
- 	install -dm755 \$(DESTDIR)\$(installdir)
--	install -D -m 644 -t \$(DESTDIR)\$(installdir) \$(COMPILED)
-+	install -m644 \$(COMPILED) \$(DESTDIR)\$(installdir)
- 
- uninstall:
- 	rm -f \$(INSTALLED)
diff --git a/x11-fonts/ibmfonts/pkg-descr b/x11-fonts/ibmfonts/pkg-descr
index afc145768a60..85170d9696be 100644
--- a/x11-fonts/ibmfonts/pkg-descr
+++ b/x11-fonts/ibmfonts/pkg-descr
@@ -1,6 +1,6 @@
 A collection of monospaced, bitmap fonts in BDF format that origin from IBM
 text mode and system fonts. They include extended latin, greek, cyrillic and
-hebrew scripts and several extra characters, for a total of 782 glyphs each.
+hebrew scripts and several extra characters, for a total of 750 glyphs each.
 The fonts are in BDF 2.1 format and fully compatible with applications that
 make use of either Xft or XLFD.
 



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