Attachment 100093 Details for Bug 139340 – gentium-basic.diff

[patch] gentium-basic.diff

gentium-basic.diff (text/plain), 10.69 KB, created by Matthew Seaman on 2009-10-03 19:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Seaman

Created: 2009-10-03 19:40:01 UTC

Size: 10.69 KB

patch

obsolete

>diff -Nur /usr/ports/x11-fonts/gentium/Makefile gentium-basic/Makefile
>--- /usr/ports/x11-fonts/gentium/Makefile	2008-04-19 18:55:06.000000000 +0100
>+++ gentium-basic/Makefile	2009-10-03 18:39:30.000000000 +0100
>@@ -7,21 +7,20 @@
> # This port is shamelessly copied from Joe Marcus Clarke's bitstream-vera
> # port.
> 
>-PORTNAME=	gentium
>-PORTVERSION=	1.0.2
>-PORTREVISION=	3
>+PORTNAME=	gentium-basic
>+PORTVERSION=	1.1.0
> CATEGORIES=	x11-fonts
>-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=Gentium_102_L_tar&_sc=1&filename=/
>-DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION}
>+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?site_id=nrsi&format=file&media_id=GentiumBasic_${PORTVERSION:C@\.@@g}_tar&filename=/
>+DISTNAME=	ttf-sil-${PORTNAME}_${PORTVERSION:C@\.[[:digit:]]+$@@}.orig
> 
> MAINTAINER=	m.seaman@infracaninophile.co.uk
>-COMMENT=	Gentium TrueType font collection
>+COMMENT=	Gentium Basic and Gentium Book Basic TrueType fonts
> 
> BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
> RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
> 
> NO_BUILD=	yes
>-WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.([[:digit:]]+)$@\1@}
>+WRKSRC=		${WRKDIR}/ttf-sil-${PORTNAME}-${PORTVERSION:C@\.[[:digit:]]+$@@}
> 
> PLIST_SUB=	FONTSDIR="${FONTSDIR}" \
> 		FONTNAME="${FONTNAME}"
>@@ -37,9 +36,7 @@
> FONTSDIR?=	lib/X11/fonts/${FONTNAME}
> FONTSTGT=	${PREFIX}/${FONTSDIR}
> 
>-DOCSLIST=	FONTLOG GENTIUM-FAQ Gentium-Greek-Specimen.pdf \
>-		Gentium-RU-A3Proofs.pdf Gentium-RU-Specimen.pdf \
>-		OFL-FAQ QUOTES README
>+DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt
> 
> .SILENT:
> 
>@@ -47,18 +44,13 @@
> # Install
> #
> 
>-do-install: install-fonts install-conf install-docs
>+do-install: install-fonts install-docs
> 
> install-fonts:
> 	${MKDIR} ${FONTSTGT}
> 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSTGT}
> 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSTGT}
>-	${INSTALL_DATA} ${WRKSRC}/OFL ${FONTSTGT}
>-
>-install-conf:
>-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
>-	${INSTALL_DATA} ${WRKSRC}/local.conf \
>-		${PREFIX}/etc/fonts/conf.d/${FONTNAME}.conf
>+	${INSTALL_DATA} ${WRKSRC}/OFL.txt ${FONTSTGT}
> 
> install-docs:
> .if !defined(NOPORTDOCS)
>diff -Nur /usr/ports/x11-fonts/gentium/distinfo gentium-basic/distinfo
>--- /usr/ports/x11-fonts/gentium/distinfo	2005-12-05 07:17:03.000000000 +0000
>+++ gentium-basic/distinfo	2009-10-03 17:13:33.000000000 +0100
>@@ -1,3 +1,3 @@
>-MD5 (ttf-sil-gentium_1.0.2.tar.gz) = 4c3e6ae586be277537ebb68f2a45b883
>-SHA256 (ttf-sil-gentium_1.0.2.tar.gz) = 4746c04c9a4ad9e0788a38e0a2f81919a630d8070ceabc89f156b6d41d8ceb37
>-SIZE (ttf-sil-gentium_1.0.2.tar.gz) = 2334185
>+MD5 (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 7b29b6ff59c2738ddfb4ee53b4b51ba9
>+SHA256 (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 2aa3611c620dceff546ea9784003abc1894c5bcb9894a35445a0f3584f243e5d
>+SIZE (ttf-sil-gentium-basic_1.1.orig.tar.gz) = 1451826
>diff -Nur /usr/ports/x11-fonts/gentium/files/fonts.dir gentium-basic/files/fonts.dir
>--- /usr/ports/x11-fonts/gentium/files/fonts.dir	2005-12-05 07:17:03.000000000 +0000
>+++ gentium-basic/files/fonts.dir	2009-10-03 17:26:37.000000000 +0100
>@@ -1,45 +1,41 @@
>-44
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-ascii-0
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-fcd8859-15
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso10646-1
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-1
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-10
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-15
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-2
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-3
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-4
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-7
>-GenAI102.ttf -misc-GentiumAlt-medium-i-normal--0-0-0-0-p-0-iso8859-9
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-ascii-0
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-fcd8859-15
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso10646-1
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-1
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-10
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-15
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-2
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-3
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-4
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-7
>-GenAR102.ttf -misc-GentiumAlt-medium-r-normal--0-0-0-0-p-0-iso8859-9
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-ascii-0
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-fcd8859-15
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso10646-1
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-1
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-10
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-15
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-2
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-3
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-4
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-7
>-GenI102.ttf -misc-Gentium-medium-i-normal--0-0-0-0-p-0-iso8859-9
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-ascii-0
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-fcd8859-15
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso10646-1
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-1
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-10
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-15
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-2
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-3
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-4
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-7
>-GenR102.ttf -misc-Gentium-medium-r-normal--0-0-0-0-p-0-iso8859-9
>+40
>+GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-ascii-0
>+GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso10646-1
>+GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-1
>+GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-15
>+GenBasBI.ttf -sil-Gentium Basic-bold-i-normal--0-0-0-0-p-0-iso8859-9
>+GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-ascii-0
>+GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso10646-1
>+GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-1
>+GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-15
>+GenBkBasBI.ttf -sil-Gentium Book Basic-bold-i-normal--0-0-0-0-p-0-iso8859-9
>+GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-ascii-0
>+GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso10646-1
>+GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-1
>+GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-15
>+GenBkBasR.ttf -sil-Gentium Book Basic-medium-r-normal--0-0-0-0-p-0-iso8859-9
>+GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-ascii-0
>+GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso10646-1
>+GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-1
>+GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-15
>+GenBkBasB.ttf -sil-Gentium Book Basic-bold-r-normal--0-0-0-0-p-0-iso8859-9
>+GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-ascii-0
>+GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso10646-1
>+GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-1
>+GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-15
>+GenBasI.ttf -sil-Gentium Basic-medium-i-normal--0-0-0-0-p-0-iso8859-9
>+GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-ascii-0
>+GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso10646-1
>+GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-1
>+GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-15
>+GenBasB.ttf -sil-Gentium Basic-bold-r-normal--0-0-0-0-p-0-iso8859-9
>+GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-ascii-0
>+GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso10646-1
>+GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-1
>+GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-15
>+GenBkBasI.ttf -sil-Gentium Book Basic-medium-i-normal--0-0-0-0-p-0-iso8859-9
>+GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-ascii-0
>+GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso10646-1
>+GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-1
>+GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-15
>+GenBasR.ttf -sil-Gentium Basic-medium-r-normal--0-0-0-0-p-0-iso8859-9
>diff -Nur /usr/ports/x11-fonts/gentium/files/pkg-message.in gentium-basic/files/pkg-message.in
>--- /usr/ports/x11-fonts/gentium/files/pkg-message.in	2009-06-20 12:40:42.000000000 +0100
>+++ gentium-basic/files/pkg-message.in	2009-10-03 18:29:24.000000000 +0100
>@@ -1,8 +1,3 @@
>-IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
>-before using.  The copyright can be found at
>-
>-	%%PREFIX%%/%%FONTSDIR%%/OFL
>-
> To use these fonts, add the following line to the "Files" section of
> xorg.conf:
> 
>diff -Nur /usr/ports/x11-fonts/gentium/pkg-plist gentium-basic/pkg-plist
>--- /usr/ports/x11-fonts/gentium/pkg-plist	2008-04-19 18:55:06.000000000 +0100
>+++ gentium-basic/pkg-plist	2009-10-03 18:27:23.000000000 +0100
>@@ -1,20 +1,17 @@
>-etc/fonts/conf.d/%%FONTNAME%%.conf
>-%%FONTSDIR%%/GenAI102.ttf
>-%%FONTSDIR%%/GenAR102.ttf
>-%%FONTSDIR%%/GenI102.ttf
>-%%FONTSDIR%%/GenR102.ttf
>-%%FONTSDIR%%/OFL
>+%%FONTSDIR%%/GenBasB.ttf
>+%%FONTSDIR%%/GenBasBI.ttf
>+%%FONTSDIR%%/GenBasI.ttf
>+%%FONTSDIR%%/GenBasR.ttf
>+%%FONTSDIR%%/GenBkBasB.ttf
>+%%FONTSDIR%%/GenBkBasBI.ttf
>+%%FONTSDIR%%/GenBkBasI.ttf
>+%%FONTSDIR%%/GenBkBasR.ttf
>+%%FONTSDIR%%/OFL.txt
> %%FONTSDIR%%/fonts.dir
>-%%PORTDOCS%%%%DOCSDIR%%/FONTLOG
>-%%PORTDOCS%%%%DOCSDIR%%/GENTIUM-FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/Gentium-Greek-Specimen.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/Gentium-RU-A3Proofs.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/Gentium-RU-Specimen.pdf
>-%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ
>-%%PORTDOCS%%%%DOCSDIR%%/QUOTES
>-%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/FONTLOG.txt
>+%%PORTDOCS%%%%DOCSDIR%%/GENTIUM-FAQ.txt
>+%%PORTDOCS%%%%DOCSDIR%%/OFL-FAQ.txt
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
> @dirrm %%FONTSDIR%%
> @exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
>-@dirrmtry etc/fonts/conf.d

Actions: View | Diff

Attachments on bug 139340: 100093