From 23a0c88b037625745b88d1661b9552f1ebe97ebc Mon Sep 17 00:00:00 2001
From: Philip Paeps <philip@FreeBSD.org>
Date: Wed, 21 May 2025 17:15:50 +0800
Subject: [PATCH] zoneinfo: don't install version

The commit teaching the build to install tzdata.zi for libcxx also
instals version.  It turns out this makes at least one piece of third
party software cry: rubygem-tzinfo expects any file in zoneinfo to be at
least 44 bytes long.  Clearly this is a bug in rubygem-tzinfo but since
nothing actually uses version, we may as well not install it ... as we
did previously.

Reported by:	delphij
Fixes:		91506dba7f2e zoneinfo: also install tzdata.zi and version
MFC after:	1 day
---
 ObsoleteFiles.inc       | 3 +++
 share/zoneinfo/Makefile | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index b90ac11dfc6..8f5da0483a8 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20250521: don't install zoneinfo version
+OLD_FILES+=usr/share/zoneinfo/version
+
 # 20250516: NDFREE(9) -> NDFREE_PNBUF(9)
 OLD_FILES+=usr/share/man/man9/NDFREE.9.gz
 
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index e3111c915a9..993f9abaeeb 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -127,8 +127,6 @@ install-zoneinfo:
 	    ${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
 	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
 	    ${CONTRIBDIR}/zone1970.tab ${DESTDIR}/usr/share/zoneinfo/
-	${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
-	    ${CONTRIBDIR}/version ${DESTDIR}/usr/share/zoneinfo/
 
 afterinstall:
 #