git: 1b5c535968a3 - main - x11-fonts/webfonts: Fix port when NEWVERDANA option is disabled

The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=1b5c535968a3ef3dfa787652d74b337937f9de38

commit 1b5c535968a3ef3dfa787652d74b337937f9de38
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2026-09-14 19:10:47 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2026-09-14 19:24:56 +0000

    x11-fonts/webfonts: Fix port when NEWVERDANA option is disabled
    
    Due to an oversight on my end I only did final testing with
    NEWVERDANA enabled. While at it move EXTRACT_ONLY variable
    to correct section
    
    Reported by:    leres@
---
 x11-fonts/webfonts/Makefile | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index ba7e6c1cfbb0..a300d2d206e9 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -8,8 +8,10 @@ MASTER_SITES=	SF/corefonts/the%20fonts/final:group1 \
 		SF/mscorefonts2/cabs:group3
 DISTFILES=	andale32.exe:group1 arialb32.exe:group1 comic32.exe:group1 \
 		courie32.exe:group1 georgi32.exe:group1 impact32.exe:group1 \
-		verdan32.exe:group1 webdin32.exe:group1
+		verdan32.exe:group1 webdin32.exe:group1 EUupdate.EXE:group3
 DIST_SUBDIR=	${PORTNAME}
+# Do not extract CLEARTYPE distfile
+EXTRACT_ONLY=	${_DISTFILES:M*32*} ${_DISTFILES:M*CAB*} ${_DISTFILES:M*EXE*}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	TrueType core fonts for the Web
@@ -23,8 +25,6 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 
 USES=		fonts
 
-# Do not extract CLEARTYPE distfile
-EXTRACT_ONLY=	${_DISTFILES:M*32*} ${_DISTFILES:M*CAB*} ${_DISTFILES:M*EXE*}
 EXTRACT_AFTER_ARGS=	--include '*.[tT][tT][fF]' \
 			--no-same-owner --no-same-permissions
 
@@ -45,7 +45,6 @@ NEWVERDANA_DESC=	Install y2006 version of Verdana (broken bold N, W)
 
 CLEARTYPE_DISTFILES=	PowerPointViewer.exe:group3
 EXTRAFONTS_DISTFILES=	IELPKTH.CAB:group2
-NEWVERDANA_DISTFILES=	EUupdate.EXE:group3
 
 .include <bsd.port.options.mk>
 
@@ -56,6 +55,11 @@ pre-extract-CLEARTYPE-on:
 
 post-extract:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${_DISTFILES:Mwebdin32*} --include *.TXT -C ${EXTRACT_WRKDIR} --no-same-owner --no-same-permissions
+.if ${PORT_OPTIONS:MNEWVERDANA}
+	${RM} ${WRKSRC}/Verdan*.TTF
+.else
+	${RM} ${WRKSRC}/Verdan*.ttf
+.endif
 	@cd ${WRKSRC} && for f in *; do \
 	    ${MV} "$$f" `${ECHO_CMD} "$$f" | ${TR} '[:upper:]' '[:lower:]'`; \
 	done