3 files changed, 63 insertions, 44 deletions

diff --git a/x11-fonts/stix-fonts/Makefile b/x11-fonts/stix-fonts/Makefile
index 45b3a52200bf..0c7e6d4b7b63 100644
--- a/x11-fonts/stix-fonts/Makefile
+++ b/x11-fonts/stix-fonts/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	stixfonts
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.0
 CATEGORIES=	x11-fonts
-MASTER_SITES=	SF/${PORTNAME}/CurrentRelease/
-# http://freefr.dl.sourceforge.net/project/stixfonts/CurrentRelease/STIXv1.0.0.zip
+MASTER_SITES=	SF/${PORTNAME}/
 DISTNAME=	STIXv${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A comprehensive set of fonts for scientific and engineering purposes
 
+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
+
 BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
+NO_WRKSUBDIR=	yes
+
 USE_ZIP=	yes
 USE_XORG=	x11
 
-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}'
 
@@ -41,14 +42,27 @@ MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
 MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 FCCACHE=	${LOCALBASE}/bin/fc-cache -f -v
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	STIXv${PORTVERSION}.pdf
+.endif
+
 do-build:
-	cd ${WRKSRC}/Fonts && ${MKFONTSCL_CMD}
-	${REINPLACE_CMD} -e 's|-misc-|-stix-|' ${WRKSRC}/Fonts/fonts.scale
-	cd ${WRKSRC}/Fonts && ${MKFONTDIR_CMD}
+	${MKDIR} ${WRKDIR}/build
+.for group in STIX-General STIX-Word
+	${CP} ${WRKSRC}/Fonts/${group}/*.otf ${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 ${WRKSRC}/Fonts && ${INSTALL_DATA} fonts.dir fonts.scale *.otf ${FONTDIR}
+	cd ${WRKDIR}/build && ${INSTALL_DATA} fonts.dir fonts.scale *.otf ${FONTDIR}
+	cd ${FONTDIR} && ${MKFONTDIR_CMD}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+.endif
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
diff --git a/x11-fonts/stix-fonts/distinfo b/x11-fonts/stix-fonts/distinfo
index b508712308fd..a5371cde351e 100644
--- a/x11-fonts/stix-fonts/distinfo
+++ b/x11-fonts/stix-fonts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (STIXv1.0.0.zip) = 2f10ee4deaf93e31d2fad6b4df2091e4c56b8c144499da4c0178fc0e4a873cfe
-SIZE (STIXv1.0.0.zip) = 2761626
+SHA256 (STIXv1.1.0.zip) = f63d3523fb492dd09a3f30d40eb3a89bc3159f86c8b720014805b27f368270be
+SIZE (STIXv1.1.0.zip) = 2722656
diff --git a/x11-fonts/stix-fonts/pkg-plist b/x11-fonts/stix-fonts/pkg-plist
index 32a1b43ff5d7..eb33ac83d29b 100644
--- a/x11-fonts/stix-fonts/pkg-plist
+++ b/x11-fonts/stix-fonts/pkg-plist
@@ -1,35 +1,40 @@
 @comment $FreeBSD$
-%%FONTDIR%%/STIXGeneral.otf
-%%FONTDIR%%/STIXGeneralBol.otf
-%%FONTDIR%%/STIXGeneralBolIta.otf
-%%FONTDIR%%/STIXGeneralItalic.otf
-%%FONTDIR%%/STIXIntDBol.otf
-%%FONTDIR%%/STIXIntDReg.otf
-%%FONTDIR%%/STIXIntSmBol.otf
-%%FONTDIR%%/STIXIntSmReg.otf
-%%FONTDIR%%/STIXIntUpBol.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%%/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%%/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%%/fonts.dir
 %%FONTDIR%%/fonts.scale
 @exec %%FCCACHE%% %D/%%FONTDIR%% 2>/dev/null || true
-@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
+@unexec rm %D/%%FONTDIR%%/fonts.cache-1 2>/dev/null || true
 @dirrm %%FONTDIR%%