From 958081b663b52175959175d6e7b7049f58e98266 Mon Sep 17 00:00:00 2001 From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Wed, 23 Oct 2019 15:24:44 +0000 Subject: [PATCH] Take maintainership & clean up - Switch MASTER_SITES to the website listed on the homepage. - Set NO_ARCH. - Simplify do-install. - Update homepage. - Update pkg-plist as apparently the latest archive got updated without a version bump upstream. --- x11-fonts/ubuntu-font/Makefile | 22 +++++++++++++--------- x11-fonts/ubuntu-font/distinfo | 5 +++-- x11-fonts/ubuntu-font/pkg-descr | 2 +- x11-fonts/ubuntu-font/pkg-plist | 1 + 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/x11-fonts/ubuntu-font/Makefile b/x11-fonts/ubuntu-font/Makefile index 1d5fbdf15396..3e18d1da5218 100644 --- a/x11-fonts/ubuntu-font/Makefile +++ b/x11-fonts/ubuntu-font/Makefile @@ -3,13 +3,12 @@ PORTNAME= ubuntu-font PORTVERSION= 0.83 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-fonts -MASTER_SITES= http://font.ubuntu.com/download/ +MASTER_SITES= https://assets.ubuntu.com/v1/ +DISTNAME= 0cef8205-${ARCHIVE_NAME} -DISTNAME= ${PORTNAME}-family-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 0mp@FreeBSD.org COMMENT= Ubuntu font family LICENSE= UFL @@ -18,16 +17,21 @@ LICENSE_NAME= Ubuntu Font License (UFL) LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept USES= fonts zip + +NO_ARCH= yes NO_BUILD= yes +WRKSRC= ${WRKDIR}/${ARCHIVE_NAME} SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS +ARCHIVE_NAME= ${PORTNAME}-family-${PORTVERSION} + do-install: - ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} *.txt ${STAGEDIR}${DOCSDIR} - ${MKDIR} ${STAGEDIR}${FONTSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.txt ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${FONTSDIR} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR} .include diff --git a/x11-fonts/ubuntu-font/distinfo b/x11-fonts/ubuntu-font/distinfo index 2747be59f166..dde3714ada04 100644 --- a/x11-fonts/ubuntu-font/distinfo +++ b/x11-fonts/ubuntu-font/distinfo @@ -1,2 +1,3 @@ -SHA256 (ubuntu-font-family-0.83.zip) = 456d7d42797febd0d7d4cf1b782a2e03680bb4a5ee43cc9d06bda172bac05b42 -SIZE (ubuntu-font-family-0.83.zip) = 2092263 +TIMESTAMP = 1571843036 +SHA256 (0cef8205-ubuntu-font-family-0.83.zip) = 61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf +SIZE (0cef8205-ubuntu-font-family-0.83.zip) = 2190387 diff --git a/x11-fonts/ubuntu-font/pkg-descr b/x11-fonts/ubuntu-font/pkg-descr index e1cb5b1bbf7f..085e2ce7a8df 100644 --- a/x11-fonts/ubuntu-font/pkg-descr +++ b/x11-fonts/ubuntu-font/pkg-descr @@ -8,4 +8,4 @@ Both the final font Truetype/OpenType files and the design files used to produce the font family are distributed under an open licence and you are expressly encouraged to experiment, modify, share and improve. -WWW: http://font.ubuntu.com/ +WWW: https://design.ubuntu.com/font/ diff --git a/x11-fonts/ubuntu-font/pkg-plist b/x11-fonts/ubuntu-font/pkg-plist index 35125ca34a89..a75f6b141a7e 100644 --- a/x11-fonts/ubuntu-font/pkg-plist +++ b/x11-fonts/ubuntu-font/pkg-plist @@ -7,6 +7,7 @@ %%FONTSDIR%%/Ubuntu-MI.ttf %%FONTSDIR%%/Ubuntu-R.ttf %%FONTSDIR%%/Ubuntu-RI.ttf +%%FONTSDIR%%/Ubuntu-Th.ttf %%FONTSDIR%%/UbuntuMono-B.ttf %%FONTSDIR%%/UbuntuMono-BI.ttf %%FONTSDIR%%/UbuntuMono-R.ttf