Add 75dpi and misc fonts now

4 files changed, 149 insertions, 81 deletions

diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 84615146c4d3..64124fe70e09 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,13 +3,13 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1996/03/20 10:38:59 asami Exp $
+# $Id: Makefile,v 1.8 1996/09/01 13:47:03 ache Exp $
 #
 
-DISTNAME=       xrus-1.0-bin
+DISTNAME=       xrus-2.0-bin
 PKGNAME=        ru-X11-3.1.2
 CATEGORIES+=    russian x11
-MASTER_SITES=   ftp://ftp.kiae.su/misc/fonts/cyrillic/xwindows/
+MASTER_SITES=   ftp://ftp.relcom.ru/misc/fonts/cyrillic/xwindows/
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=	ache@FreeBSD.ORG
@@ -23,18 +23,25 @@ NO_BUILD=       YES
 USE_X11=        YES
 
 XLIB = ${X11BASE}/lib/X11
-INSTALL_DATA = ${INSTALL} -c -m 644 -o ${BINOWN} -g ${BINGRP}
 
 #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
+	-mkdir -p ${XLIB}/fonts/cyrillic/100dpi
+	-mkdir -p ${XLIB}/fonts/cyrillic/75dpi
+	-mkdir -p ${XLIB}/fonts/cyrillic/misc
+	cd ${WRKSRC}; \
+	${INSTALL_DATA} xrus.info ${XLIB}/fonts/cyrillic; \
+	for i in 100dpi 75dpi misc; do \
+		${INSTALL_DATA} $$i/* ${XLIB}/fonts/cyrillic/$$i; \
+	done
 	if [ -f	/etc/XF86Config	]; then	\
-		grep -q	${XLIB}/fonts/cyrillic /etc/XF86Config || { \
+		grep -q ${XLIB}/fonts/cyrillic/misc /etc/XF86Config || { \
 			cp /etc/XF86Config /etc/XF86Config.old; \
 			(echo "/^[ 	]*FontPath/i"; \
-			 echo "    FontPath	\"${XLIB}/fonts/cyrillic\""; \
+			 echo "    FontPath	\"${XLIB}/fonts/cyrillic/75dpi\""; \
+			 echo "    FontPath	\"${XLIB}/fonts/cyrillic/100dpi\""; \
+			 echo "    FontPath	\"${XLIB}/fonts/cyrillic/misc\""; \
 			 echo "."; echo "w"; echo "q"; ) > /tmp/ed.$$$$; \
 			ed - /etc/XF86Config < /tmp/ed.$$$$; \
 			rm -f /tmp/ed.$$$$; \
diff --git a/russian/X.language/distinfo b/russian/X.language/distinfo
index f416123db2de..ef98befc8245 100644
--- a/russian/X.language/distinfo
+++ b/russian/X.language/distinfo
@@ -1 +1 @@
-MD5 (xrus-1.0-bin.tgz) = 72b40f2c092467092b8043655e42bec4
+MD5 (xrus-2.0-bin.tgz) = e9dae81effbeed213dc7b6dbcf1f1448
diff --git a/russian/X.language/pkg-descr b/russian/X.language/pkg-descr
index e8ad986006f7..d63cbeff89f1 100644
--- a/russian/X.language/pkg-descr
+++ b/russian/X.language/pkg-descr
@@ -1,3 +1,3 @@
 Setup X locale/nls/keyboard/fonts for russian language (koi8-r)
-Don't forget to add /usr/X11R6/lib/X11/fonts/cyrillic to your
+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 4fb5a981a265..be78c60310b4 100644
--- a/russian/X.language/pkg-plist
+++ b/russian/X.language/pkg-plist
@@ -1,4 +1,3 @@
-@cwd /usr/X11R6
 lib/X11/locale/locale.alias
 lib/X11/locale/locale.dir
 lib/X11/locale/koi8-r/XLC_LOCALE
@@ -7,74 +6,136 @@ 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/100dpi/crox1c.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1cb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1cbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1co.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox1to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2c.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2cb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2cbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2co.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox2to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3c.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3cb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3cbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3co.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox3to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox4to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox5to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6h.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6hb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6hbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6ho.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6t.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6tb.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6tbo.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/crox6to.pcf.Z
+lib/X11/fonts/cyrillic/100dpi/fonts.dir
+lib/X11/fonts/cyrillic/75dpi/crox1c.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1cb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1cbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1co.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox1to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2c.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2cb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2cbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2co.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox2to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3c.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3cb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3cbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3co.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox3to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox4to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox5to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6h.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6hb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6hbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6ho.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6t.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6tb.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6tbo.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/crox6to.pcf.Z
+lib/X11/fonts/cyrillic/75dpi/fonts.dir
+lib/X11/fonts/cyrillic/misc/fonts.alias
+lib/X11/fonts/cyrillic/misc/fonts.dir
+lib/X11/fonts/cyrillic/misc/koi10x16b.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi10x20.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi12x24.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi6x10.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi6x13.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi8x13.pcf.Z
+lib/X11/fonts/cyrillic/misc/koi9x15.pcf.Z
+lib/X11/fonts/cyrillic/misc/koinil2.pcf.Z
 lib/X11/fonts/cyrillic/xrus.info