[Midnightbsd-cvs] mports [24925] trunk/x11-fonts: update xorg fonts

[laffer1 at midnightbsd.org]

Revision: 24925
          http://svnweb.midnightbsd.org/mports/?rev=24925
Author:   laffer1
Date:     2019-02-09 11:33:05 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update xorg fonts

Modified Paths:
--------------
    trunk/x11-fonts/libFS/Makefile
    trunk/x11-fonts/libXfont/Makefile
    trunk/x11-fonts/libXfont2/Makefile
    trunk/x11-fonts/libXfontcache/Makefile
    trunk/x11-fonts/libXft/Makefile
    trunk/x11-fonts/libfontenc/Makefile
    trunk/x11-fonts/mkfontscale/Makefile

Modified: trunk/x11-fonts/libFS/Makefile
===================================================================
--- trunk/x11-fonts/libFS/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libFS/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libFS
 PORTVERSION=	1.0.7
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -10,7 +11,7 @@
 LICENSE=	mit
 
 XORG_CAT=	lib
-USE_XORG=	fontsproto:both xproto:both xtrans
+USE_XORG=	xorgproto xtrans
 USES+=	cpe
 CPE_PRODUCT=	libfs
 CPE_VENDOR=	x

Modified: trunk/x11-fonts/libXfont/Makefile
===================================================================
--- trunk/x11-fonts/libXfont/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libXfont/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libXfont
 PORTVERSION=	1.5.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 
@@ -8,14 +9,15 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	X font library
 
-LICENSE=	bsd4
+LICENSE=	mit bsd2 bsd3
+LICENSE_COMB=	multi
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
+USES=		cpe
 XORG_CAT=	lib
-USE_XORG=	xproto:both xtrans fontsproto:both fontenc
+USE_XORG=	xorgproto xtrans fontenc
 INSTALL_TARGET=	install-strip
-USES+=	cpe
 CPE_PRODUCT=	libxfont
 CPE_VENDOR=	x
 

Modified: trunk/x11-fonts/libXfont2/Makefile
===================================================================
--- trunk/x11-fonts/libXfont2/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libXfont2/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libXfont2
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -12,7 +13,7 @@
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	lib
-USE_XORG=	xproto:both xtrans fontsproto:both fontenc
+USE_XORG=	xorgproto xtrans fontenc
 INSTALL_TARGET=	install-strip
 #USES+=	cpe
 #CPE_PRODUCT=	libxfont

Modified: trunk/x11-fonts/libXfontcache/Makefile
===================================================================
--- trunk/x11-fonts/libXfontcache/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libXfontcache/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXfontcache
 PORTVERSION=	1.0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,6 +11,6 @@
 LICENSE=	mit
 
 XORG_CAT=	lib
-USE_XORG=	fontcacheproto:both x11 xext xextproto
+USE_XORG=	x11 xext xorgproto
 
 .include <bsd.port.mk>

Modified: trunk/x11-fonts/libXft/Makefile
===================================================================
--- trunk/x11-fonts/libXft/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libXft/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libXft
 PORTVERSION=	2.3.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -14,7 +14,7 @@
 		libfontconfig.so:x11-fonts/fontconfig
 
 XORG_CAT=	lib
-USE_XORG=	xproto:both xrender
+USE_XORG=	xorgproto xrender
 INSTALL_TARGET=	install-strip
 
 post-extract:

Modified: trunk/x11-fonts/libfontenc/Makefile
===================================================================
--- trunk/x11-fonts/libfontenc/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/libfontenc/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,6 +2,7 @@
 
 PORTNAME=	libfontenc
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -11,6 +12,8 @@
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 XORG_CAT=	lib
-USE_XORG=	xproto
+USE_XORG=	xorgproto
 
+CONFIGURE_ARGS=	--with-encodingsdir=${LOCALBASE}/share/fonts/encodings
+
 .include <bsd.port.mk>

Modified: trunk/x11-fonts/mkfontscale/Makefile
===================================================================
--- trunk/x11-fonts/mkfontscale/Makefile	2019-02-09 16:32:12 UTC (rev 24924)
+++ trunk/x11-fonts/mkfontscale/Makefile	2019-02-09 16:33:05 UTC (rev 24925)
@@ -2,6 +2,7 @@
 
 PORTNAME=	mkfontscale
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -9,10 +10,10 @@
 
 LICENSE=	mit
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:print/freetype2
 
 XORG_CAT=	app
-USE_XORG=	xproto fontenc
+USE_XORG=	xorgproto fontenc
 
 CONFIGURE_ARGS+=--disable-maintainer-mode