4 files changed, 22 insertions, 109 deletions

diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 63698aad15b9..b2705835736e 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -2,21 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	stixfonts
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF/${PORTNAME}/Current%20Release/
-DISTNAME=	STIXv${PORTVERSION}-webfonts
+DISTNAME=	STIXv${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	OpenType Unicode fonts for Scientific, Technical, and Math texts
 
 LICENSE=	OFL11
 
-NO_WRKSUBDIR=	yes
-
 USES=		fonts zip
 USE_XORG=	x11
+NO_ARCH=	yes
+NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
@@ -24,18 +23,12 @@ FONTNAME=	stix
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	"STIX Font ${PORTVERSION}-webfonts Release Documentation.pdf"
-
-do-build:
-	${MKDIR} ${WRKDIR}/build
-.for group in stix-web STIX-MathJax/woff
-	${CP} ${WRKSRC}/${group}/*.woff ${WRKDIR}/build/
-.endfor
+PORTDOCS=	STIX_${PORTVERSION}_release_notes.txt STIX_${PORTVERSION}_stylistic_sets.pdf
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	cd ${WRKDIR}/build && ${INSTALL_DATA} *.woff ${STAGEDIR}${FONTSDIR}
+	cd ${WRKSRC}/Fonts && ${INSTALL_DATA} OTF/* WOFF/* ${STAGEDIR}${FONTSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/stix-fonts/distinfo b/x11-fonts/stix-fonts/distinfo
index 704f44c4c543..738a3691e71b 100644
--- a/x11-fonts/stix-fonts/distinfo
+++ b/x11-fonts/stix-fonts/distinfo
@@ -1,2 +1,3 @@
-SHA256 (STIXv1.1.1-webfonts.zip) = 21924384f2a5323e3b80cd2d7d811ca7e87c0b0e1272505824160a82b5715605
-SIZE (STIXv1.1.1-webfonts.zip) = 4277613
+TIMESTAMP = 1519558758
+SHA256 (STIXv2.0.0.zip) = 6fac297b27c78891aeca9adb37be54729932e57cdcdb218a9e163671c163d938
+SIZE (STIXv2.0.0.zip) = 3921396
diff --git a/x11-fonts/stix-fonts/pkg-descr b/x11-fonts/stix-fonts/pkg-descr
index 5a80eab8d060..6848e6e2ea4d 100644
--- a/x11-fonts/stix-fonts/pkg-descr
+++ b/x11-fonts/stix-fonts/pkg-descr
@@ -1,12 +1,5 @@
 The mission of the Scientific and Technical Information Exchange (STIX) font
-creation project is the preparation of a comprehensive set of fonts that serve
-the scientific and engineering community in the process from manuscript creation
-through final publication, both in electronic and print formats. Toward this
-purpose, the STIX fonts will be made available, under royalty-free license, to
-anyone, including publishers, software developers, scientists, students, and the
-general public.
-
-These fonts cover all the symbols in MathML and this port can replace the former
-x11-fonts/mathfonts.
+project is the creation of a comprehensive set of fonts that serve the
+scientific and engineering communities.
 
 WWW: http://www.stixfonts.org/
diff --git a/x11-fonts/stix-fonts/pkg-plist b/x11-fonts/stix-fonts/pkg-plist
index e6d23d2d0091..e6d186d363b5 100644
--- a/x11-fonts/stix-fonts/pkg-plist
+++ b/x11-fonts/stix-fonts/pkg-plist
@@ -1,84 +1,10 @@
-%%FONTSDIR%%/STIXGeneral-Bold.woff
-%%FONTSDIR%%/STIXGeneral-BoldItalic.woff
-%%FONTSDIR%%/STIXGeneral-Italic.woff
-%%FONTSDIR%%/STIXGeneral-Regular.woff
-%%FONTSDIR%%/STIXIntegralsD-Bold.woff
-%%FONTSDIR%%/STIXIntegralsD-Regular.woff
-%%FONTSDIR%%/STIXIntegralsSm-Bold.woff
-%%FONTSDIR%%/STIXIntegralsSm-Regular.woff
-%%FONTSDIR%%/STIXIntegralsUp-Bold.woff
-%%FONTSDIR%%/STIXIntegralsUp-Regular.woff
-%%FONTSDIR%%/STIXIntegralsUpD-Bold.woff
-%%FONTSDIR%%/STIXIntegralsUpD-Regular.woff
-%%FONTSDIR%%/STIXIntegralsUpSm-Bold.woff
-%%FONTSDIR%%/STIXIntegralsUpSm-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Alphabets-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Alphabets-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Alphabets-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Alphabets-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Arrows-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Arrows-Regular.woff
-%%FONTSDIR%%/STIXMathJax_DoubleStruck-Bold.woff
-%%FONTSDIR%%/STIXMathJax_DoubleStruck-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_DoubleStruck-Italic.woff
-%%FONTSDIR%%/STIXMathJax_DoubleStruck-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Fraktur-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Fraktur-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Latin-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Latin-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Latin-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Latin-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Main-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Main-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Main-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Main-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Marks-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Marks-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Marks-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Marks-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Misc-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Misc-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Misc-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Misc-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Monospace-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Normal-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Normal-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Normal-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Operators-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Operators-Regular.woff
-%%FONTSDIR%%/STIXMathJax_SansSerif-Bold.woff
-%%FONTSDIR%%/STIXMathJax_SansSerif-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_SansSerif-Italic.woff
-%%FONTSDIR%%/STIXMathJax_SansSerif-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Script-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Script-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Script-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Shapes-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Shapes-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Shapes-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Size1-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Size2-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Size3-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Size4-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Size5-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Symbols-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Symbols-Regular.woff
-%%FONTSDIR%%/STIXMathJax_Variants-Bold.woff
-%%FONTSDIR%%/STIXMathJax_Variants-BoldItalic.woff
-%%FONTSDIR%%/STIXMathJax_Variants-Italic.woff
-%%FONTSDIR%%/STIXMathJax_Variants-Regular.woff
-%%FONTSDIR%%/STIXNonUnicode-Bold.woff
-%%FONTSDIR%%/STIXNonUnicode-BoldItalic.woff
-%%FONTSDIR%%/STIXNonUnicode-Italic.woff
-%%FONTSDIR%%/STIXNonUnicode-Regular.woff
-%%FONTSDIR%%/STIXSizeFiveSym-Regular.woff
-%%FONTSDIR%%/STIXSizeFourSym-Bold.woff
-%%FONTSDIR%%/STIXSizeFourSym-Regular.woff
-%%FONTSDIR%%/STIXSizeOneSym-Bold.woff
-%%FONTSDIR%%/STIXSizeOneSym-Regular.woff
-%%FONTSDIR%%/STIXSizeThreeSym-Bold.woff
-%%FONTSDIR%%/STIXSizeThreeSym-Regular.woff
-%%FONTSDIR%%/STIXSizeTwoSym-Bold.woff
-%%FONTSDIR%%/STIXSizeTwoSym-Regular.woff
-%%FONTSDIR%%/STIXVariants-Bold.woff
-%%FONTSDIR%%/STIXVariants-Regular.woff
+%%FONTSDIR%%/STIX2Math.otf
+%%FONTSDIR%%/STIX2Math.woff
+%%FONTSDIR%%/STIX2Text-Bold.otf
+%%FONTSDIR%%/STIX2Text-Bold.woff
+%%FONTSDIR%%/STIX2Text-BoldItalic.otf
+%%FONTSDIR%%/STIX2Text-BoldItalic.woff
+%%FONTSDIR%%/STIX2Text-Italic.otf
+%%FONTSDIR%%/STIX2Text-Italic.woff
+%%FONTSDIR%%/STIX2Text-Regular.otf
+%%FONTSDIR%%/STIX2Text-Regular.woff