hebrew/culmus: Upgrade version 0.101 => 0.130

PR:		190627
Submitted by:	Carlos JPM
Approved by:	maintainer timeout

4 files changed, 51 insertions, 39 deletions

diff --git a/hebrew/culmus/Makefile b/hebrew/culmus/Makefile
index 668cb3e7a799..a8cdcd0799c6 100644
--- a/hebrew/culmus/Makefile
+++ b/hebrew/culmus/Makefile
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 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
@@ -19,12 +21,15 @@ SUB_FILES=	pkg-message
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/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
+.for filename in AharoniCLM-Bold AharoniCLM-BoldOblique AharoniCLM-Book AharoniCLM-BookOblique CaladingsCLM DrugulinCLM-Bold DrugulinCLM-BoldItalic ElliniaCLM-Bold ElliniaCLM-BoldItalic ElliniaCLM-Light ElliniaCLM-LightItalic NachlieliCLM-Bold NachlieliCLM-BoldOblique NachlieliCLM-Light NachlieliCLM-LightOblique YehudaCLM-Bold YehudaCLM-Light
 		${INSTALL_DATA} ${WRKSRC}/${filename}.afm ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
 		${INSTALL_DATA} ${WRKSRC}/${filename}.pfa ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
-.	endfor
+.endfor
+.for filename in DavidCLM-Bold DavidCLM-BoldItalic DavidCLM-Medium DavidCLM-MediumItalic 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 ShofarDemi-Bold ShofarDemi-BoldOblique ShofarRegular ShofarRegularOblique SimpleCLM-Bold SimpleCLM-BoldOblique SimpleCLM-Medium SimpleCLM-MediumOblique StamAshkenazCLM StamSefaradCLM
+		${INSTALL_DATA} ${WRKSRC}/${filename}.ttf ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
+.endfor
+
 	@cd ${WRKSRC}; ${PREFIX}/bin/mkfontscale; ${PREFIX}/bin/mkfontdir
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
+	${INSTALL_DATA} ${WRKSRC}/fonts.scale-* ${STAGEDIR}${PREFIX}/lib/X11/fonts/culmus
 
 .include <bsd.port.mk>
diff --git a/hebrew/culmus/distinfo b/hebrew/culmus/distinfo
index d07ddc1b9ead..86f81336ba5b 100644
--- a/hebrew/culmus/distinfo
+++ b/hebrew/culmus/distinfo
@@ -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 --git a/hebrew/culmus/pkg-descr b/hebrew/culmus/pkg-descr
index 3f8deacfe906..870db6a19883 100644
--- a/hebrew/culmus/pkg-descr
+++ b/hebrew/culmus/pkg-descr
@@ -1,6 +1,7 @@
-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/
+WWW: http://culmus.sourceforge.net/
diff --git a/hebrew/culmus/pkg-plist b/hebrew/culmus/pkg-plist
index a98d08174eff..2700e5aba2c2 100644
--- a/hebrew/culmus/pkg-plist
+++ b/hebrew/culmus/pkg-plist
@@ -8,12 +8,10 @@ lib/X11/fonts/culmus/AharoniCLM-BookOblique.pfa
 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.pfa
 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.pfa
 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