Attachment 184750 Details for Bug 220616 – Alternative patch to update both x11-fonts/gnu-unifont and x11-fonts/gnu-unifont-ttf

[patch] Alternative patch to update both x11-fonts/gnu-unifont and x11-fonts/gnu-unifont-ttf

gnu-unifont.diff (text/plain), 4.70 KB, created by Jung-uk Kim on 2017-07-26 18:52:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2017-07-26 18:52:07 UTC

Size: 4.70 KB

patch

obsolete

>Index: x11-fonts/gnu-unifont/Makefile
>===================================================================
>--- x11-fonts/gnu-unifont/Makefile	(revision 446690)
>+++ x11-fonts/gnu-unifont/Makefile	(working copy)
>@@ -1,26 +1,33 @@
> # $FreeBSD$
> 
>-PORTNAME=	gnu-unifont
>-PORTVERSION=	7.0.03
>-PORTREVISION=	1
>+PORTNAME=	unifont
>+PORTVERSION=	10.0.05
> PORTEPOCH=	1
> CATEGORIES=	x11-fonts
>-MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
>-DISTNAME=	unifont-${PORTVERSION}.pcf
>-EXTRACT_SUFX=	.gz
>+MASTER_SITES=	GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION}
>+PKGNAMEPREFIX=	gnu-
>+DISTFILES=	${FONTFILES:S|$|-${PORTVERSION}${FONTSUFFIX}|}
> EXTRACT_ONLY=
> 
>-MAINTAINER=	bsdports@gmail.com
>-COMMENT=	Unicode Font
>+MAINTAINER=	ports@FreeBSD.org
>+COMMENT?=	GNU Unicode font
> 
>-USES=		fonts
>+LICENSE=	GPLv2+
> 
>+FONTFILES?=	${PORTNAME}
>+FONTSUFFIX?=	.pcf.gz
>+
>+FONTSDIR=	${PREFIX}/share/fonts/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
>+NO_ARCH=	yes
> NO_BUILD=	yes
>-PLIST_FILES=	${FONTSDIR}/unifont.pcf.gz
>+PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|:S|$|${FONTSUFFIX}|}
>+USES=		fonts
> 
> do-install:
> 	${MKDIR} ${STAGEDIR}${FONTSDIR}
>-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
>-		${STAGEDIR}${FONTSDIR}/unifont.pcf.gz
>+.for i in ${FONTFILES}
>+	${INSTALL_DATA} ${DISTDIR}/${i}-${PORTVERSION}${FONTSUFFIX} \
>+	    ${STAGEDIR}${FONTSDIR}/${i}${FONTSUFFIX}
>+.endfor
> 
> .include <bsd.port.mk>
>Index: x11-fonts/gnu-unifont/distinfo
>===================================================================
>--- x11-fonts/gnu-unifont/distinfo	(revision 446690)
>+++ x11-fonts/gnu-unifont/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (unifont-7.0.03.pcf.gz) = cffed831498eb67933acbf2a7e398d64a7e3bf97a784a10fc999db51891cc515
>-SIZE (unifont-7.0.03.pcf.gz) = 1358950
>+TIMESTAMP = 1501090695
>+SHA256 (unifont-10.0.05.pcf.gz) = a77d9c3e9905038bbae08a7e825d29d4ce9fb6c356bea28b155454ceecedb2f2
>+SIZE (unifont-10.0.05.pcf.gz) = 1360625
>Index: x11-fonts/gnu-unifont-ttf/Makefile
>===================================================================
>--- x11-fonts/gnu-unifont-ttf/Makefile	(revision 446690)
>+++ x11-fonts/gnu-unifont-ttf/Makefile	(working copy)
>@@ -1,30 +1,15 @@
> # $FreeBSD$
> 
>-PORTNAME=	gnu-unifont-ttf
>-PORTVERSION=	7.0.03
>-PORTREVISION=	1
>-PORTEPOCH=	1
>-CATEGORIES=	x11-fonts
>-MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
>-DISTNAME=	unifont-${PORTVERSION}
>+MASTERDIR=	${.CURDIR}/../gnu-unifont
> 
>-MAINTAINER=	bsdports@gmail.com
>-COMMENT=	Unicode TrueType Font
>+PKGNAMESUFFIX=	-ttf
> 
>-USES=		fonts
>+COMMENT=	GNU Unicode TrueType font
> 
>-NO_BUILD=	yes
>-WRKSRC_SUBDIR=	font/precompiled
>+FONTFILES=	${PORTNAME} ${PORTNAME}_csur ${PORTNAME}_upper
>+FONTSUFFIX=	.ttf
> 
>-do-install:
>-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/unifont-${PORTVERSION}.ttf \
>-		${STAGEDIR}${FONTSDIR}/unifont.ttf
>-	${INSTALL_DATA} ${WRKSRC}/unifont_csur-${PORTVERSION}.ttf \
>-		${STAGEDIR}${FONTSDIR}/unifont_csur.ttf
>-	${INSTALL_DATA} ${WRKSRC}/unifont_upper-${PORTVERSION}.ttf \
>-		${STAGEDIR}${FONTSDIR}/unifont_upper.ttf
>-	${INSTALL_DATA} ${WRKSRC}/unifont_upper_csur-${PORTVERSION}.ttf \
>-		${STAGEDIR}${FONTSDIR}/unifont_upper_csur.ttf
>+DESCR=		${.CURDIR}/pkg-descr
>+DISTINFO_FILE=	${.CURDIR}/distinfo
> 
>-.include <bsd.port.mk>
>+.include "${MASTERDIR}/Makefile"
>Index: x11-fonts/gnu-unifont-ttf/distinfo
>===================================================================
>--- x11-fonts/gnu-unifont-ttf/distinfo	(revision 446690)
>+++ x11-fonts/gnu-unifont-ttf/distinfo	(working copy)
>@@ -1,2 +1,7 @@
>-SHA256 (unifont-7.0.03.tar.gz) = 3b5f2f3aa1bee9fdd3b23b17c0a3206948c3148dfd3ca0404696ea06d63c72cd
>-SIZE (unifont-7.0.03.tar.gz) = 18372349
>+TIMESTAMP = 1501090695
>+SHA256 (unifont-10.0.05.ttf) = a850db8a860ab6e01524a9da1740d157a4594efdba5c21d9cf3f3d277f10cd47
>+SIZE (unifont-10.0.05.ttf) = 12292756
>+SHA256 (unifont_csur-10.0.05.ttf) = 396eaa2e8db63000d0e987cf9d8e9d0112b9e667f85db99d8dfc060ddeed5b1e
>+SIZE (unifont_csur-10.0.05.ttf) = 750796
>+SHA256 (unifont_upper-10.0.05.ttf) = 1469942032a062d96d550cb3f00390a3004ce9041a193d193532da6a928e6f01
>+SIZE (unifont_upper-10.0.05.ttf) = 1375648
>Index: x11-fonts/gnu-unifont-ttf/pkg-plist
>===================================================================
>--- x11-fonts/gnu-unifont-ttf/pkg-plist	(revision 446690)
>+++ x11-fonts/gnu-unifont-ttf/pkg-plist	(nonexistent)
>@@ -1,4 +0,0 @@
>-%%FONTSDIR%%/unifont.ttf
>-%%FONTSDIR%%/unifont_csur.ttf
>-%%FONTSDIR%%/unifont_upper.ttf
>-%%FONTSDIR%%/unifont_upper_csur.ttf
>
>Property changes on: x11-fonts/gnu-unifont-ttf/pkg-plist
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 220616: 184246 | 184299 | 184740 | 184750 | 185849