Update russian fonts with new ones

5 files changed, 95 insertions, 7 deletions

diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 1b8176306e29..0ad633fde12d 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,18 +3,20 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1995/12/13 10:57:52 ache Exp $
+# $Id: Makefile,v 1.5 1995/12/20 07:13:17 ache Exp $
 #
 
 PKGNAME=        ru-X11
 CATEGORIES+=    russian x11
+DISTNAME=       xrus_bin
+MASTER_SITES=   ftp://ftp.kiae.su/misc/fonts/cyrillic/xwindows/
+EXTRACT_SUFX=   .tgz
+WRKSRC=         ${WRKDIR}/cyrillic
 
 MAINTAINER=	ache@FreeBSD.ORG
 
 RUN_DEPENDS += ${X11BASE}/bin/xinit:${PORTSDIR}/x11/XFree86
 
-NO_EXTRACT=     YES
-NO_WRKDIR=      YES
 NO_CONFIGURE=   YES
 NO_PATCH=       YES
 NO_BUILD=       YES
@@ -23,9 +25,21 @@ USE_X11=        YES
 XLIB = ${X11BASE}/lib/X11
 INSTALL_DATA = ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP}
 
-do-fetch:
-
+#Be careful to not delete embedded tab characters
 do-install:
+	-mv ${XLIB}/fonts/cyrillic ${XLIB}/fonts/cyrillic.old
+	-mkdir ${XLIB}/fonts/cyrillic
+	cd ${WRKSRC}; ${INSTALL_DATA} * ${XLIB}/fonts/cyrillic
+	if [ -f	/etc/XF86Config	]; then	\
+		grep -q	${XLIB}/fonts/cyrillic /etc/XF86Config || { \
+			cp /etc/XF86Config /etc/XF86Config.old; \
+			(echo "/^[ 	]*FontPath/i"; \
+			 echo "    FontPath	\"${XLIB}/fonts/cyrillic\""; \
+			 echo "."; echo "w"; echo "q"; ) > /tmp/ed.$$$$; \
+			ed - /etc/XF86Config < /tmp/ed.$$$$; \
+			rm -f /tmp/ed.$$$$; \
+		}; \
+	fi
 	${INSTALL_DATA} ${FILESDIR}/xmodmap ${XLIB}/xinit/.Xmodmap
 	if [ -d ${XLIB}/locale ] ; then \
 		if [ ! -d ${XLIB}/locale/koi8-r ] ; then \
diff --git a/russian/X.language/distinfo b/russian/X.language/distinfo
new file mode 100644
index 000000000000..fa643f8458f4
--- /dev/null
+++ b/russian/X.language/distinfo
@@ -0,0 +1 @@
+MD5 (xrus_bin.tgz) = 75cf8408ede87ebdc7a698e83d6c43e2
diff --git a/russian/X.language/pkg-comment b/russian/X.language/pkg-comment
index 5d15261a6652..a7c65eee9b6f 100644
--- a/russian/X.language/pkg-comment
+++ b/russian/X.language/pkg-comment
@@ -1 +1 @@
-Setup X locale/nls/keyboard for russian language (koi8-r)
+Setup X locale/nls/keyboard/fonts for russian language (koi8-r)
diff --git a/russian/X.language/pkg-descr b/russian/X.language/pkg-descr
index 5d15261a6652..e8ad986006f7 100644
--- a/russian/X.language/pkg-descr
+++ b/russian/X.language/pkg-descr
@@ -1 +1,3 @@
-Setup X locale/nls/keyboard for russian language (koi8-r)
+Setup X locale/nls/keyboard/fonts for russian language (koi8-r)
+Don't forget to add /usr/X11R6/lib/X11/fonts/cyrillic to your
+FontPath as first component.
diff --git a/russian/X.language/pkg-plist b/russian/X.language/pkg-plist
index 7c030e8d987b..4fb5a981a265 100644
--- a/russian/X.language/pkg-plist
+++ b/russian/X.language/pkg-plist
@@ -7,3 +7,74 @@ lib/X11/nls/nls.alias
 lib/X11/nls/nls.dir
 lib/X11/nls/ru_SU.KOI8-R
 lib/X11/nls/C
