6 files changed, 34 insertions, 36 deletions

diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index 5fdb431acdbf..44b400091362 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -6,47 +6,46 @@
 #
 
 PORTNAME=	CharisSIL
-PORTVERSION=	4.106
+PORTVERSION=	4.110
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/
+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
+		LOCAL/bf
 MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
-DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Charis SIL TrueType font collection
 
+LICENSE=	OFL
+LICENSE_NAME=	SIL Open Font License (OFL)
+LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_PERMS=	auto-accept
+
 USE_ZIP=	yes
 XORG_CAT=	font
 
-FONTROOTDIR=	${PREFIX}/lib/X11/fonts/${FONTDIR}
+FONTROOTDIR=	${PREFIX}/lib/X11/fonts
 INSTALLS_TTF=	yes
-MEDIA_ID=	${DISTNAME}b${EXTRACT_SUFX}
+MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
 USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-LICENSE=	OFL
-LICENSE_FILE=	${WRKSRC}/OFL.txt
-LICENSE_NAME=	SIL Open Font License (OFL)
-LICENSE_PERMS=	auto-accept
 
 .for type in B BI I R
-PLIST_FILES+=	${FONTROOTDIR:S/${PREFIX}\///}/${PORTNAME}${type}.ttf
+PLIST_FILES+=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf
 .endfor
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
 .endif
 
-SUB_LIST=	FONTROOTDIR="${FONTROOTDIR}"
+SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
 do-configure:
 	@${DO_NADA}
 
 do-install:
-	@${MKDIR} ${FONTROOTDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR})
+	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
diff --git a/x11-fonts/charis/distinfo b/x11-fonts/charis/distinfo
index 402c494a6733..2bb9b9991016 100644
--- a/x11-fonts/charis/distinfo
+++ b/x11-fonts/charis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/CharisSIL4.106.zip) = 8902f6091fac3d96a50a1d7250f73ddeba4a1f93055632c87338e500e87055d8
-SIZE (xorg/font/CharisSIL4.106.zip) = 2134757
+SHA256 (xorg/font/CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264
+SIZE (xorg/font/CharisSIL-4.110.zip) = 3435758
diff --git a/x11-fonts/charis/files/pkg-message.in b/x11-fonts/charis/files/pkg-message.in
index ddfde34f6a7b..b648d77200d4 100644
--- a/x11-fonts/charis/files/pkg-message.in
+++ b/x11-fonts/charis/files/pkg-message.in
@@ -1,7 +1,7 @@
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
-	FontPath "%%FONTROOTDIR%%/"
+	FontPath "%%DIR%%/"
 
 Users of older versions of X may additionally have to make sure that
 the freetype module is loaded.  Check /var/log/Xorg.0.log for error
diff --git a/x11-fonts/doulos/Makefile b/x11-fonts/doulos/Makefile
index dc4eda83eea5..9638588b3253 100644
--- a/x11-fonts/doulos/Makefile
+++ b/x11-fonts/doulos/Makefile
@@ -6,45 +6,44 @@
 #
 
 PORTNAME=	DoulosSIL
-PORTVERSION=	4.106
+PORTVERSION=	4.110
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/
+MASTER_SITES=	http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
+		LOCAL/bf
 MASTER_SITE_SUBDIR=	#prevent bsd.xorg.mk from setting a default subdirectory
-DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	bf@FreeBSD.org
 COMMENT=	Doulos SIL TrueType font collection
 
+LICENSE=	OFL
+LICENSE_NAME=	SIL Open Font License (OFL)
+LICENSE_FILE=	${WRKSRC}/OFL.txt
+LICENSE_PERMS=	auto-accept
+
 USE_ZIP=	yes
 XORG_CAT=	font
 
-FONTROOTDIR=	${PREFIX}/lib/X11/fonts/${FONTDIR}
+FONTROOTDIR=	${PREFIX}/lib/X11/fonts
 INSTALLS_TTF=	yes
-MEDIA_ID=	${DISTNAME}b${EXTRACT_SUFX}
+MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
 USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-LICENSE=	OFL
-LICENSE_FILE=	${WRKSRC}/OFL.txt
-LICENSE_NAME=	SIL Open Font License (OFL)
-LICENSE_PERMS=	auto-accept
 
-PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${PORTNAME}R.ttf
+PLIST_FILES=	${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-R.ttf
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
 .endif
 
-SUB_LIST=	FONTROOTDIR="${FONTROOTDIR}"
+SUB_LIST=	DIR="${FONTROOTDIR}/${FONTDIR}"
 SUB_FILES=	pkg-message
 
 do-configure:
 	@${DO_NADA}
 
 do-install:
-	@${MKDIR} ${FONTROOTDIR}
-	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR})
+	@${MKDIR} ${FONTROOTDIR}/${FONTDIR}
+	@(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
diff --git a/x11-fonts/doulos/distinfo b/x11-fonts/doulos/distinfo
index 41d2a5651000..c0ce2200fc79 100644
--- a/x11-fonts/doulos/distinfo
+++ b/x11-fonts/doulos/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/DoulosSIL4.106.zip) = 721a8f2e960aa3b826901854c99fdf7f10407d21d12b33630ecd58fde51697a9
-SIZE (xorg/font/DoulosSIL4.106.zip) = 576928
+SHA256 (xorg/font/DoulosSIL-4.110.zip) = 8bb5701a182e9100be44dfbfc68535f2c0a5310368b25aee62280fa73194b16d
+SIZE (xorg/font/DoulosSIL-4.110.zip) = 1498994
diff --git a/x11-fonts/doulos/files/pkg-message.in b/x11-fonts/doulos/files/pkg-message.in
index ddfde34f6a7b..b648d77200d4 100644
--- a/x11-fonts/doulos/files/pkg-message.in
+++ b/x11-fonts/doulos/files/pkg-message.in
@@ -1,7 +1,7 @@
 To use these fonts, add the following line to the "Files" section of
 xorg.conf:
 
-	FontPath "%%FONTROOTDIR%%/"
+	FontPath "%%DIR%%/"
 
 Users of older versions of X may additionally have to make sure that
 the freetype module is loaded.  Check /var/log/Xorg.0.log for error