git: 40b7007eab72 - main - x11-fonts/fntsample: Use Blocks.txt from textproc/UCD (15.1.0 currently)

The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=40b7007eab729218023b9f153cbb94a5f520f9e4

commit 40b7007eab729218023b9f153cbb94a5f520f9e4
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2024-07-24 21:16:12 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2024-07-24 21:16:12 +0000

    x11-fonts/fntsample: Use Blocks.txt from textproc/UCD (15.1.0 currently)
    
    - Bump PORTREVISION for package change
---
 x11-fonts/fntsample/Makefile | 11 +++--------
 x11-fonts/fntsample/distinfo |  4 +---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/x11-fonts/fntsample/Makefile b/x11-fonts/fntsample/Makefile
index e77a7fc29ec8..13320a04d228 100644
--- a/x11-fonts/fntsample/Makefile
+++ b/x11-fonts/fntsample/Makefile
@@ -1,11 +1,8 @@
 PORTNAME=	fntsample
 PORTVERSION=	5.4
-PORTREVISION=	1
 DISTVERSIONPREFIX=	release/
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	https://unicode.org/Public/14.0.0/ucd/:unidata
-DISTFILES=	Blocks.txt:unidata
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Show Unicode coverage of a font
@@ -14,6 +11,7 @@ WWW=		https://github.com/eugmes/fntsample
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	UCD>=0:textproc/UCD
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	pdfoutline:textproc/pdfoutline
@@ -21,7 +19,7 @@ RUN_DEPENDS=	pdfoutline:textproc/pdfoutline
 USES=		cmake gettext gnome iconv pkgconfig
 USE_GNOME=	cairo glib20 pango
 
-CMAKE_ARGS=	-DUNICODE_BLOCKS=${WRKSRC}/Blocks.txt
+CMAKE_ARGS=	-DUNICODE_BLOCKS=${LOCALBASE}/share/unicode/ucd/Blocks.txt
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/fntsample \
@@ -31,7 +29,4 @@ PLIST_FILES=	bin/fntsample \
 GH_ACCOUNT=	eugmes
 USE_GITHUB=	yes
 
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/Blocks.txt ${WRKSRC}/
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/fntsample/distinfo b/x11-fonts/fntsample/distinfo
index 6082fe77384f..5847961f4d3a 100644
--- a/x11-fonts/fntsample/distinfo
+++ b/x11-fonts/fntsample/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1632036926
-SHA256 (Blocks.txt) = 598870dddef7b34b5a972916528c456aff2765b79cd4f9647fb58ceb767e7f17
-SIZE (Blocks.txt) = 10720
+TIMESTAMP = 1721823008
 SHA256 (eugmes-fntsample-release-5.4_GH0.tar.gz) = 69eb3d83bce78b6610f4a8f19d089059079ebc475c36d456ebcb4c8add431166
 SIZE (eugmes-fntsample-release-5.4_GH0.tar.gz) = 62162