Commited, thanks.

PR:		ports/24506
Submitted by:	mi

4 files changed, 79 insertions, 71 deletions

diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 2c342d5a20da..19c9ddfed791 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -22,7 +22,10 @@ USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
 
 MAKE_ENV+=	DESTDIR=${X11BASE}/lib/X11/fonts/koi8-u-gemini
-MAKE_ARGS+=	-E DESTDIR
+MAKE_ARGS+=	-E DESTDIR -j 2
+
+post-patch:
+	${PERL} -pi -e 's/\.Z/.gz/g' ${WRKSRC}/Makefile
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
@@ -34,7 +37,7 @@ post-install:
 post-build:
 	# Creating aliases for koi8-r encoding and Cronyx foundry:
 	@${ECHO} >> ${WRKSRC}/fonts.alias
-	@${ECHO} "# Automaticly generated aliases for koi8-r encoding" \
+	@${ECHO} "! Automaticly generated aliases for koi8-r encoding:" \
 		>> ${WRKSRC}/fonts.alias
 	${AWK} '/gemini/ { \
 		name = $$2; \
diff --git a/x11-fonts/geminifonts/files/patch-gz b/x11-fonts/geminifonts/files/patch-gz
new file mode 100644
index 000000000000..fff0a7159118
--- /dev/null
+++ b/x11-fonts/geminifonts/files/patch-gz
@@ -0,0 +1,5 @@
+--- Makefile	Sun Dec 31 11:22:34 1995
++++ Makefile	Sun Jan 21 11:54:00 2001
+@@ -75 +75 @@
+-	bdftopcf -t $< | compress > $@
++	bdftopcf -t $< | gzip -9 > $@
diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message
index bb1637fefd62..3be200142102 100644
--- a/x11-fonts/geminifonts/pkg-message
+++ b/x11-fonts/geminifonts/pkg-message
@@ -1,6 +1,6 @@
 
 	For  your X-server  to use  the fonts,  you have  to add
-	the  ${X11BASE}/lib/X11/fonts/koi8u-gemini (X11BASE  is,
+	the  ${X11BASE}/lib/X11/fonts/koi8-u-gemini (X11BASE is,
 	usually,  /usr/X11R6)  to  the server's  font-path.  Use
 	``xset fp+''  to do this  for the current  X-session and
 	consult  your  X-server's  documentation  to  make  this
diff --git a/x11-fonts/geminifonts/pkg-plist b/x11-fonts/geminifonts/pkg-plist
index b0ae788ad531..0d60f6f596bb 100644
--- a/x11-fonts/geminifonts/pkg-plist
+++ b/x11-fonts/geminifonts/pkg-plist
@@ -1,71 +1,71 @@
-lib/X11/fonts/koi8-u-gemini/gem1c.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1cb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1cbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1co.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem1to.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2c.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2cb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2cbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2co.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem2to.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3c.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3cb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3cbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3co.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem3to.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem4to.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem5to.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6h.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6hb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6hbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6ho.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6t.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6tb.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6tbo.pcf.Z
-lib/X11/fonts/koi8-u-gemini/gem6to.pcf.Z
+lib/X11/fonts/koi8-u-gemini/gem1c.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1cb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1cbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1co.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem1to.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2c.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2cb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2cbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2co.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem2to.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3c.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3cb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3cbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3co.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem3to.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem4to.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem5to.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6h.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6hb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6hbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6ho.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6t.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6tb.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6tbo.pcf.gz
+lib/X11/fonts/koi8-u-gemini/gem6to.pcf.gz
 lib/X11/fonts/koi8-u-gemini/fonts.alias
 lib/X11/fonts/koi8-u-gemini/fonts.dir
-lib/X11/fonts/koi8-u-gemini/koi10x16b.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi10x20.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi12x24.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi6x10.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi6x13.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi8x13.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koi9x15.pcf.Z
-lib/X11/fonts/koi8-u-gemini/koinil2.pcf.Z
+lib/X11/fonts/koi8-u-gemini/koi10x16b.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi10x20.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi12x24.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi6x10.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi6x13.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi8x13.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koi9x15.pcf.gz
+lib/X11/fonts/koi8-u-gemini/koinil2.pcf.gz
 @dirrm lib/X11/fonts/koi8-u-gemini