3 files changed, 97 insertions, 56 deletions

diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 0bb88cf95bf0..f019cb695e8b 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -2,13 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	stixfonts
-PORTVERSION=	1.1.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF/${PORTNAME}/
-DISTNAME=	STIXv${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/Current%20Release/
+DISTNAME=	STIXv${PORTVERSION}-webfonts
 
 MAINTAINER=	thierry@FreeBSD.org
-COMMENT=	A comprehensive set of fonts for scientific and engineering purposes
+COMMENT=	OpenType Unicode fonts for Scientific, Technical, and Math texts
 
 LICENSE=	OFL11
 
@@ -36,33 +36,24 @@ MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 FCCACHE=	${LOCALBASE}/bin/fc-cache -f -v
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	STIXv${PORTVERSION}.pdf
+PORTDOCS=	"STIX Font ${PORTVERSION}-webfonts Release Documentation.pdf"
 .endif
 
-NO_STAGE=	yes
 do-build:
 	${MKDIR} ${WRKDIR}/build
-.for group in STIX-General STIX-Word
-	${CP} ${WRKSRC}/Fonts/${group}/*.otf ${WRKDIR}/build
+.for group in stix-web STIX-MathJax/woff
+	${CP} ${WRKSRC}/${group}/*.woff ${WRKDIR}/build/
 .endfor
 	cd ${WRKDIR}/build && ${MKFONTSCL_CMD}
 	${REINPLACE_CMD} -e 's|-misc-|-stix-|' ${WRKDIR}/build/fonts.scale
 	cd ${WRKDIR}/build && ${MKFONTDIR_CMD}
 
 do-install:
-	${MKDIR} ${FONTDIR}
-	cd ${WRKDIR}/build && ${INSTALL_DATA} fonts.dir fonts.scale *.otf ${FONTDIR}
-	cd ${FONTDIR} && ${MKFONTDIR_CMD}
+	${MKDIR} ${STAGEDIR}${FONTDIR}
+	cd ${WRKDIR}/build && ${INSTALL_DATA} fonts.dir fonts.scale *.woff ${STAGEDIR}${FONTDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 .endif
 
-post-install:
-	@${ECHO_MSG} "===> Running fc-cache"
-	-${FCCACHE} ${FONTDIR}
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
 .include <bsd.port.mk>
diff --git a/x11-fonts/stix-fonts/distinfo b/x11-fonts/stix-fonts/distinfo
index a5371cde351e..704f44c4c543 100644
--- a/x11-fonts/stix-fonts/distinfo
+++ b/x11-fonts/stix-fonts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (STIXv1.1.0.zip) = f63d3523fb492dd09a3f30d40eb3a89bc3159f86c8b720014805b27f368270be
-SIZE (STIXv1.1.0.zip) = 2722656
+SHA256 (STIXv1.1.1-webfonts.zip) = 21924384f2a5323e3b80cd2d7d811ca7e87c0b0e1272505824160a82b5715605
+SIZE (STIXv1.1.1-webfonts.zip) = 4277613
diff --git a/x11-fonts/stix-fonts/pkg-plist b/x11-fonts/stix-fonts/pkg-plist
index 586ecd756e45..6fe7365e3ec3 100644
--- a/x11-fonts/stix-fonts/pkg-plist
+++ b/x11-fonts/stix-fonts/pkg-plist
@@ -1,37 +1,87 @@
-%%FONTDIR%%/STIX-Bold.otf
-%%FONTDIR%%/STIX-BoldItalic.otf
-%%FONTDIR%%/STIX-Italic.otf
-%%FONTDIR%%/STIX-Regular.otf
-%%FONTDIR%%/STIXGeneral-Bold.otf
-%%FONTDIR%%/STIXGeneral-BoldItalic.otf
-%%FONTDIR%%/STIXGeneral-Italic.otf
-%%FONTDIR%%/STIXGeneral-Regular.otf
-%%FONTDIR%%/STIXIntegralsD-Bold.otf
-%%FONTDIR%%/STIXIntegralsD-Regular.otf
-%%FONTDIR%%/STIXIntegralsSm-Bold.otf
-%%FONTDIR%%/STIXIntegralsSm-Regular.otf
-%%FONTDIR%%/STIXIntegralsUp-Bold.otf
-%%FONTDIR%%/STIXIntegralsUp-Regular.otf
-%%FONTDIR%%/STIXIntegralsUpD-Bold.otf
-%%FONTDIR%%/STIXIntegralsUpD-Regular.otf
-%%FONTDIR%%/STIXIntegralsUpSm-Bold.otf
-%%FONTDIR%%/STIXIntegralsUpSm-Regular.otf
-%%FONTDIR%%/STIXMath-Regular.otf
-%%FONTDIR%%/STIXNonUnicode-Bold.otf
-%%FONTDIR%%/STIXNonUnicode-BoldItalic.otf
-%%FONTDIR%%/STIXNonUnicode-Italic.otf
-%%FONTDIR%%/STIXNonUnicode-Regular.otf
-%%FONTDIR%%/STIXSizeFiveSym-Regular.otf
-%%FONTDIR%%/STIXSizeFourSym-Bold.otf
-%%FONTDIR%%/STIXSizeFourSym-Regular.otf
-%%FONTDIR%%/STIXSizeOneSym-Bold.otf
-%%FONTDIR%%/STIXSizeOneSym-Regular.otf
-%%FONTDIR%%/STIXSizeThreeSym-Bold.otf
-%%FONTDIR%%/STIXSizeThreeSym-Regular.otf
-%%FONTDIR%%/STIXSizeTwoSym-Bold.otf
-%%FONTDIR%%/STIXSizeTwoSym-Regular.otf
-%%FONTDIR%%/STIXVariants-Bold.otf
-%%FONTDIR%%/STIXVariants-Regular.otf
+%%FONTDIR%%/STIXGeneral-Bold.woff
+%%FONTDIR%%/STIXGeneral-BoldItalic.woff
+%%FONTDIR%%/STIXGeneral-Italic.woff
+%%FONTDIR%%/STIXGeneral-Regular.woff
+%%FONTDIR%%/STIXIntegralsD-Bold.woff
+%%FONTDIR%%/STIXIntegralsD-Regular.woff
+%%FONTDIR%%/STIXIntegralsSm-Bold.woff
+%%FONTDIR%%/STIXIntegralsSm-Regular.woff
+%%FONTDIR%%/STIXIntegralsUp-Bold.woff
+%%FONTDIR%%/STIXIntegralsUp-Regular.woff
+%%FONTDIR%%/STIXIntegralsUpD-Bold.woff
+%%FONTDIR%%/STIXIntegralsUpD-Regular.woff
+%%FONTDIR%%/STIXIntegralsUpSm-Bold.woff
+%%FONTDIR%%/STIXIntegralsUpSm-Regular.woff
+%%FONTDIR%%/STIXMathJax_Alphabets-Bold.woff
+%%FONTDIR%%/STIXMathJax_Alphabets-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Alphabets-Italic.woff
+%%FONTDIR%%/STIXMathJax_Alphabets-Regular.woff
+%%FONTDIR%%/STIXMathJax_Arrows-Bold.woff
+%%FONTDIR%%/STIXMathJax_Arrows-Regular.woff
+%%FONTDIR%%/STIXMathJax_DoubleStruck-Bold.woff
+%%FONTDIR%%/STIXMathJax_DoubleStruck-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_DoubleStruck-Italic.woff
+%%FONTDIR%%/STIXMathJax_DoubleStruck-Regular.woff
+%%FONTDIR%%/STIXMathJax_Fraktur-Bold.woff
+%%FONTDIR%%/STIXMathJax_Fraktur-Regular.woff
+%%FONTDIR%%/STIXMathJax_Latin-Bold.woff
+%%FONTDIR%%/STIXMathJax_Latin-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Latin-Italic.woff
+%%FONTDIR%%/STIXMathJax_Latin-Regular.woff
+%%FONTDIR%%/STIXMathJax_Main-Bold.woff
+%%FONTDIR%%/STIXMathJax_Main-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Main-Italic.woff
+%%FONTDIR%%/STIXMathJax_Main-Regular.woff
+%%FONTDIR%%/STIXMathJax_Marks-Bold.woff
+%%FONTDIR%%/STIXMathJax_Marks-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Marks-Italic.woff
+%%FONTDIR%%/STIXMathJax_Marks-Regular.woff
+%%FONTDIR%%/STIXMathJax_Misc-Bold.woff
+%%FONTDIR%%/STIXMathJax_Misc-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Misc-Italic.woff
+%%FONTDIR%%/STIXMathJax_Misc-Regular.woff
+%%FONTDIR%%/STIXMathJax_Monospace-Regular.woff
+%%FONTDIR%%/STIXMathJax_Normal-Bold.woff
+%%FONTDIR%%/STIXMathJax_Normal-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Normal-Italic.woff
+%%FONTDIR%%/STIXMathJax_Operators-Bold.woff
+%%FONTDIR%%/STIXMathJax_Operators-Regular.woff
+%%FONTDIR%%/STIXMathJax_SansSerif-Bold.woff
+%%FONTDIR%%/STIXMathJax_SansSerif-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_SansSerif-Italic.woff
+%%FONTDIR%%/STIXMathJax_SansSerif-Regular.woff
+%%FONTDIR%%/STIXMathJax_Script-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Script-Italic.woff
+%%FONTDIR%%/STIXMathJax_Script-Regular.woff
+%%FONTDIR%%/STIXMathJax_Shapes-Bold.woff
+%%FONTDIR%%/STIXMathJax_Shapes-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Shapes-Regular.woff
+%%FONTDIR%%/STIXMathJax_Size1-Regular.woff
+%%FONTDIR%%/STIXMathJax_Size2-Regular.woff
+%%FONTDIR%%/STIXMathJax_Size3-Regular.woff
+%%FONTDIR%%/STIXMathJax_Size4-Regular.woff
+%%FONTDIR%%/STIXMathJax_Size5-Regular.woff
+%%FONTDIR%%/STIXMathJax_Symbols-Bold.woff
+%%FONTDIR%%/STIXMathJax_Symbols-Regular.woff
+%%FONTDIR%%/STIXMathJax_Variants-Bold.woff
+%%FONTDIR%%/STIXMathJax_Variants-BoldItalic.woff
+%%FONTDIR%%/STIXMathJax_Variants-Italic.woff
+%%FONTDIR%%/STIXMathJax_Variants-Regular.woff
+%%FONTDIR%%/STIXNonUnicode-Bold.woff
+%%FONTDIR%%/STIXNonUnicode-BoldItalic.woff
+%%FONTDIR%%/STIXNonUnicode-Italic.woff
+%%FONTDIR%%/STIXNonUnicode-Regular.woff
+%%FONTDIR%%/STIXSizeFiveSym-Regular.woff
+%%FONTDIR%%/STIXSizeFourSym-Bold.woff
+%%FONTDIR%%/STIXSizeFourSym-Regular.woff
+%%FONTDIR%%/STIXSizeOneSym-Bold.woff
+%%FONTDIR%%/STIXSizeOneSym-Regular.woff
+%%FONTDIR%%/STIXSizeThreeSym-Bold.woff
+%%FONTDIR%%/STIXSizeThreeSym-Regular.woff
+%%FONTDIR%%/STIXSizeTwoSym-Bold.woff
+%%FONTDIR%%/STIXSizeTwoSym-Regular.woff
+%%FONTDIR%%/STIXVariants-Bold.woff
+%%FONTDIR%%/STIXVariants-Regular.woff
 %%FONTDIR%%/fonts.dir
 %%FONTDIR%%/fonts.scale
 @exec %%FCCACHE%% %D/%%FONTDIR%% 2>/dev/null || true