- Welcome X.org 7.2 \o/.

- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.

4 files changed, 14 insertions, 118 deletions

diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 04299cf856aa..e80346d7a92e 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -6,34 +6,34 @@
 #
 
 PORTNAME=	xorg-fonts-cyrillic
-PORTVERSION=	6.9.0
-PORTREVISION=	1
+PORTVERSION=	7.2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_XORG}
-MASTER_SITE_SUBDIR=	X11R${PORTVERSION}/src
-DISTNAME=	X11R${PORTVERSION}-src1
+MASTER_SITES=	# none
+DISTFILES=	# none
+EXTRACT_ONLY=	# none
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org Cyrillic bitmap fonts
 
-BUILD_DEPENDS=	ucs2any:${PORTSDIR}/x11/xorg-clients
-RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/xorg-fonts-encodings
+RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx-cyrillic \
+		${FONTDIR}/cyrillic/koi12x24.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-cyrillic \
+		${FONTDIR}/cyrillic/screen8x16.pcf.gz:${PORTSDIR}/x11-fonts/font-screen-cyrillic \
+		${FONTDIR}/cyrillic/proof9x16.pcf.gz:${PORTSDIR}/x11-fonts/font-winitzki-cyrillic \
+		${FONTDIR}/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings
 
 CONFLICTS=	XFree86-fontCyrillic-*
 
-EXTRA_PATCHES=	${CF_PATCHES}
+NO_BUILD=	# none
+FONTDIR=	${X11BASE}/lib/X11/fonts
 
-XBUILD_DIRS=	fonts/encodings fonts/bdf/cyrillic
-XINSTALL_DIRS=	fonts/bdf/cyrillic
+do-install:	# empty
 
-post-install:
-	@command fc-cache -v ${PREFIX}/lib/X11/fonts/cyrillic || true
-
-.include "${.CURDIR}/../../x11-servers/xorg-server/Makefile.inc"
 .include <bsd.port.pre.mk>
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	is part of X.Org and you have ${X_WINDOW_SYSTEM} set for X11\
 	distribution. See The X Window System and Virtual Consoles chapter\
 	of FAQ for more information
 .endif
