3 files changed, 79 insertions, 80 deletions

diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 435ae80da9a6..89bb07ecc6e0 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gemini
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
@@ -14,19 +14,17 @@ MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
 
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
-		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-USES=		perl5 tar:tgz
+USES=		fonts perl5 tar:tgz
 USE_PERL5=	build
 USE_XORG=	x11
 NO_WRKSUBDIR=	yes
-
-MAKE_ARGS+=	-j 2
+FONTNAME=	koi8-u-gemini
 
 post-patch:
 	${REINPLACE_CMD} -e 's/\.Z/.gz/g' \
-	    -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \
+	    -e 's|DESTDIR =.*|MDESTDIR=${STAGEDIR}${FONTSDIR}|' \
 	${WRKSRC}/Makefile
 
 # This will  allow one to  use just this  fonts for both,  the Ukrainian
@@ -46,4 +44,7 @@ post-build:
 		print $$2 " " name; \
 	}' < ${WRKSRC}/fonts.dir >> ${WRKSRC}/fonts.alias
 
+pre-install:
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
+
 .include <bsd.port.mk>
diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message
index 0e0b305c06a5..a113f3a5fd14 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  ${LOCALBASE}/lib/X11/fonts/koi8-u-gemini (LOCALBASE is,
+	the  ${LOCALBASE}/share/fonts/koi8-u-gemini (LOCALBASE is,
 	usually, /usr/local)  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 3e9f14654cc0..c2e2b372ba1f 100644
--- a/x11-fonts/geminifonts/pkg-plist
+++ b/x11-fonts/geminifonts/pkg-plist
@@ -1,72 +1,70 @@
-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.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
-@unexec rm -f %D/lib/X11/fonts/koi8-u-gemini/fonts.cache-*
-@dirrm lib/X11/fonts/koi8-u-gemini
+%%FONTSDIR%%/gem1c.pcf.gz
+%%FONTSDIR%%/gem1cb.pcf.gz
+%%FONTSDIR%%/gem1cbo.pcf.gz
+%%FONTSDIR%%/gem1co.pcf.gz
+%%FONTSDIR%%/gem1h.pcf.gz
+%%FONTSDIR%%/gem1hb.pcf.gz
+%%FONTSDIR%%/gem1hbo.pcf.gz
+%%FONTSDIR%%/gem1ho.pcf.gz
+%%FONTSDIR%%/gem1t.pcf.gz
+%%FONTSDIR%%/gem1tb.pcf.gz
+%%FONTSDIR%%/gem1tbo.pcf.gz
+%%FONTSDIR%%/gem1to.pcf.gz
+%%FONTSDIR%%/gem2c.pcf.gz
+%%FONTSDIR%%/gem2cb.pcf.gz
+%%FONTSDIR%%/gem2cbo.pcf.gz
+%%FONTSDIR%%/gem2co.pcf.gz
+%%FONTSDIR%%/gem2h.pcf.gz
+%%FONTSDIR%%/gem2hb.pcf.gz
+%%FONTSDIR%%/gem2hbo.pcf.gz
+%%FONTSDIR%%/gem2ho.pcf.gz
+%%FONTSDIR%%/gem2t.pcf.gz
+%%FONTSDIR%%/gem2tb.pcf.gz
+%%FONTSDIR%%/gem2tbo.pcf.gz
+%%FONTSDIR%%/gem2to.pcf.gz
+%%FONTSDIR%%/gem3c.pcf.gz
+%%FONTSDIR%%/gem3cb.pcf.gz
+%%FONTSDIR%%/gem3cbo.pcf.gz
+%%FONTSDIR%%/gem3co.pcf.gz
+%%FONTSDIR%%/gem3h.pcf.gz
+%%FONTSDIR%%/gem3hb.pcf.gz
+%%FONTSDIR%%/gem3hbo.pcf.gz
+%%FONTSDIR%%/gem3ho.pcf.gz
+%%FONTSDIR%%/gem3t.pcf.gz
+%%FONTSDIR%%/gem3tb.pcf.gz
+%%FONTSDIR%%/gem3tbo.pcf.gz
+%%FONTSDIR%%/gem3to.pcf.gz
+%%FONTSDIR%%/gem4h.pcf.gz
+%%FONTSDIR%%/gem4hb.pcf.gz
+%%FONTSDIR%%/gem4hbo.pcf.gz
+%%FONTSDIR%%/gem4ho.pcf.gz
+%%FONTSDIR%%/gem4t.pcf.gz
+%%FONTSDIR%%/gem4tb.pcf.gz
+%%FONTSDIR%%/gem4tbo.pcf.gz
+%%FONTSDIR%%/gem4to.pcf.gz
+%%FONTSDIR%%/gem5h.pcf.gz
+%%FONTSDIR%%/gem5hb.pcf.gz
+%%FONTSDIR%%/gem5hbo.pcf.gz
+%%FONTSDIR%%/gem5ho.pcf.gz
+%%FONTSDIR%%/gem5t.pcf.gz
+%%FONTSDIR%%/gem5tb.pcf.gz
+%%FONTSDIR%%/gem5tbo.pcf.gz
+%%FONTSDIR%%/gem5to.pcf.gz
+%%FONTSDIR%%/gem6h.pcf.gz
+%%FONTSDIR%%/gem6hb.pcf.gz
+%%FONTSDIR%%/gem6hbo.pcf.gz
+%%FONTSDIR%%/gem6ho.pcf.gz
+%%FONTSDIR%%/gem6t.pcf.gz
+%%FONTSDIR%%/gem6tb.pcf.gz
+%%FONTSDIR%%/gem6tbo.pcf.gz
+%%FONTSDIR%%/gem6to.pcf.gz
+%%FONTSDIR%%/fonts.alias
+@comment %%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/koi10x16b.pcf.gz
+%%FONTSDIR%%/koi10x20.pcf.gz
+%%FONTSDIR%%/koi12x24.pcf.gz
+%%FONTSDIR%%/koi6x10.pcf.gz
+%%FONTSDIR%%/koi6x13.pcf.gz
+%%FONTSDIR%%/koi8x13.pcf.gz
+%%FONTSDIR%%/koi9x15.pcf.gz
+%%FONTSDIR%%/koinil2.pcf.gz