+lib/X11/fonts/cyrillic/crox1c.pcf.Z
+lib/X11/fonts/cyrillic/crox1cb.pcf.Z
+lib/X11/fonts/cyrillic/crox1cbo.pcf.Z
+lib/X11/fonts/cyrillic/crox1co.pcf.Z
+lib/X11/fonts/cyrillic/crox1h.pcf.Z
+lib/X11/fonts/cyrillic/crox1hb.pcf.Z
+lib/X11/fonts/cyrillic/crox1hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox1ho.pcf.Z
+lib/X11/fonts/cyrillic/crox1t.pcf.Z
+lib/X11/fonts/cyrillic/crox1tb.pcf.Z
+lib/X11/fonts/cyrillic/crox1tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox1to.pcf.Z
+lib/X11/fonts/cyrillic/crox2c.pcf.Z
+lib/X11/fonts/cyrillic/crox2cb.pcf.Z
+lib/X11/fonts/cyrillic/crox2cbo.pcf.Z
+lib/X11/fonts/cyrillic/crox2co.pcf.Z
+lib/X11/fonts/cyrillic/crox2h.pcf.Z
+lib/X11/fonts/cyrillic/crox2hb.pcf.Z
+lib/X11/fonts/cyrillic/crox2hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox2ho.pcf.Z
+lib/X11/fonts/cyrillic/crox2t.pcf.Z
+lib/X11/fonts/cyrillic/crox2tb.pcf.Z
+lib/X11/fonts/cyrillic/crox2tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox2to.pcf.Z
+lib/X11/fonts/cyrillic/crox3c.pcf.Z
+lib/X11/fonts/cyrillic/crox3cb.pcf.Z
+lib/X11/fonts/cyrillic/crox3cbo.pcf.Z
+lib/X11/fonts/cyrillic/crox3co.pcf.Z
+lib/X11/fonts/cyrillic/crox3h.pcf.Z
+lib/X11/fonts/cyrillic/crox3hb.pcf.Z
+lib/X11/fonts/cyrillic/crox3hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox3ho.pcf.Z
+lib/X11/fonts/cyrillic/crox3t.pcf.Z
+lib/X11/fonts/cyrillic/crox3tb.pcf.Z
+lib/X11/fonts/cyrillic/crox3tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox3to.pcf.Z
+lib/X11/fonts/cyrillic/crox4h.pcf.Z
+lib/X11/fonts/cyrillic/crox4hb.pcf.Z
+lib/X11/fonts/cyrillic/crox4hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox4ho.pcf.Z
+lib/X11/fonts/cyrillic/crox4t.pcf.Z
+lib/X11/fonts/cyrillic/crox4tb.pcf.Z
+lib/X11/fonts/cyrillic/crox4tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox4to.pcf.Z
+lib/X11/fonts/cyrillic/crox5h.pcf.Z
+lib/X11/fonts/cyrillic/crox5hb.pcf.Z
+lib/X11/fonts/cyrillic/crox5hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox5ho.pcf.Z
+lib/X11/fonts/cyrillic/crox5t.pcf.Z
+lib/X11/fonts/cyrillic/crox5tb.pcf.Z
+lib/X11/fonts/cyrillic/crox5tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox5to.pcf.Z
+lib/X11/fonts/cyrillic/crox6h.pcf.Z
+lib/X11/fonts/cyrillic/crox6hb.pcf.Z
+lib/X11/fonts/cyrillic/crox6hbo.pcf.Z
+lib/X11/fonts/cyrillic/crox6ho.pcf.Z
+lib/X11/fonts/cyrillic/crox6t.pcf.Z
+lib/X11/fonts/cyrillic/crox6tb.pcf.Z
+lib/X11/fonts/cyrillic/crox6tbo.pcf.Z
+lib/X11/fonts/cyrillic/crox6to.pcf.Z
+lib/X11/fonts/cyrillic/fonts.alias
+lib/X11/fonts/cyrillic/fonts.dir
+lib/X11/fonts/cyrillic/koi10x16b.pcf.Z
+lib/X11/fonts/cyrillic/koi10x20.pcf.Z
+lib/X11/fonts/cyrillic/koi12x24.pcf.Z
+lib/X11/fonts/cyrillic/koi6x10.pcf.Z
+lib/X11/fonts/cyrillic/koi6x13.pcf.Z
+lib/X11/fonts/cyrillic/koi8x13.pcf.Z
+lib/X11/fonts/cyrillic/koi9x15.pcf.Z
+lib/X11/fonts/cyrillic/koinil2.pcf.Z
+lib/X11/fonts/cyrillic/xrus.info