+
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/xorg-fonts-cyrillic/distinfo b/x11-fonts/xorg-fonts-cyrillic/distinfo
deleted file mode 100644
index 6f737f23f0df..000000000000
--- a/x11-fonts/xorg-fonts-cyrillic/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (xorg/X11R6.9.0-src1.tar.gz) = 9cd255a090e81e2c62637122794e6150
-SHA256 (xorg/X11R6.9.0-src1.tar.gz) = 30502fd1074ee7d782bae084c8c9b4872dcbf16dc45a2b944c6d0fc0e0c1a60c
-SIZE (xorg/X11R6.9.0-src1.tar.gz) = 33460996
diff --git a/x11-fonts/xorg-fonts-cyrillic/pkg-plist b/x11-fonts/xorg-fonts-cyrillic/pkg-plist
deleted file mode 100644
index 420ee72f398c..000000000000
--- a/x11-fonts/xorg-fonts-cyrillic/pkg-plist
+++ /dev/null
@@ -1,91 +0,0 @@
-lib/X11/fonts/cyrillic/crox1c.pcf.gz
-lib/X11/fonts/cyrillic/crox1cb.pcf.gz
-lib/X11/fonts/cyrillic/crox1cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1co.pcf.gz
-lib/X11/fonts/cyrillic/crox1h.pcf.gz
-lib/X11/fonts/cyrillic/crox1hb.pcf.gz
-lib/X11/fonts/cyrillic/crox1hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1ho.pcf.gz
-lib/X11/fonts/cyrillic/crox1t.pcf.gz
-lib/X11/fonts/cyrillic/crox1tb.pcf.gz
-lib/X11/fonts/cyrillic/crox1tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox1to.pcf.gz
-lib/X11/fonts/cyrillic/crox2c.pcf.gz
-lib/X11/fonts/cyrillic/crox2cb.pcf.gz
-lib/X11/fonts/cyrillic/crox2cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2co.pcf.gz
-lib/X11/fonts/cyrillic/crox2h.pcf.gz
-lib/X11/fonts/cyrillic/crox2hb.pcf.gz
-lib/X11/fonts/cyrillic/crox2hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2ho.pcf.gz
-lib/X11/fonts/cyrillic/crox2t.pcf.gz
-lib/X11/fonts/cyrillic/crox2tb.pcf.gz
-lib/X11/fonts/cyrillic/crox2tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox2to.pcf.gz
-lib/X11/fonts/cyrillic/crox3c.pcf.gz
-lib/X11/fonts/cyrillic/crox3cb.pcf.gz
-lib/X11/fonts/cyrillic/crox3cbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3co.pcf.gz
-lib/X11/fonts/cyrillic/crox3h.pcf.gz
-lib/X11/fonts/cyrillic/crox3hb.pcf.gz
-lib/X11/fonts/cyrillic/crox3hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3ho.pcf.gz
-lib/X11/fonts/cyrillic/crox3t.pcf.gz
-lib/X11/fonts/cyrillic/crox3tb.pcf.gz
-lib/X11/fonts/cyrillic/crox3tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox3to.pcf.gz
-lib/X11/fonts/cyrillic/crox4h.pcf.gz
-lib/X11/fonts/cyrillic/crox4hb.pcf.gz
-lib/X11/fonts/cyrillic/crox4hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox4ho.pcf.gz
-lib/X11/fonts/cyrillic/crox4t.pcf.gz
-lib/X11/fonts/cyrillic/crox4tb.pcf.gz
-lib/X11/fonts/cyrillic/crox4tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox4to.pcf.gz
-lib/X11/fonts/cyrillic/crox5h.pcf.gz
-lib/X11/fonts/cyrillic/crox5hb.pcf.gz
-lib/X11/fonts/cyrillic/crox5hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox5ho.pcf.gz
-lib/X11/fonts/cyrillic/crox5t.pcf.gz
-lib/X11/fonts/cyrillic/crox5tb.pcf.gz
-lib/X11/fonts/cyrillic/crox5tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox5to.pcf.gz
-lib/X11/fonts/cyrillic/crox6h.pcf.gz
-lib/X11/fonts/cyrillic/crox6hb.pcf.gz
-lib/X11/fonts/cyrillic/crox6hbo.pcf.gz
-lib/X11/fonts/cyrillic/crox6ho.pcf.gz
-lib/X11/fonts/cyrillic/crox6t.pcf.gz
-lib/X11/fonts/cyrillic/crox6tb.pcf.gz
-lib/X11/fonts/cyrillic/crox6tbo.pcf.gz
-lib/X11/fonts/cyrillic/crox6to.pcf.gz
-lib/X11/fonts/cyrillic/encodings.dir
-lib/X11/fonts/cyrillic/fonts.alias
-lib/X11/fonts/cyrillic/fonts.dir
-lib/X11/fonts/cyrillic/fonts.scale
-lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
-lib/X11/fonts/cyrillic/koi10x20.pcf.gz
-lib/X11/fonts/cyrillic/koi12x24.pcf.gz
-lib/X11/fonts/cyrillic/koi12x24b.pcf.gz
-lib/X11/fonts/cyrillic/koi5x8.pcf.gz
-lib/X11/fonts/cyrillic/koi6x10.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13.pcf.gz
-lib/X11/fonts/cyrillic/koi6x13b.pcf.gz
-lib/X11/fonts/cyrillic/koi6x9.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14.pcf.gz
-lib/X11/fonts/cyrillic/koi7x14b.pcf.gz
-lib/X11/fonts/cyrillic/koi8x13.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16.pcf.gz
-lib/X11/fonts/cyrillic/koi8x16b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15.pcf.gz
-lib/X11/fonts/cyrillic/koi9x15b.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18.pcf.gz
-lib/X11/fonts/cyrillic/koi9x18b.pcf.gz
-lib/X11/fonts/cyrillic/koinil2.pcf.gz
-lib/X11/fonts/cyrillic/proof9x16.pcf.gz
-lib/X11/fonts/cyrillic/screen8x16.pcf.gz
-lib/X11/fonts/cyrillic/screen8x16b.pcf.gz
-@exec command fc-cache -v %D/lib/X11/fonts/cyrillic 2>/dev/null || true
-@unexec rm %D/lib/X11/fonts/cyrillic/fonts.cache-1 2>/dev/null || true
-@unexec command fc-cache -v %D/lib/X11/fonts/cyrillic 2>/dev/null || true
-@unexec if [ -e %D/lib/X11/fonts/cyrillic/fonts.cache-1 -a ! -s %D/lib/X11/fonts/cyrillic/fonts.cache-1 ]; then rm %D/lib/X11/fonts/cyrillic/fonts.cache-1; fi
-@dirrmtry lib/X11/fonts/cyrillic
diff --git a/x11-fonts/xorg-fonts-cyrillic/scripts/configure b/x11-fonts/xorg-fonts-cyrillic/scripts/configure
deleted file mode 100644
index 39b6b5a1adfe..000000000000
--- a/x11-fonts/xorg-fonts-cyrillic/scripts/configure
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-LOCALDEF=$WRKDIR/.config
-
-rm -f $LOCALDEF
-echo "#define UseInstalledPrograms YES"			>> $LOCALDEF
-echo "#define UseInstalledClients YES"			>> $LOCALDEF
-echo "#define StandardIncludes -I${PREFIX}/include"	>> $LOCALDEF
-
-sh $PORTSDIR/x11-servers/xorg-server/scripts/configure.gen