Merge branch 'master' into gnome-3.24

7 files changed, 39 insertions, 44 deletions

diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 438ea2591bd1..ce0f1041ba85 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -17,6 +17,7 @@ USES=		fonts zip
 SUB_FILES=	pkg-message
 
 NO_BUILD=	yes
+NO_ARCH=	yes
 
 post-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/x11-fonts/code2000/pkg-descr b/x11-fonts/code2000/pkg-descr
index 080b2046caba..5cd207ed8c5a 100644
--- a/x11-fonts/code2000/pkg-descr
+++ b/x11-fonts/code2000/pkg-descr
@@ -4,4 +4,4 @@ version 1.16).
 With Unicode-aware applications you'll be able to display and use special
 characters and a lot of languages.
 
-WWW: http://en.wikipedia.org/wiki/Code2000
+WWW: https://en.wikipedia.org/wiki/Code2000
diff --git a/x11-fonts/gnu-unifont-ttf/Makefile b/x11-fonts/gnu-unifont-ttf/Makefile
index 7ec6dfb68a5e..b7437eb689be 100644
--- a/x11-fonts/gnu-unifont-ttf/Makefile
+++ b/x11-fonts/gnu-unifont-ttf/Makefile
@@ -1,30 +1,15 @@
 # $FreeBSD$
 
-PORTNAME=	gnu-unifont-ttf
-PORTVERSION=	7.0.03
-PORTREVISION=	1
-PORTEPOCH=	1
-CATEGORIES=	x11-fonts
-MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
-DISTNAME=	unifont-${PORTVERSION}
+MASTERDIR=	${.CURDIR}/../gnu-unifont
 
-MAINTAINER=	bsdports@gmail.com
-COMMENT=	Unicode TrueType Font
+PKGNAMESUFFIX=	-ttf
 
-USES=		fonts
+COMMENT=	GNU Unicode TrueType font
 
-NO_BUILD=	yes
-WRKSRC_SUBDIR=	font/precompiled
+FONTFILES=	${PORTNAME} ${PORTNAME}_csur ${PORTNAME}_upper
+FONTSUFFIX=	.ttf
 
-do-install:
-	@${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/unifont-${PORTVERSION}.ttf \
-		${STAGEDIR}${FONTSDIR}/unifont.ttf
-	${INSTALL_DATA} ${WRKSRC}/unifont_csur-${PORTVERSION}.ttf \
-		${STAGEDIR}${FONTSDIR}/unifont_csur.ttf
-	${INSTALL_DATA} ${WRKSRC}/unifont_upper-${PORTVERSION}.ttf \
-		${STAGEDIR}${FONTSDIR}/unifont_upper.ttf
-	${INSTALL_DATA} ${WRKSRC}/unifont_upper_csur-${PORTVERSION}.ttf \
-		${STAGEDIR}${FONTSDIR}/unifont_upper_csur.ttf
+DESCR=		${.CURDIR}/pkg-descr
+DISTINFO_FILE=	${.CURDIR}/distinfo
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/x11-fonts/gnu-unifont-ttf/distinfo b/x11-fonts/gnu-unifont-ttf/distinfo
index da903576d772..6c700644c7c3 100644
--- a/x11-fonts/gnu-unifont-ttf/distinfo
+++ b/x11-fonts/gnu-unifont-ttf/distinfo
@@ -1,2 +1,7 @@
-SHA256 (unifont-7.0.03.tar.gz) = 3b5f2f3aa1bee9fdd3b23b17c0a3206948c3148dfd3ca0404696ea06d63c72cd
-SIZE (unifont-7.0.03.tar.gz) = 18372349
+TIMESTAMP = 1503957706
+SHA256 (unifont-10.0.06.ttf) = 669a9764fb640c832a8ebfbd2c351be744b55c6f65b40f1fb203144309659ac0
+SIZE (unifont-10.0.06.ttf) = 12291504
+SHA256 (unifont_csur-10.0.06.ttf) = c6bbd70acb29bec83611732cce1e41953c48cb59516506dbf0ed94a23f71753a
+SIZE (unifont_csur-10.0.06.ttf) = 750816
+SHA256 (unifont_upper-10.0.06.ttf) = be9d9670632b65113bc280d687fbc806990847f6b4567af89f1db45ae97f5b92
+SIZE (unifont_upper-10.0.06.ttf) = 1375664
diff --git a/x11-fonts/gnu-unifont-ttf/pkg-plist b/x11-fonts/gnu-unifont-ttf/pkg-plist
deleted file mode 100644
index f4701aefec45..000000000000
--- a/x11-fonts/gnu-unifont-ttf/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%FONTSDIR%%/unifont.ttf
-%%FONTSDIR%%/unifont_csur.ttf
-%%FONTSDIR%%/unifont_upper.ttf
-%%FONTSDIR%%/unifont_upper_csur.ttf
diff --git a/x11-fonts/gnu-unifont/Makefile b/x11-fonts/gnu-unifont/Makefile
index 26a3d007e994..e33896f58286 100644
--- a/x11-fonts/gnu-unifont/Makefile
+++ b/x11-fonts/gnu-unifont/Makefile
@@ -1,26 +1,33 @@
 # $FreeBSD$
 
-PORTNAME=	gnu-unifont
-PORTVERSION=	7.0.03
-PORTREVISION=	1
+PORTNAME=	unifont
+PORTVERSION=	10.0.06
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	GNU/unifont/unifont-${PORTVERSION}
-DISTNAME=	unifont-${PORTVERSION}.pcf
-EXTRACT_SUFX=	.gz
+MASTER_SITES=	GNU/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMEPREFIX=	gnu-
+DISTFILES=	${FONTFILES:S|$|-${PORTVERSION}${FONTSUFFIX}|}
 EXTRACT_ONLY=
 
-MAINTAINER=	bsdports@gmail.com
-COMMENT=	Unicode Font
+MAINTAINER=	ports@FreeBSD.org
+COMMENT?=	GNU Unicode font
 
-USES=		fonts
+LICENSE=	GPLv2+
+
+FONTFILES?=	${PORTNAME}
+FONTSUFFIX?=	.pcf.gz
 
+FONTSDIR=	${PREFIX}/share/fonts/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
+NO_ARCH=	yes
 NO_BUILD=	yes
-PLIST_FILES=	${FONTSDIR}/unifont.pcf.gz
+PLIST_FILES=	${FONTFILES:S|^|${FONTSDIR}/|:S|$|${FONTSUFFIX}|}
+USES=		fonts
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FONTSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		${STAGEDIR}${FONTSDIR}/unifont.pcf.gz
+.for i in ${FONTFILES}
+	${INSTALL_DATA} ${DISTDIR}/${i}-${PORTVERSION}${FONTSUFFIX} \
+	    ${STAGEDIR}${FONTSDIR}/${i}${FONTSUFFIX}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/gnu-unifont/distinfo b/x11-fonts/gnu-unifont/distinfo
index 7e3062605256..a8440f19a7fe 100644
--- a/x11-fonts/gnu-unifont/distinfo
+++ b/x11-fonts/gnu-unifont/distinfo
@@ -1,2 +1,3 @@
-SHA256 (unifont-7.0.03.pcf.gz) = cffed831498eb67933acbf2a7e398d64a7e3bf97a784a10fc999db51891cc515
-SIZE (unifont-7.0.03.pcf.gz) = 1358950
+TIMESTAMP = 1503957691
+SHA256 (unifont-10.0.06.pcf.gz) = 60465589797f6581efc43af8c4a471e45b9513ea15b0009379caeaec3caff37a
+SIZE (unifont-10.0.06.pcf.gz) = 1360484