Attachment 143380 Details for Bug 190627 – patch

patch

patch.txt (text/plain), 8.76 KB, created by Carlos J Puga Medina on 2014-06-04 21:13:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2014-06-04 21:13:51 UTC

Size: 8.76 KB

patch

obsolete

>diff -urN Makefile.orig Makefile
>--- Makefile.orig	2014-06-04 20:34:54.000000000 +0200
>+++ Makefile	2014-06-04 22:22:05.000000000 +0200
>@@ -2,32 +2,31 @@
> # $FreeBSD: head/hebrew/culmus/Makefile 340722 2014-01-22 17:00:46Z mat $
> 
> PORTNAME=	culmus
>-PORTVERSION=	0.101
>-PORTREVISION=	2
>+PORTVERSION=	0.130
> CATEGORIES=	hebrew
> MASTER_SITES=	SF
> 
> MAINTAINER=	onatan@gmail.com
> COMMENT=	Free Hebrew Type1 fonts
> 
>+LICENSE=	GPLv2
>+LICENSE_FILE=	${WRKSRC}/LICENSE
>+
> BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
> 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
> 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
> 
> NO_BUILD=	yes
> 
>-NO_STAGE=	yes
> do-install:
>-	${MKDIR} ${LOCALBASE}/lib/X11/fonts/culmus
>-.	for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DavidCLM-Bold DavidCLM-Medium DavidCLM-MediumItalic DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light
>-		${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${PREFIX}/lib/X11/fonts/culmus
>-		${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${PREFIX}/lib/X11/fonts/culmus
>-.	endfor
>-	@cd ${WRKSRC}; ${PREFIX}/bin/mkfontscale; ${PREFIX}/bin/mkfontdir
>-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${PREFIX}/lib/X11/fonts/culmus
>-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${PREFIX}/lib/X11/fonts/culmus
>-
>-post-install:
>-	@${SED} "s|PREFIX|${PREFIX}|" ${PKGMESSAGE}
>+	${MKDIR} ${STAGEDIR}${LOCALBASE}/lib/X11/fonts/culmus
>+.for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DavidCLM-Bold DavidCLM-BoldItalic DavidCLM-Medium DavidCLM-MediumItalic DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic FrankRuehlCLM-Bold FrankRuehlCLM-BoldOblique FrankRuehlCLM-Medium FrankRuehlCLM-MediumOblique HadasimCLM-Bold HadasimCLM-BoldOblique HadasimCLM-Regular HadasimCLM-RegularOblique KeterYG-Bold KeterYG-BoldOblique KeterYG-Medium KeterYG-MediumOblique MiriamCLM-Bold MiriamCLM-Book MiriamMonoCLM-Bold MiriamMonoCLM-BoldOblique MiriamMonoCLM-Book MiriamMonoCLM-BookOblique NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique ShofarDemi-Bold ShofarDemi-BoldOblique ShofarRegular ShofarRegularOblique SimpleCLM-Bold SimpleCLM-BoldOblique SimpleCLM-Medium SimpleCLM-MediumOblique StamAshkenazCLM StamSefaradCLM YehudaCLM-Bold YehudaCLM-Light
>+	${INSTALL_DATA} ${WRKSRC}/*.afm ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
>+	${INSTALL_DATA} ${WRKSRC}/*.pfa ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
>+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
>+.endfor
>+	cd ${WRKSRC} && ${PREFIX}/bin/mkfontscale ${STAGEDIR}${PREFIX}/bin/mkfontdir
>+	${INSTALL_DATA} ${WRKSRC}/fonts.scale-ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
>+	${INSTALL_DATA} ${WRKSRC}/fonts.scale-type1 ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
> 
> .include <bsd.port.mk>
>diff -urN distinfo.orig distinfo
>--- distinfo.orig	2014-06-04 20:35:01.000000000 +0200
>+++ distinfo	2014-06-04 21:49:24.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (culmus-0.101.tar.gz) = 5a274774c0386a5dc1230a0a6ae443d224174bab7d989d4c22b7ba687a1bd442
>-SIZE (culmus-0.101.tar.gz) = 1058016
>+SHA256 (culmus-0.130.tar.gz) = 908583e388bc983a63df4f38f7130eac69fc19539952031408bb3c627846f9c1
>+SIZE (culmus-0.130.tar.gz) = 1183577
>diff -urN pkg-descr.orig pkg-descr
>--- pkg-descr.orig	2014-06-04 21:49:57.000000000 +0200
>+++ pkg-descr	2014-06-04 21:58:45.000000000 +0200
>@@ -1,6 +1,6 @@
>-8 Hebrew font families. ASCII glyphs borrowed from the URW and Bitstream
>+Hebrew font families. ASCII glyphs borrowed from the URW and Bitstream
> fonts.  Those families provide a basic set of a serif (Frank Ruehl), sans
> serif (Nachlieli) and monospaced (Miriam Mono) fonts. Also included
>-Drugulin, Ktav Yad, Aharoni, David and Ellinia.
>+Drugulin, Ktav Yad, Aharoni, David, Hadasim, Shofar, Simple, Stam, Keter and Ellinia.
> 
> WWW:	http://culmus.sourceforge.net/
>diff -urN pkg-message.orig pkg-message
>--- pkg-message.orig	2014-06-04 22:27:02.000000000 +0200
>+++ pkg-message	2014-06-04 22:24:32.000000000 +0200
>@@ -1,12 +1,11 @@
>-You'll have to add this port's directory (PREFIX/lib/X11/fonts/culmus
>+You'll have to add this port's directory PREFIX/lib/X11/fonts/culmus
> to you're X font path. Here's how:
> 
> $ xset fp+ PREFIX/lib/X11/fonts/culmus
> $ xset fp rehash
> 
> or by adding a FontPath line for it in the X-server configuration file
>-(usually /etc/XF86Config or /etc/Xaccel.ini) and restarting the 
>-X-server.
>+(usually /etc/X11/xorg.conf) and restarting the X-server.
> 
> If you're using XFS it is also a good idea to add this directory to
> your "catalogue" line in the XFS configuration file:
>diff -urN pkg-plist.orig pkg-plist
>--- pkg-plist.orig	2014-06-04 20:35:09.000000000 +0200
>+++ pkg-plist	2014-06-04 22:08:59.000000000 +0200
>@@ -8,12 +8,10 @@
> lib/X11/fonts/culmus/AharoniCLM-BookOblique.afm
> lib/X11/fonts/culmus/CaladingsCLM.pfa
> lib/X11/fonts/culmus/CaladingsCLM.afm
>-lib/X11/fonts/culmus/DavidCLM-Bold.pfa
>-lib/X11/fonts/culmus/DavidCLM-Bold.afm
>-lib/X11/fonts/culmus/DavidCLM-Medium.pfa
>-lib/X11/fonts/culmus/DavidCLM-Medium.afm
>-lib/X11/fonts/culmus/DavidCLM-MediumItalic.pfa
>-lib/X11/fonts/culmus/DavidCLM-MediumItalic.afm
>+lib/X11/fonts/culmus/DavidCLM-Bold.ttf
>+lib/X11/fonts/culmus/DavidCLM-BoldItalic.ttf
>+lib/X11/fonts/culmus/DavidCLM-Medium.ttf
>+lib/X11/fonts/culmus/DavidCLM-MediumItalic.ttf
> lib/X11/fonts/culmus/DrugulinCLM-Bold.pfa
> lib/X11/fonts/culmus/DrugulinCLM-Bold.afm
> lib/X11/fonts/culmus/DrugulinCLM-BoldItalic.pfa
>@@ -26,26 +24,24 @@
> lib/X11/fonts/culmus/ElliniaCLM-Light.afm
> lib/X11/fonts/culmus/ElliniaCLM-LightItalic.pfa
> lib/X11/fonts/culmus/ElliniaCLM-LightItalic.afm
>-lib/X11/fonts/culmus/FrankRuehlCLM-Bold.pfa
>-lib/X11/fonts/culmus/FrankRuehlCLM-Bold.afm
>-lib/X11/fonts/culmus/FrankRuehlCLM-BoldOblique.pfa
>-lib/X11/fonts/culmus/FrankRuehlCLM-BoldOblique.afm
>-lib/X11/fonts/culmus/FrankRuehlCLM-Medium.pfa
>-lib/X11/fonts/culmus/FrankRuehlCLM-Medium.afm
>-lib/X11/fonts/culmus/FrankRuehlCLM-MediumOblique.pfa
>-lib/X11/fonts/culmus/FrankRuehlCLM-MediumOblique.afm
>-lib/X11/fonts/culmus/MiriamCLM-Bold.pfa
>-lib/X11/fonts/culmus/MiriamCLM-Bold.afm
>-lib/X11/fonts/culmus/MiriamCLM-Book.pfa
>-lib/X11/fonts/culmus/MiriamCLM-Book.afm
>-lib/X11/fonts/culmus/MiriamMonoCLM-Bold.pfa
>-lib/X11/fonts/culmus/MiriamMonoCLM-Bold.afm
>-lib/X11/fonts/culmus/MiriamMonoCLM-BoldOblique.pfa
>-lib/X11/fonts/culmus/MiriamMonoCLM-BoldOblique.afm
>-lib/X11/fonts/culmus/MiriamMonoCLM-Book.pfa
>-lib/X11/fonts/culmus/MiriamMonoCLM-Book.afm
>-lib/X11/fonts/culmus/MiriamMonoCLM-BookOblique.pfa
>-lib/X11/fonts/culmus/MiriamMonoCLM-BookOblique.afm
>+lib/X11/fonts/culmus/FrankRuehlCLM-Bold.ttf
>+lib/X11/fonts/culmus/FrankRuehlCLM-BoldOblique.ttf
>+lib/X11/fonts/culmus/FrankRuehlCLM-Medium.ttf
>+lib/X11/fonts/culmus/FrankRuehlCLM-MediumOblique.ttf
>+lib/X11/fonts/culmus/HadasimCLM-Bold.ttf
>+lib/X11/fonts/culmus/HadasimCLM-BoldOblique.ttf
>+lib/X11/fonts/culmus/HadasimCLM-Regular.ttf
>+lib/X11/fonts/culmus/HadasimCLM-RegularOblique.ttf
>+lib/X11/fonts/culmus/KeterYG-Bold.ttf
>+lib/X11/fonts/culmus/KeterYG-BoldOblique.ttf
>+lib/X11/fonts/culmus/KeterYG-Medium.ttf
>+lib/X11/fonts/culmus/KeterYG-MediumOblique.ttf
>+lib/X11/fonts/culmus/MiriamCLM-Bold.ttf
>+lib/X11/fonts/culmus/MiriamCLM-Book.ttf
>+lib/X11/fonts/culmus/MiriamMonoCLM-Bold.ttf
>+lib/X11/fonts/culmus/MiriamMonoCLM-BoldOblique.ttf
>+lib/X11/fonts/culmus/MiriamMonoCLM-Book.ttf
>+lib/X11/fonts/culmus/MiriamMonoCLM-BookOblique.ttf
> lib/X11/fonts/culmus/NachlieliCLM-Bold.pfa
> lib/X11/fonts/culmus/NachlieliCLM-Bold.afm
> lib/X11/fonts/culmus/NachlieliCLM-BoldOblique.pfa
>@@ -54,10 +50,20 @@
> lib/X11/fonts/culmus/NachlieliCLM-Light.afm
> lib/X11/fonts/culmus/NachlieliCLM-LightOblique.pfa
> lib/X11/fonts/culmus/NachlieliCLM-LightOblique.afm
>+lib/X11/fonts/culmus/ShofarDemi-Bold.ttf
>+lib/X11/fonts/culmus/ShofarDemi-BoldOblique.ttf
>+lib/X11/fonts/culmus/ShofarRegular.ttf
>+lib/X11/fonts/culmus/ShofarRegularOblique.ttf
>+lib/X11/fonts/culmus/SimpleCLM-Bold.ttf
>+lib/X11/fonts/culmus/SimpleCLM-BoldOblique.ttf
>+lib/X11/fonts/culmus/SimpleCLM-Medium.ttf
>+lib/X11/fonts/culmus/SimpleCLM-MediumOblique.ttf
>+lib/X11/fonts/culmus/StamAshkenazCLM.ttf
>+lib/X11/fonts/culmus/StamSefaradCLM.ttf
> lib/X11/fonts/culmus/YehudaCLM-Bold.pfa
> lib/X11/fonts/culmus/YehudaCLM-Bold.afm
> lib/X11/fonts/culmus/YehudaCLM-Light.pfa
> lib/X11/fonts/culmus/YehudaCLM-Light.afm
>-lib/X11/fonts/culmus/fonts.dir
>-lib/X11/fonts/culmus/fonts.scale
>+lib/X11/fonts/culmus/fonts.scale-ttf
>+lib/X11/fonts/culmus/fonts.scale-type1
> @dirrm lib/X11/fonts/culmus

Actions: View

Attachments on bug 190627: 143380 | 145303