git: ae1444fdea5a - main - textproc/UCD: fix fetch

From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Sat, 08 Jan 2022 16:27:51 UTC
The branch main has been updated by thierry:

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

commit ae1444fdea5a04915a2983eb8b997ffa9a9bead2
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2022-01-08 16:21:11 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-01-08 16:21:11 +0000

    textproc/UCD: fix fetch
    
    Patch proposed by Daniel Engberg <diizzy@FreeBSD.org>:
    - Only use HTTPS
    - Instead of creating a new directory for each release use a subdir
    - Grab license file from Unicode Han Database (Unihan) as they share the
      same and are both part of Unicode.
    
    PR:             260986
    Reported by:    jbeich
---
 textproc/UCD/Makefile | 11 +++++------
 textproc/UCD/distinfo | 14 +++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/textproc/UCD/Makefile b/textproc/UCD/Makefile
index 6282531b746e..81ab15c8c3c9 100644
--- a/textproc/UCD/Makefile
+++ b/textproc/UCD/Makefile
@@ -3,12 +3,11 @@
 PORTNAME=	UCD
 PORTVERSION=	14.0.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.unicode.org/Public/zipped/${PORTVERSION}/:src\
-		ftp://www.unicode.org/Public/zipped/${PORTVERSION}/:src	\
-		http://www.unicode.org/:lic
+MASTER_SITES=	https://www.unicode.org/Public/zipped/${DISTVERSION}/:src	\
+		https://raw.githubusercontent.com/unicode-org/unihan-database/f1e8e08a138bc7e834958c8d50d26ec4bca305d3/:lic
 DISTFILES=	${PORTNAME}.zip:src	\
-		license.html:lic
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+		LICENSE.md:lic
+DIST_SUBDIR=	unicode-${PORTNAME}/${DISTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -16,7 +15,7 @@ COMMENT=	Unicode Character Database
 
 LICENSE=	Unicode_License_Agreement
 LICENSE_NAME=	Unicode License Agreement
-LICENSE_FILE=	${_DISTDIR}/license.html
+LICENSE_FILE=	${_DISTDIR}/LICENSE.md
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	HAN
diff --git a/textproc/UCD/distinfo b/textproc/UCD/distinfo
index b2ef394dd4ad..1027ab72fba7 100644
--- a/textproc/UCD/distinfo
+++ b/textproc/UCD/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1636479610
-SHA256 (UCD-14.0.0/UCD.zip) = 033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600
-SIZE (UCD-14.0.0/UCD.zip) = 6985828
-SHA256 (UCD-14.0.0/license.html) = b182dd3a71fd6e072a1a778f2957fb3267a08283b54f8f4e66dab3ccfc1f4f23
-SIZE (UCD-14.0.0/license.html) = 2315
-SHA256 (UCD-14.0.0/Unihan.zip) = 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d
-SIZE (UCD-14.0.0/Unihan.zip) = 7116482
+TIMESTAMP = 1641658467
+SHA256 (unicode-UCD/14.0.0/UCD.zip) = 033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600
+SIZE (unicode-UCD/14.0.0/UCD.zip) = 6985828
+SHA256 (unicode-UCD/14.0.0/LICENSE.md) = 5d43f530cda324f2cb937c705347d7e8f4dfc2840eca437bf083423f5b571edc
+SIZE (unicode-UCD/14.0.0/LICENSE.md) = 2360
+SHA256 (unicode-UCD/14.0.0/Unihan.zip) = 2ae4519b2b82cd4d15379c17e57bfb12c33c0f54da4977de03b2b04bcf11852d
+SIZE (unicode-UCD/14.0.0/Unihan.zip) = 7116482