1) Upgrade to 1.0.0

2) Set the license.

PR:		ports/149870 (1)
Submitted by:	Dmitry <dmitry2006 (at) yandex.ru>

3 files changed, 34 insertions, 36 deletions

diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index ffd56f42022f..45b3a52200bf 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -5,11 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	STIX-fonts
-PORTVERSION=	0.20071031
+PORTNAME=	stixfonts
+PORTVERSION=	1.0.0
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.mozilla.org/projects/mathml/fonts/stix/
-DISTNAME=	STIXBeta
+MASTER_SITES=	SF/${PORTNAME}/CurrentRelease/
+# http://freefr.dl.sourceforge.net/project/stixfonts/CurrentRelease/STIXv1.0.0.zip
+DISTNAME=	STIXv${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A comprehensive set of fonts for scientific and engineering purposes
@@ -21,7 +22,10 @@ RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 USE_ZIP=	yes
 USE_XORG=	x11
 
-NO_WRKSUBDIR=	yes
+LICENSE=	OFL
+LICENSE_NAME=	Open Font License
+LICENSE_FILE=	${WRKSRC}/License/STIX\ Font\ License\ 2010.pdf
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"	\
 		FCCACHE='${FCCACHE}'
@@ -32,23 +36,19 @@ SUB_LIST=	FONTDIR=${FONTDIR}
 
 FONTNAME=	stix
 FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-INSTDAT=	License.txt Readme.txt fonts.dir fonts.scale
 
 MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
 MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 FCCACHE=	${LOCALBASE}/bin/fc-cache -f -v
 
 do-build:
-	cd ${WRKSRC} &&	\
-	${MKFONTSCL_CMD}
-	${REINPLACE_CMD} -e 's|-misc-|-stix-|' ${WRKSRC}/fonts.scale
-	cd ${WRKSRC} &&	\
-	${MKFONTDIR_CMD}
+	cd ${WRKSRC}/Fonts && ${MKFONTSCL_CMD}
+	${REINPLACE_CMD} -e 's|-misc-|-stix-|' ${WRKSRC}/Fonts/fonts.scale
+	cd ${WRKSRC}/Fonts && ${MKFONTDIR_CMD}
 
 do-install:
 	${MKDIR} ${FONTDIR}
-	cd ${WRKSRC} &&	\
-	${INSTALL_DATA} ${INSTDAT} *.otf ${FONTDIR}
+	cd ${WRKSRC}/Fonts && ${INSTALL_DATA} fonts.dir fonts.scale *.otf ${FONTDIR}
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
diff --git a/x11-fonts/stix-fonts/distinfo b/x11-fonts/stix-fonts/distinfo
index 2ef20091ff85..005c014ea422 100644
--- a/x11-fonts/stix-fonts/distinfo
+++ b/x11-fonts/stix-fonts/distinfo
@@ -1,3 +1,3 @@
-MD5 (STIXBeta.zip) = cf15d327b3c0499107b0a178c74a8915
-SHA256 (STIXBeta.zip) = b6c143a4e7d0c0e7de16072cfdee12ac2a049a677687001535882c9ab59c874d
-SIZE (STIXBeta.zip) = 758513
+MD5 (STIXv1.0.0.zip) = c8ce241126591ab76e488a1a10bf49f5
+SHA256 (STIXv1.0.0.zip) = 2f10ee4deaf93e31d2fad6b4df2091e4c56b8c144499da4c0178fc0e4a873cfe
+SIZE (STIXv1.0.0.zip) = 2761626
diff --git a/x11-fonts/stix-fonts/pkg-plist b/x11-fonts/stix-fonts/pkg-plist
index 8ee616c15c85..32a1b43ff5d7 100644
--- a/x11-fonts/stix-fonts/pkg-plist
+++ b/x11-fonts/stix-fonts/pkg-plist
@@ -1,33 +1,31 @@
 @comment $FreeBSD$
-%%FONTDIR%%/License.txt
-%%FONTDIR%%/Readme.txt
 %%FONTDIR%%/STIXGeneral.otf
 %%FONTDIR%%/STIXGeneralBol.otf
 %%FONTDIR%%/STIXGeneralBolIta.otf
 %%FONTDIR%%/STIXGeneralItalic.otf
-%%FONTDIR%%/STIXIntDis.otf
-%%FONTDIR%%/STIXIntDisBol.otf
-%%FONTDIR%%/STIXIntSma.otf
-%%FONTDIR%%/STIXIntSmaBol.otf
-%%FONTDIR%%/STIXIntUp.otf
+%%FONTDIR%%/STIXIntDBol.otf
+%%FONTDIR%%/STIXIntDReg.otf
+%%FONTDIR%%/STIXIntSmBol.otf
+%%FONTDIR%%/STIXIntSmReg.otf
 %%FONTDIR%%/STIXIntUpBol.otf
-%%FONTDIR%%/STIXIntUpDis.otf
-%%FONTDIR%%/STIXIntUpDisBol.otf
-%%FONTDIR%%/STIXIntUpSma.otf
-%%FONTDIR%%/STIXIntUpSmaBol.otf
+%%FONTDIR%%/STIXIntUpDBol.otf
+%%FONTDIR%%/STIXIntUpDReg.otf
+%%FONTDIR%%/STIXIntUpReg.otf
+%%FONTDIR%%/STIXIntUpSmBol.otf
+%%FONTDIR%%/STIXIntUpSmReg.otf
 %%FONTDIR%%/STIXNonUni.otf
 %%FONTDIR%%/STIXNonUniBol.otf
 %%FONTDIR%%/STIXNonUniBolIta.otf
 %%FONTDIR%%/STIXNonUniIta.otf
-%%FONTDIR%%/STIXSiz1Sym.otf
-%%FONTDIR%%/STIXSiz1SymBol.otf
-%%FONTDIR%%/STIXSiz2Sym.otf
-%%FONTDIR%%/STIXSiz2SymBol.otf
-%%FONTDIR%%/STIXSiz3Sym.otf
-%%FONTDIR%%/STIXSiz3SymBol.otf
-%%FONTDIR%%/STIXSiz4Sym.otf
-%%FONTDIR%%/STIXSiz4SymBol.otf
-%%FONTDIR%%/STIXSiz5Sym.otf
+%%FONTDIR%%/STIXSizFiveSymReg.otf
+%%FONTDIR%%/STIXSizFourSymBol.otf
+%%FONTDIR%%/STIXSizFourSymReg.otf
+%%FONTDIR%%/STIXSizOneSymBol.otf
+%%FONTDIR%%/STIXSizOneSymReg.otf
+%%FONTDIR%%/STIXSizThreeSymBol.otf
+%%FONTDIR%%/STIXSizThreeSymReg.otf
+%%FONTDIR%%/STIXSizTwoSymBol.otf
+%%FONTDIR%%/STIXSizTwoSymReg.otf
 %%FONTDIR%%/STIXVar.otf
 %%FONTDIR%%/STIXVarBol.otf
 %%FONTDIR%%/fonts.dir