diff -ruN terminus-font.orig/Makefile terminus-font/Makefile
--- terminus-font.orig/Makefile	Sun Feb 20 13:16:27 2005
+++ terminus-font/Makefile	Sun Feb 20 13:13:03 2005
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.00
-PORTREVISION=	2
+PORTVERSION=	4.11
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.is-vn.bg/hamster/
 
@@ -18,6 +18,7 @@
 		bdftopcf:${X_CLIENTS_PORT}
 RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
 
+USE_PERL5=      yes
 USE_X_PREFIX=	yes
 ALL_TARGET=	pcf
 SHAREMODE=	644
diff -ruN terminus-font.orig/distinfo terminus-font/distinfo
--- terminus-font.orig/distinfo	Sun Feb 20 13:16:27 2005
+++ terminus-font/distinfo	Sun Feb 20 13:13:03 2005
@@ -1,2 +1,2 @@
-MD5 (terminus-font-4.00.tar.gz) = a0153061a484906f2bbb08bc28fac757
-SIZE (terminus-font-4.00.tar.gz) = 107077
+MD5 (terminus-font-4.11.tar.gz) = 032805275816016bdc5f4d10e15cf4ad
+SIZE (terminus-font-4.11.tar.gz) = 177244
diff -ruN terminus-font.orig/files/patch-aa terminus-font/files/patch-aa
--- terminus-font.orig/files/patch-aa	Sun Feb 20 13:16:27 2005
+++ terminus-font/files/patch-aa	Sun Feb 20 13:44:07 2005
@@ -1,79 +1,173 @@
-
-$FreeBSD: ports/x11-fonts/terminus-font/files/patch-aa,v 1.2 2003/03/24 12:58:17 olgeni Exp $
-
---- Makefile.orig	Sun Dec  1 14:59:04 2002
-+++ Makefile	Thu Mar 20 23:28:23 2003
-@@ -4,6 +4,7 @@
- BDF2RAW	= ./bdftopsf.pl -h
- UCS2X11	= ./ucstoany.pl
+--- Makefile.orig	Fri Oct  1 22:08:19 2004
++++ Makefile	Sun Feb 20 13:20:00 2005
+@@ -6,6 +6,7 @@
+ BDF2RAW	= $(PERL) ./bdftopsf.pl -h
+ UCS2X11	= $(PERL) ./ucstoany.pl
  BDF2PCF	= bdftopcf
 +MKITALIC = mkitalic
  
  R_88591	= ISO8859 1
  R_88592	= ISO8859 2
-@@ -480,13 +481,21 @@
- 	$(UCS2VGA) ter-u16b.bdf $(R_PT154) $(B_PT154) | $(BDF2RAW) -o $@
+@@ -55,19 +56,27 @@
  
- PCF_14N	= ter-114n.pcf ter-214n.pcf ter-514n.pcf ter-914n.pcf ter-c14n.pcf ter-f14n.pcf ter-g14n.pcf ter-k14n.pcf ter-p14n.pcf ter-x14n.pcf
-+PCF_14N	+= ter-114i.pcf ter-214i.pcf ter-514i.pcf ter-914i.pcf ter-c14i.pcf ter-f14i.pcf ter-g14i.pcf ter-k14i.pcf ter-p14i.pcf ter-x14i.pcf
- PCF_14B	= ter-114b.pcf ter-214b.pcf ter-514b.pcf ter-914b.pcf ter-c14b.pcf ter-f14b.pcf ter-g14b.pcf ter-k14b.pcf ter-p14b.pcf ter-x14b.pcf
-+PCF_14B	+= ter-114bi.pcf ter-214bi.pcf ter-514bi.pcf ter-914bi.pcf ter-c14bi.pcf ter-f14bi.pcf ter-g14bi.pcf ter-k14bi.pcf ter-p14bi.pcf ter-x14bi.pcf
- PCF_16N	= ter-116n.pcf ter-216n.pcf ter-516n.pcf ter-916n.pcf ter-c16n.pcf ter-f16n.pcf ter-g16n.pcf ter-k16n.pcf ter-p16n.pcf ter-x16n.pcf
-+PCF_16N	+= ter-116i.pcf ter-216i.pcf ter-516i.pcf ter-916i.pcf ter-c16i.pcf ter-f16i.pcf ter-g16i.pcf ter-k16i.pcf ter-p16i.pcf ter-x16i.pcf
- PCF_16B	= ter-116b.pcf ter-216b.pcf ter-516b.pcf ter-916b.pcf ter-c16b.pcf ter-f16b.pcf ter-g16b.pcf ter-k16b.pcf ter-p16b.pcf ter-x16b.pcf
-+PCF_16B	+= ter-116bi.pcf ter-216bi.pcf ter-516bi.pcf ter-916bi.pcf ter-c16bi.pcf ter-f16bi.pcf ter-g16bi.pcf ter-k16bi.pcf ter-p16bi.pcf ter-x16bi.pcf
- PCF_20N	= ter-120n.pcf ter-220n.pcf ter-520n.pcf ter-920n.pcf ter-c20n.pcf ter-f20n.pcf ter-g20n.pcf ter-k20n.pcf ter-p20n.pcf ter-x20n.pcf
-+PCF_20N	+= ter-120i.pcf ter-220i.pcf ter-520i.pcf ter-920i.pcf ter-c20i.pcf ter-f20i.pcf ter-g20i.pcf ter-k20i.pcf ter-p20i.pcf ter-x20i.pcf
- PCF_20B	= ter-120b.pcf ter-220b.pcf ter-520b.pcf ter-920b.pcf ter-c20b.pcf ter-f20b.pcf ter-g20b.pcf ter-k20b.pcf ter-p20b.pcf ter-x20b.pcf
-+PCF_20B	+= ter-120bi.pcf ter-220bi.pcf ter-520bi.pcf ter-920bi.pcf ter-c20bi.pcf ter-f20bi.pcf ter-g20bi.pcf ter-k20bi.pcf ter-p20bi.pcf ter-x20bi.pcf
- PCF_24N	= ter-124n.pcf ter-224n.pcf ter-524n.pcf ter-924n.pcf ter-c24n.pcf ter-f24n.pcf ter-g24n.pcf ter-k24n.pcf ter-p24n.pcf ter-x24n.pcf
-+PCF_24N	+= ter-124i.pcf ter-224i.pcf ter-524i.pcf ter-924i.pcf ter-c24i.pcf ter-f24i.pcf ter-g24i.pcf ter-k24i.pcf ter-p24i.pcf ter-x24i.pcf
- PCF_24B	= ter-124b.pcf ter-224b.pcf ter-524b.pcf ter-924b.pcf ter-c24b.pcf ter-f24b.pcf ter-g24b.pcf ter-k24b.pcf ter-p24b.pcf ter-x24b.pcf
-+PCF_24B	+= ter-124bi.pcf ter-224bi.pcf ter-524bi.pcf ter-924bi.pcf ter-c24bi.pcf ter-f24bi.pcf ter-g24bi.pcf ter-k24bi.pcf ter-p24bi.pcf ter-x24bi.pcf
- PCF	= $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_24N) $(PCF_24B)
+ PCF_12N	= ter-112n.pcf ter-212n.pcf ter-512n.pcf ter-912n.pcf ter-c12n.pcf ter-d12n.pcf ter-f12n.pcf ter-g12n.pcf ter-k12n.pcf ter-p12n.pcf ter-u12n.pcf ter-x12n.pcf
+ PCF_12B	= ter-112b.pcf ter-212b.pcf ter-512b.pcf ter-912b.pcf ter-c12b.pcf ter-d12b.pcf ter-f12b.pcf ter-g12b.pcf ter-k12b.pcf ter-p12b.pcf ter-u12b.pcf ter-x12b.pcf
++PCF_12I	= ter-112i.pcf ter-212i.pcf ter-512i.pcf ter-912i.pcf ter-c12i.pcf ter-d12i.pcf ter-f12i.pcf ter-g12i.pcf ter-k12i.pcf ter-p12i.pcf ter-u12i.pcf ter-x12i.pcf ter-112bi.pcf ter-212bi.pcf ter-512bi.pcf ter-912bi.pcf ter-c12bi.pcf ter-d12bi.pcf ter-f12bi.pcf ter-g12bi.pcf ter-k12bi.pcf ter-p12bi.pcf ter-u12bi.pcf ter-x12bi.pcf
+ PCF_14N	= ter-114n.pcf ter-214n.pcf ter-514n.pcf ter-914n.pcf ter-c14n.pcf ter-d14n.pcf ter-f14n.pcf ter-g14n.pcf ter-k14n.pcf ter-p14n.pcf ter-u14n.pcf ter-x14n.pcf
+ PCF_14B	= ter-114b.pcf ter-214b.pcf ter-514b.pcf ter-914b.pcf ter-c14b.pcf ter-d14b.pcf ter-f14b.pcf ter-g14b.pcf ter-k14b.pcf ter-p14b.pcf ter-u14b.pcf ter-x14b.pcf
++PCF_14I	= ter-114i.pcf ter-214i.pcf ter-514i.pcf ter-914i.pcf ter-c14i.pcf ter-d14i.pcf ter-f14i.pcf ter-g14i.pcf ter-k14i.pcf ter-p14i.pcf ter-u14i.pcf ter-x14i.pcf ter-114bi.pcf ter-214bi.pcf ter-514bi.pcf ter-914bi.pcf ter-c14bi.pcf ter-d14bi.pcf ter-f14bi.pcf ter-g14bi.pcf ter-k14bi.pcf ter-p14bi.pcf ter-u14bi.pcf ter-x14bi.pcf
+ PCF_16N	= ter-116n.pcf ter-216n.pcf ter-516n.pcf ter-916n.pcf ter-c16n.pcf ter-d16n.pcf ter-f16n.pcf ter-g16n.pcf ter-k16n.pcf ter-p16n.pcf ter-u16n.pcf ter-x16n.pcf
+ PCF_16B	= ter-116b.pcf ter-216b.pcf ter-516b.pcf ter-916b.pcf ter-c16b.pcf ter-d16b.pcf ter-f16b.pcf ter-g16b.pcf ter-k16b.pcf ter-p16b.pcf ter-u16b.pcf ter-x16b.pcf
++PCF_16I	= ter-116i.pcf ter-216i.pcf ter-516i.pcf ter-916i.pcf ter-c16i.pcf ter-d16i.pcf ter-f16i.pcf ter-g16i.pcf ter-k16i.pcf ter-p16i.pcf ter-u16i.pcf ter-x16i.pcf ter-116bi.pcf ter-216bi.pcf ter-516bi.pcf ter-916bi.pcf ter-c16bi.pcf ter-d16bi.pcf ter-f16bi.pcf ter-g16bi.pcf ter-k16bi.pcf ter-p16bi.pcf ter-u16bi.pcf ter-x16bi.pcf
+ PCF_20N	= ter-120n.pcf ter-220n.pcf ter-520n.pcf ter-920n.pcf ter-c20n.pcf ter-d20n.pcf ter-f20n.pcf ter-g20n.pcf ter-k20n.pcf ter-p20n.pcf ter-u20n.pcf ter-x20n.pcf
+ PCF_20B	= ter-120b.pcf ter-220b.pcf ter-520b.pcf ter-920b.pcf ter-c20b.pcf ter-d20b.pcf ter-f20b.pcf ter-g20b.pcf ter-k20b.pcf ter-p20b.pcf ter-u20b.pcf ter-x20b.pcf
++PCF_20I	= ter-120i.pcf ter-220i.pcf ter-520i.pcf ter-920i.pcf ter-c20i.pcf ter-d20i.pcf ter-f20i.pcf ter-g20i.pcf ter-k20i.pcf ter-p20i.pcf ter-u20i.pcf ter-x20i.pcf ter-120bi.pcf ter-220bi.pcf ter-520bi.pcf ter-920bi.pcf ter-c20bi.pcf ter-d20bi.pcf ter-f20bi.pcf ter-g20bi.pcf ter-k20bi.pcf ter-p20bi.pcf ter-u20bi.pcf ter-x20bi.pcf
+ PCF_24N	= ter-124n.pcf ter-224n.pcf ter-524n.pcf ter-924n.pcf ter-c24n.pcf ter-d24n.pcf ter-f24n.pcf ter-g24n.pcf ter-k24n.pcf ter-p24n.pcf ter-u24n.pcf ter-x24n.pcf
+ PCF_24B	= ter-124b.pcf ter-224b.pcf ter-524b.pcf ter-924b.pcf ter-c24b.pcf ter-d24b.pcf ter-f24b.pcf ter-g24b.pcf ter-k24b.pcf ter-p24b.pcf ter-u24b.pcf ter-x24b.pcf
++PCF_24I	= ter-124i.pcf ter-224i.pcf ter-524i.pcf ter-924i.pcf ter-c24i.pcf ter-d24i.pcf ter-f24i.pcf ter-g24i.pcf ter-k24i.pcf ter-p24i.pcf ter-u24i.pcf ter-x24i.pcf ter-124bi.pcf ter-224bi.pcf ter-524bi.pcf ter-924bi.pcf ter-c24bi.pcf ter-d24bi.pcf ter-f24bi.pcf ter-g24bi.pcf ter-k24bi.pcf ter-p24bi.pcf ter-u24bi.pcf ter-x24bi.pcf
+ PCF_28N	= ter-128n.pcf ter-228n.pcf ter-528n.pcf ter-928n.pcf ter-c28n.pcf ter-d28n.pcf ter-f28n.pcf ter-g28n.pcf ter-k28n.pcf ter-p28n.pcf ter-u28n.pcf ter-x28n.pcf
+ PCF_28B	= ter-128b.pcf ter-228b.pcf ter-528b.pcf ter-928b.pcf ter-c28b.pcf ter-d28b.pcf ter-f28b.pcf ter-g28b.pcf ter-k28b.pcf ter-p28b.pcf ter-u28b.pcf ter-x28b.pcf
++PCF_28I	= ter-128i.pcf ter-228i.pcf ter-528i.pcf ter-928i.pcf ter-c28i.pcf ter-d28i.pcf ter-f28i.pcf ter-g28i.pcf ter-k28i.pcf ter-p28i.pcf ter-u28i.pcf ter-x28i.pcf ter-128bi.pcf ter-228bi.pcf ter-528bi.pcf ter-928bi.pcf ter-c28bi.pcf ter-d28bi.pcf ter-f28bi.pcf ter-g28bi.pcf ter-k28bi.pcf ter-p28bi.pcf ter-u28bi.pcf ter-x28bi.pcf
+ PCF_32N	= ter-132n.pcf ter-232n.pcf ter-532n.pcf ter-932n.pcf ter-c32n.pcf ter-d32n.pcf ter-f32n.pcf ter-g32n.pcf ter-k32n.pcf ter-p32n.pcf ter-u32n.pcf ter-x32n.pcf
+ PCF_32B	= ter-132b.pcf ter-232b.pcf ter-532b.pcf ter-932b.pcf ter-c32b.pcf ter-d32b.pcf ter-f32b.pcf ter-g32b.pcf ter-k32b.pcf ter-p32b.pcf ter-u32b.pcf ter-x32b.pcf
+-PCF	= $(PCF_12N) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
++PCF_32I	= ter-132i.pcf ter-232i.pcf ter-532i.pcf ter-932i.pcf ter-c32i.pcf ter-d32i.pcf ter-f32i.pcf ter-g32i.pcf ter-k32i.pcf ter-p32i.pcf ter-u32i.pcf ter-x32i.pcf ter-132bi.pcf ter-232bi.pcf ter-532bi.pcf ter-932bi.pcf ter-c32bi.pcf ter-d32bi.pcf ter-f32bi.pcf ter-g32bi.pcf ter-k32bi.pcf ter-p32bi.pcf ter-u32bi.pcf ter-x32bi.pcf
++
++PCF	= $(PCF_12N) $(PCF_12B) $(PCF_12I) $(PCF_14N) $(PCF_14B) $(PCF_14I) $(PCF_16N) $(PCF_16B) $(PCF_16I) $(PCF_20N) $(PCF_20B) $(PCF_20I) $(PCF_24N) $(PCF_24B) $(PCF_24I) $(PCF_28N) $(PCF_28B) $(PCF_28I) $(PCF_32N) $(PCF_32B) $(PCF_32I) 
  
- pcf: $(PCF)
-@@ -502,6 +511,36 @@
+ all: $(PSF) $(PCF)
+ psf: $(PSF)
+@@ -1016,6 +1025,54 @@
  X_PT154	= uni/x11gr.uni uni/ascii.uni uni/house.uni uni/pt-154.uni
  X_10646	= uni/x11gr.uni uni/ascii.uni uni/10646-1.uni
  
++ter-u12i.bdf: ter-u12n.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
++ter-u12bi.bdf: ter-u12b.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
 +ter-u14bi.bdf: ter-u14b.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u14i.bdf: ter-u14n.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u14vi.bdf: ter-u14v.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u16bi.bdf: ter-u16b.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u16i.bdf: ter-u16n.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u16vi.bdf: ter-u16v.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u20bi.bdf: ter-u20b.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u20i.bdf: ter-u20n.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u24bi.bdf: ter-u24b.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
 +ter-u24i.bdf: ter-u24n.bdf
-+	mkitalic ${.ALLSRC} > ${.TARGET}
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
++ter-u28bi.bdf: ter-u28b.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
++ter-u28i.bdf: ter-u28n.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
- ter-114n.pcf: ter-u14n.bdf $(X_88591)
- 	$(UCS2X11) ter-u14n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++ter-u32bi.bdf: ter-u32b.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
++ter-u32i.bdf: ter-u32n.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
+ ter-112n.pcf: ter-u12n.bdf $(X_88591)
+ 	$(UCS2X11) ter-u12n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
  
-@@ -742,5 +781,245 @@
- ter-x24b.pcf: ter-u24b.bdf $(X_10646)
- 	$(UCS2X11) ter-u24b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
+@@ -1520,6 +1577,656 @@
+ ter-x32b.pcf: ter-u32b.bdf $(X_10646)
+ 	$(UCS2X11) ter-u32b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
  
++ter-112i.pcf: ter-u12i.bdf $(X_88591)
++	$(UCS2X11) ter-u12i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-112bi.pcf: ter-u12bi.bdf $(X_88591)
++	$(UCS2X11) ter-u12bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-212i.pcf: ter-u12i.bdf $(X_88592)
++	$(UCS2X11) ter-u12i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-212bi.pcf: ter-u12bi.bdf $(X_88592)
++	$(UCS2X11) ter-u12bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-512i.pcf: ter-u12i.bdf $(X_88595)
++	$(UCS2X11) ter-u12i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-512bi.pcf: ter-u12bi.bdf $(X_88595)
++	$(UCS2X11) ter-u12bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-912i.pcf: ter-u12i.bdf $(X_88599)
++	$(UCS2X11) ter-u12i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-912bi.pcf: ter-u12bi.bdf $(X_88599)
++	$(UCS2X11) ter-u12bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-c12i.pcf: ter-u12i.bdf $(X_W1251)
++	$(UCS2X11) ter-u12i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-c12bi.pcf: ter-u12bi.bdf $(X_W1251)
++	$(UCS2X11) ter-u12bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-d12i.pcf: ter-u12i.bdf $(X_8859D)
++	$(UCS2X11) ter-u12i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d12bi.pcf: ter-u12bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u12bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-f12i.pcf: ter-u12i.bdf $(X_8859F)
++	$(UCS2X11) ter-u12i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-f12bi.pcf: ter-u12bi.bdf $(X_8859F)
++	$(UCS2X11) ter-u12bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-g12i.pcf: ter-u12i.bdf $(X_8859G)
++	$(UCS2X11) ter-u12i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-g12bi.pcf: ter-u12bi.bdf $(X_8859G)
++	$(UCS2X11) ter-u12bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-k12i.pcf: ter-u12i.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u12i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-k12bi.pcf: ter-u12bi.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u12bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-p12i.pcf: ter-u12i.bdf $(X_PT154)
++	$(UCS2X11) ter-u12i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-p12bi.pcf: ter-u12bi.bdf $(X_PT154)
++	$(UCS2X11) ter-u12bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-u12i.pcf: ter-u12i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u12i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u12bi.pcf: ter-u12bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u12bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-x12i.pcf: ter-u12i.bdf $(X_10646)
++	$(UCS2X11) ter-u12i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-x12bi.pcf: ter-u12bi.bdf $(X_10646)
++	$(UCS2X11) ter-u12bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
 +ter-114i.pcf: ter-u14i.bdf $(X_88591)
 +	$(UCS2X11) ter-u14i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
 +
@@ -104,6 +198,12 @@
 +ter-c14bi.pcf: ter-u14bi.bdf $(X_W1251)
 +	$(UCS2X11) ter-u14bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
 +
++ter-d14i.pcf: ter-u14i.bdf $(X_8859D)
++	$(UCS2X11) ter-u14i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d14bi.pcf: ter-u14bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u14bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
 +ter-f14i.pcf: ter-u14i.bdf $(X_8859F)
 +	$(UCS2X11) ter-u14i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
 +
@@ -111,10 +211,10 @@
 +	$(UCS2X11) ter-u14bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
 +
 +ter-g14i.pcf: ter-u14i.bdf $(X_8859G)
-+	$(UCS2X11) ter-u14i.bdf $(R_8859G) $(V_8859G) | $(BDF2PCF) -o $@
++	$(UCS2X11) ter-u14i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
 +
 +ter-g14bi.pcf: ter-u14bi.bdf $(X_8859G)
-+	$(UCS2X11) ter-u14bi.bdf $(R_8859G) $(V_8859G) | $(BDF2PCF) -o $@
++	$(UCS2X11) ter-u14bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
 +
 +ter-k14i.pcf: ter-u14i.bdf $(X_KOI8R)
 +	$(UCS2X11) ter-u14i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
@@ -128,6 +228,12 @@
 +ter-p14bi.pcf: ter-u14bi.bdf $(X_PT154)
 +	$(UCS2X11) ter-u14bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
 +
++ter-u14i.pcf: ter-u14i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u14i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u14bi.pcf: ter-u14bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u14bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
 +ter-x14i.pcf: ter-u14i.bdf $(X_10646)
 +	$(UCS2X11) ter-u14i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
@@ -164,6 +270,12 @@
 +ter-c16bi.pcf: ter-u16bi.bdf $(X_W1251)
 +	$(UCS2X11) ter-u16bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
 +
++ter-d16i.pcf: ter-u16i.bdf $(X_8859D)
++	$(UCS2X11) ter-u16i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d16bi.pcf: ter-u16bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u16bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
 +ter-f16i.pcf: ter-u16i.bdf $(X_8859F)
 +	$(UCS2X11) ter-u16i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
 +
@@ -188,12 +300,90 @@
 +ter-p16bi.pcf: ter-u16bi.bdf $(X_PT154)
 +	$(UCS2X11) ter-u16bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
 +
++ter-u16i.pcf: ter-u16i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u16i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u16bi.pcf: ter-u16bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u16bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
 +ter-x16i.pcf: ter-u16i.bdf $(X_10646)
 +	$(UCS2X11) ter-u16i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
 +ter-x16bi.pcf: ter-u16bi.bdf $(X_10646)
 +	$(UCS2X11) ter-u16bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
++ter-118i.pcf: ter-u18i.bdf $(X_88591)
++	$(UCS2X11) ter-u18i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-118bi.pcf: ter-u18bi.bdf $(X_88591)
++	$(UCS2X11) ter-u18bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-218i.pcf: ter-u18i.bdf $(X_88592)
++	$(UCS2X11) ter-u18i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-218bi.pcf: ter-u18bi.bdf $(X_88592)
++	$(UCS2X11) ter-u18bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-518i.pcf: ter-u18i.bdf $(X_88595)
++	$(UCS2X11) ter-u18i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-518bi.pcf: ter-u18bi.bdf $(X_88595)
++	$(UCS2X11) ter-u18bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-918i.pcf: ter-u18i.bdf $(X_88599)
++	$(UCS2X11) ter-u18i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-918bi.pcf: ter-u18bi.bdf $(X_88599)
++	$(UCS2X11) ter-u18bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-c18i.pcf: ter-u18i.bdf $(X_W1251)
++	$(UCS2X11) ter-u18i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-c18bi.pcf: ter-u18bi.bdf $(X_W1251)
++	$(UCS2X11) ter-u18bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-d18i.pcf: ter-u18i.bdf $(X_8859D)
++	$(UCS2X11) ter-u18i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d18bi.pcf: ter-u18bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u18bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-f18i.pcf: ter-u18i.bdf $(X_8859F)
++	$(UCS2X11) ter-u18i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-f18bi.pcf: ter-u18bi.bdf $(X_8859F)
++	$(UCS2X11) ter-u18bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-g18i.pcf: ter-u18i.bdf $(X_8859G)
++	$(UCS2X11) ter-u18i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-g18bi.pcf: ter-u18bi.bdf $(X_8859G)
++	$(UCS2X11) ter-u18bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-k18i.pcf: ter-u18i.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u18i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-k18bi.pcf: ter-u18bi.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u18bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-p18i.pcf: ter-u18i.bdf $(X_PT154)
++	$(UCS2X11) ter-u18i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-p18bi.pcf: ter-u18bi.bdf $(X_PT154)
++	$(UCS2X11) ter-u18bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-u18i.pcf: ter-u18i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u18i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u18bi.pcf: ter-u18bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u18bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-x18i.pcf: ter-u18i.bdf $(X_10646)
++	$(UCS2X11) ter-u18i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-x18bi.pcf: ter-u18bi.bdf $(X_10646)
++	$(UCS2X11) ter-u18bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
 +ter-120i.pcf: ter-u20i.bdf $(X_88591)
 +	$(UCS2X11) ter-u20i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
 +
@@ -224,6 +414,12 @@
 +ter-c20bi.pcf: ter-u20bi.bdf $(X_W1251)
 +	$(UCS2X11) ter-u20bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
 +
++ter-d20i.pcf: ter-u20i.bdf $(X_8859D)
++	$(UCS2X11) ter-u20i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d20bi.pcf: ter-u20bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u20bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
 +ter-f20i.pcf: ter-u20i.bdf $(X_8859F)
 +	$(UCS2X11) ter-u20i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
 +
@@ -248,12 +444,90 @@
 +ter-p20bi.pcf: ter-u20bi.bdf $(X_PT154)
 +	$(UCS2X11) ter-u20bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
 +
++ter-u20i.pcf: ter-u20i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u20i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u20bi.pcf: ter-u20bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u20bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
 +ter-x20i.pcf: ter-u20i.bdf $(X_10646)
 +	$(UCS2X11) ter-u20i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
 +ter-x20bi.pcf: ter-u20bi.bdf $(X_10646)
 +	$(UCS2X11) ter-u20bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
++ter-122i.pcf: ter-u22i.bdf $(X_88591)
++	$(UCS2X11) ter-u22i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-122bi.pcf: ter-u22bi.bdf $(X_88591)
++	$(UCS2X11) ter-u22bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-222i.pcf: ter-u22i.bdf $(X_88592)
++	$(UCS2X11) ter-u22i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-222bi.pcf: ter-u22bi.bdf $(X_88592)
++	$(UCS2X11) ter-u22bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-522i.pcf: ter-u22i.bdf $(X_88595)
++	$(UCS2X11) ter-u22i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-522bi.pcf: ter-u22bi.bdf $(X_88595)
++	$(UCS2X11) ter-u22bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-922i.pcf: ter-u22i.bdf $(X_88599)
++	$(UCS2X11) ter-u22i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-922bi.pcf: ter-u22bi.bdf $(X_88599)
++	$(UCS2X11) ter-u22bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-c22i.pcf: ter-u22i.bdf $(X_W1251)
++	$(UCS2X11) ter-u22i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-c22bi.pcf: ter-u22bi.bdf $(X_W1251)
++	$(UCS2X11) ter-u22bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-d22i.pcf: ter-u22i.bdf $(X_8859D)
++	$(UCS2X11) ter-u22i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d22bi.pcf: ter-u22bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u22bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-f22i.pcf: ter-u22i.bdf $(X_8859F)
++	$(UCS2X11) ter-u22i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-f22bi.pcf: ter-u22bi.bdf $(X_8859F)
++	$(UCS2X11) ter-u22bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-g22i.pcf: ter-u22i.bdf $(X_8859G)
++	$(UCS2X11) ter-u22i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-g22bi.pcf: ter-u22bi.bdf $(X_8859G)
++	$(UCS2X11) ter-u22bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-k22i.pcf: ter-u22i.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u22i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-k22bi.pcf: ter-u22bi.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u22bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-p22i.pcf: ter-u22i.bdf $(X_PT154)
++	$(UCS2X11) ter-u22i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-p22bi.pcf: ter-u22bi.bdf $(X_PT154)
++	$(UCS2X11) ter-u22bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-u22i.pcf: ter-u22i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u22i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u22bi.pcf: ter-u22bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u22bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-x22i.pcf: ter-u22i.bdf $(X_10646)
++	$(UCS2X11) ter-u22i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-x22bi.pcf: ter-u22bi.bdf $(X_10646)
++	$(UCS2X11) ter-u22bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
 +ter-124i.pcf: ter-u24i.bdf $(X_88591)
 +	$(UCS2X11) ter-u24i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
 +
@@ -284,6 +558,12 @@
 +ter-c24bi.pcf: ter-u24bi.bdf $(X_W1251)
 +	$(UCS2X11) ter-u24bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
 +
++ter-d24i.pcf: ter-u24i.bdf $(X_8859D)
++	$(UCS2X11) ter-u24i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d24bi.pcf: ter-u24bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u24bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
 +ter-f24i.pcf: ter-u24i.bdf $(X_8859F)
 +	$(UCS2X11) ter-u24i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
 +
@@ -308,12 +588,170 @@
 +ter-p24bi.pcf: ter-u24bi.bdf $(X_PT154)
 +	$(UCS2X11) ter-u24bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
 +
++ter-u24i.pcf: ter-u24i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u24i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u24bi.pcf: ter-u24bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u24bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
 +ter-x24i.pcf: ter-u24i.bdf $(X_10646)
 +	$(UCS2X11) ter-u24i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
 +ter-x24bi.pcf: ter-u24bi.bdf $(X_10646)
 +	$(UCS2X11) ter-u24bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
 +
++ter-128i.pcf: ter-u28i.bdf $(X_88591)
++	$(UCS2X11) ter-u28i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-128bi.pcf: ter-u28bi.bdf $(X_88591)
++	$(UCS2X11) ter-u28bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-228i.pcf: ter-u28i.bdf $(X_88592)
++	$(UCS2X11) ter-u28i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-228bi.pcf: ter-u28bi.bdf $(X_88592)
++	$(UCS2X11) ter-u28bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-528i.pcf: ter-u28i.bdf $(X_88595)
++	$(UCS2X11) ter-u28i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-528bi.pcf: ter-u28bi.bdf $(X_88595)
++	$(UCS2X11) ter-u28bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-928i.pcf: ter-u28i.bdf $(X_88599)
++	$(UCS2X11) ter-u28i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-928bi.pcf: ter-u28bi.bdf $(X_88599)
++	$(UCS2X11) ter-u28bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-c28i.pcf: ter-u28i.bdf $(X_W1251)
++	$(UCS2X11) ter-u28i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-c28bi.pcf: ter-u28bi.bdf $(X_W1251)
++	$(UCS2X11) ter-u28bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-d28i.pcf: ter-u28i.bdf $(X_8859D)
++	$(UCS2X11) ter-u28i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d28bi.pcf: ter-u28bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u28bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-f28i.pcf: ter-u28i.bdf $(X_8859F)
++	$(UCS2X11) ter-u28i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-f28bi.pcf: ter-u28bi.bdf $(X_8859F)
++	$(UCS2X11) ter-u28bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-g28i.pcf: ter-u28i.bdf $(X_8859G)
++	$(UCS2X11) ter-u28i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-g28bi.pcf: ter-u28bi.bdf $(X_8859G)
++	$(UCS2X11) ter-u28bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-k28i.pcf: ter-u28i.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u28i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-k28bi.pcf: ter-u28bi.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u28bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-p28i.pcf: ter-u28i.bdf $(X_PT154)
++	$(UCS2X11) ter-u28i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-p28bi.pcf: ter-u28bi.bdf $(X_PT154)
++	$(UCS2X11) ter-u28bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-u28i.pcf: ter-u28i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u28i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u28bi.pcf: ter-u28bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u28bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-x28i.pcf: ter-u28i.bdf $(X_10646)
++	$(UCS2X11) ter-u28i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-x28bi.pcf: ter-u28bi.bdf $(X_10646)
++	$(UCS2X11) ter-u28bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-132i.pcf: ter-u32i.bdf $(X_88591)
++	$(UCS2X11) ter-u32i.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-132bi.pcf: ter-u32bi.bdf $(X_88591)
++	$(UCS2X11) ter-u32bi.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
++
++ter-232i.pcf: ter-u32i.bdf $(X_88592)
++	$(UCS2X11) ter-u32i.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-232bi.pcf: ter-u32bi.bdf $(X_88592)
++	$(UCS2X11) ter-u32bi.bdf $(R_88592) $(X_88592) | $(BDF2PCF) -o $@
++
++ter-532i.pcf: ter-u32i.bdf $(X_88595)
++	$(UCS2X11) ter-u32i.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-532bi.pcf: ter-u32bi.bdf $(X_88595)
++	$(UCS2X11) ter-u32bi.bdf $(R_88595) $(X_88595) | $(BDF2PCF) -o $@
++
++ter-932i.pcf: ter-u32i.bdf $(X_88599)
++	$(UCS2X11) ter-u32i.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-932bi.pcf: ter-u32bi.bdf $(X_88599)
++	$(UCS2X11) ter-u32bi.bdf $(R_88599) $(X_88599) | $(BDF2PCF) -o $@
++
++ter-c32i.pcf: ter-u32i.bdf $(X_W1251)
++	$(UCS2X11) ter-u32i.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-c32bi.pcf: ter-u32bi.bdf $(X_W1251)
++	$(UCS2X11) ter-u32bi.bdf $(R_W1251) $(X_W1251) | $(BDF2PCF) -o $@
++
++ter-d32i.pcf: ter-u32i.bdf $(X_8859D)
++	$(UCS2X11) ter-u32i.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-d32bi.pcf: ter-u32bi.bdf $(X_8859D)
++	$(UCS2X11) ter-u32bi.bdf $(R_8859D) $(X_8859D) | $(BDF2PCF) -o $@
++
++ter-f32i.pcf: ter-u32i.bdf $(X_8859F)
++	$(UCS2X11) ter-u32i.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-f32bi.pcf: ter-u32bi.bdf $(X_8859F)
++	$(UCS2X11) ter-u32bi.bdf $(R_8859F) $(X_8859F) | $(BDF2PCF) -o $@
++
++ter-g32i.pcf: ter-u32i.bdf $(X_8859G)
++	$(UCS2X11) ter-u32i.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-g32bi.pcf: ter-u32bi.bdf $(X_8859G)
++	$(UCS2X11) ter-u32bi.bdf $(R_8859G) $(X_8859G) | $(BDF2PCF) -o $@
++
++ter-k32i.pcf: ter-u32i.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u32i.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-k32bi.pcf: ter-u32bi.bdf $(X_KOI8R)
++	$(UCS2X11) ter-u32bi.bdf $(R_KOI8R) $(X_KOI8R) | $(BDF2PCF) -o $@
++
++ter-p32i.pcf: ter-u32i.bdf $(X_PT154)
++	$(UCS2X11) ter-u32i.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-p32bi.pcf: ter-u32bi.bdf $(X_PT154)
++	$(UCS2X11) ter-u32bi.bdf $(R_PT154) $(X_PT154) | $(BDF2PCF) -o $@
++
++ter-u32i.pcf: ter-u32i.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u32i.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-u32bi.pcf: ter-u32bi.bdf $(X_KOI8U)
++	$(UCS2X11) ter-u32bi.bdf $(R_KOI8U) $(X_KOI8U) | $(BDF2PCF) -o $@
++
++ter-x32i.pcf: ter-u32i.bdf $(X_10646)
++	$(UCS2X11) ter-u32i.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++ter-x32bi.pcf: ter-u32bi.bdf $(X_10646)
++	$(UCS2X11) ter-u32bi.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
++
++
++
+ install-pcf: $(PCF)
+ 	mkdir -p $(x11dir)
+ 	for i in $(PCF) ; do gzip -c $$i > $(x11dir)/$$i.gz ; done
+@@ -1535,4 +2242,4 @@
+ 	for i in $(PCF_12B) ; do rm -f $(x11dir)/$$i.gz ; done
+ 
  clean:
 -	rm -f *.psf *.txt *.raw *.pcf
 +	rm -f *.psf *.txt *.raw *.pcf *.pcf.gz
diff -ruN terminus-font.orig/pkg-descr terminus-font/pkg-descr
--- terminus-font.orig/pkg-descr	Sun Feb 20 13:16:27 2005
+++ terminus-font/pkg-descr	Sun Feb 20 14:31:06 2005
@@ -1,9 +1,9 @@
-The Terminus Font is designed for long (8 and more hours per day) work
-with computers. Version 3.96 contains 528 characters, which cover code
-pages ISO8859-1, ISO8859-2, ISO8859-5, ISO8859-15, Windows-1250,
-Windows-1251, Windows-1252, IBM-437, KOI8-R, KOI8-U, KOI8-E, KOI8-F,
-Bulgarian-MIK, Paratype-PT154, Paratype-PT254, IBM-855, IBM-866 and
-Macintosh-Ukrainian.
+Terminus Font is designed for long (8 and more hours per day) work
+with computers. Version 4.11 contains 594 characters, covering code
+pages ISO8859-1/2/5/9/13/15/16, Windows-1250/1251/1252/1254/1257,
+IBM-437/852/855/866, KOI8-R/U/E/F, Bulgarian-MIK, Paratype-PT154/PT254,
+Macintosh-Ukrainian and Esperanto, and also the vt100 and xterm
+pseudographic characters.
 
 Note: This ports also installed a slanted version of the terminus
 font, contributed by "Sascha Blank" <sblank@tiscali.de> which is NOT
diff -ruN terminus-font.orig/pkg-plist terminus-font/pkg-plist
--- terminus-font.orig/pkg-plist	Sun Feb 20 13:16:27 2005
+++ terminus-font/pkg-plist	Sun Feb 20 14:16:31 2005
@@ -1,3 +1,7 @@
+lib/X11/fonts/local/ter-112b.pcf.gz
+lib/X11/fonts/local/ter-112bi.pcf.gz
+lib/X11/fonts/local/ter-112i.pcf.gz
+lib/X11/fonts/local/ter-112n.pcf.gz
 lib/X11/fonts/local/ter-114b.pcf.gz
 lib/X11/fonts/local/ter-114bi.pcf.gz
 lib/X11/fonts/local/ter-114i.pcf.gz
@@ -14,6 +18,18 @@
 lib/X11/fonts/local/ter-124bi.pcf.gz
 lib/X11/fonts/local/ter-124i.pcf.gz
 lib/X11/fonts/local/ter-124n.pcf.gz
+lib/X11/fonts/local/ter-128b.pcf.gz
+lib/X11/fonts/local/ter-128bi.pcf.gz
+lib/X11/fonts/local/ter-128i.pcf.gz
+lib/X11/fonts/local/ter-128n.pcf.gz
+lib/X11/fonts/local/ter-132b.pcf.gz
+lib/X11/fonts/local/ter-132bi.pcf.gz
+lib/X11/fonts/local/ter-132i.pcf.gz
+lib/X11/fonts/local/ter-132n.pcf.gz
+lib/X11/fonts/local/ter-212b.pcf.gz
+lib/X11/fonts/local/ter-212bi.pcf.gz
+lib/X11/fonts/local/ter-212i.pcf.gz
+lib/X11/fonts/local/ter-212n.pcf.gz
 lib/X11/fonts/local/ter-214b.pcf.gz
 lib/X11/fonts/local/ter-214bi.pcf.gz
 lib/X11/fonts/local/ter-214i.pcf.gz
@@ -30,6 +46,18 @@
 lib/X11/fonts/local/ter-224bi.pcf.gz
 lib/X11/fonts/local/ter-224i.pcf.gz
 lib/X11/fonts/local/ter-224n.pcf.gz
+lib/X11/fonts/local/ter-228b.pcf.gz
+lib/X11/fonts/local/ter-228bi.pcf.gz
+lib/X11/fonts/local/ter-228i.pcf.gz
+lib/X11/fonts/local/ter-228n.pcf.gz
+lib/X11/fonts/local/ter-232b.pcf.gz
+lib/X11/fonts/local/ter-232bi.pcf.gz
+lib/X11/fonts/local/ter-232i.pcf.gz
+lib/X11/fonts/local/ter-232n.pcf.gz
+lib/X11/fonts/local/ter-512b.pcf.gz
+lib/X11/fonts/local/ter-512bi.pcf.gz
+lib/X11/fonts/local/ter-512i.pcf.gz
+lib/X11/fonts/local/ter-512n.pcf.gz
 lib/X11/fonts/local/ter-514b.pcf.gz
 lib/X11/fonts/local/ter-514bi.pcf.gz
 lib/X11/fonts/local/ter-514i.pcf.gz
@@ -46,6 +74,18 @@
 lib/X11/fonts/local/ter-524bi.pcf.gz
 lib/X11/fonts/local/ter-524i.pcf.gz
 lib/X11/fonts/local/ter-524n.pcf.gz
+lib/X11/fonts/local/ter-528b.pcf.gz
+lib/X11/fonts/local/ter-528bi.pcf.gz
+lib/X11/fonts/local/ter-528i.pcf.gz
+lib/X11/fonts/local/ter-528n.pcf.gz
+lib/X11/fonts/local/ter-532b.pcf.gz
+lib/X11/fonts/local/ter-532bi.pcf.gz
+lib/X11/fonts/local/ter-532i.pcf.gz
+lib/X11/fonts/local/ter-532n.pcf.gz
+lib/X11/fonts/local/ter-912b.pcf.gz
+lib/X11/fonts/local/ter-912bi.pcf.gz
+lib/X11/fonts/local/ter-912i.pcf.gz
+lib/X11/fonts/local/ter-912n.pcf.gz
 lib/X11/fonts/local/ter-914b.pcf.gz
 lib/X11/fonts/local/ter-914bi.pcf.gz
 lib/X11/fonts/local/ter-914i.pcf.gz
@@ -62,6 +102,18 @@
 lib/X11/fonts/local/ter-924bi.pcf.gz
 lib/X11/fonts/local/ter-924i.pcf.gz
 lib/X11/fonts/local/ter-924n.pcf.gz
+lib/X11/fonts/local/ter-928b.pcf.gz
+lib/X11/fonts/local/ter-928bi.pcf.gz
+lib/X11/fonts/local/ter-928i.pcf.gz
+lib/X11/fonts/local/ter-928n.pcf.gz
+lib/X11/fonts/local/ter-932b.pcf.gz
+lib/X11/fonts/local/ter-932bi.pcf.gz
+lib/X11/fonts/local/ter-932i.pcf.gz
+lib/X11/fonts/local/ter-932n.pcf.gz
+lib/X11/fonts/local/ter-c12b.pcf.gz
+lib/X11/fonts/local/ter-c12bi.pcf.gz
+lib/X11/fonts/local/ter-c12i.pcf.gz
+lib/X11/fonts/local/ter-c12n.pcf.gz
 lib/X11/fonts/local/ter-c14b.pcf.gz
 lib/X11/fonts/local/ter-c14bi.pcf.gz
 lib/X11/fonts/local/ter-c14i.pcf.gz
@@ -78,6 +130,46 @@
 lib/X11/fonts/local/ter-c24bi.pcf.gz
 lib/X11/fonts/local/ter-c24i.pcf.gz
 lib/X11/fonts/local/ter-c24n.pcf.gz
+lib/X11/fonts/local/ter-c28b.pcf.gz
+lib/X11/fonts/local/ter-c28bi.pcf.gz
+lib/X11/fonts/local/ter-c28i.pcf.gz
+lib/X11/fonts/local/ter-c28n.pcf.gz
+lib/X11/fonts/local/ter-c32b.pcf.gz
+lib/X11/fonts/local/ter-c32bi.pcf.gz
+lib/X11/fonts/local/ter-c32i.pcf.gz
+lib/X11/fonts/local/ter-c32n.pcf.gz
+lib/X11/fonts/local/ter-d12b.pcf.gz
+lib/X11/fonts/local/ter-d12bi.pcf.gz
+lib/X11/fonts/local/ter-d12i.pcf.gz
+lib/X11/fonts/local/ter-d12n.pcf.gz
+lib/X11/fonts/local/ter-d14b.pcf.gz
+lib/X11/fonts/local/ter-d14bi.pcf.gz
+lib/X11/fonts/local/ter-d14i.pcf.gz
+lib/X11/fonts/local/ter-d14n.pcf.gz
+lib/X11/fonts/local/ter-d16b.pcf.gz
+lib/X11/fonts/local/ter-d16bi.pcf.gz
+lib/X11/fonts/local/ter-d16i.pcf.gz
+lib/X11/fonts/local/ter-d16n.pcf.gz
+lib/X11/fonts/local/ter-d20b.pcf.gz
+lib/X11/fonts/local/ter-d20bi.pcf.gz
+lib/X11/fonts/local/ter-d20i.pcf.gz
+lib/X11/fonts/local/ter-d20n.pcf.gz
+lib/X11/fonts/local/ter-d24b.pcf.gz
+lib/X11/fonts/local/ter-d24bi.pcf.gz
+lib/X11/fonts/local/ter-d24i.pcf.gz
+lib/X11/fonts/local/ter-d24n.pcf.gz
+lib/X11/fonts/local/ter-d28b.pcf.gz
+lib/X11/fonts/local/ter-d28bi.pcf.gz
+lib/X11/fonts/local/ter-d28i.pcf.gz
+lib/X11/fonts/local/ter-d28n.pcf.gz
+lib/X11/fonts/local/ter-d32b.pcf.gz
+lib/X11/fonts/local/ter-d32bi.pcf.gz
+lib/X11/fonts/local/ter-d32i.pcf.gz
+lib/X11/fonts/local/ter-d32n.pcf.gz
+lib/X11/fonts/local/ter-f12b.pcf.gz
+lib/X11/fonts/local/ter-f12bi.pcf.gz
+lib/X11/fonts/local/ter-f12i.pcf.gz
+lib/X11/fonts/local/ter-f12n.pcf.gz
 lib/X11/fonts/local/ter-f14b.pcf.gz
 lib/X11/fonts/local/ter-f14bi.pcf.gz
 lib/X11/fonts/local/ter-f14i.pcf.gz
@@ -94,6 +186,18 @@
 lib/X11/fonts/local/ter-f24bi.pcf.gz
 lib/X11/fonts/local/ter-f24i.pcf.gz
 lib/X11/fonts/local/ter-f24n.pcf.gz
+lib/X11/fonts/local/ter-f28b.pcf.gz
+lib/X11/fonts/local/ter-f28bi.pcf.gz
+lib/X11/fonts/local/ter-f28i.pcf.gz
+lib/X11/fonts/local/ter-f28n.pcf.gz
+lib/X11/fonts/local/ter-f32b.pcf.gz
+lib/X11/fonts/local/ter-f32bi.pcf.gz
+lib/X11/fonts/local/ter-f32i.pcf.gz
+lib/X11/fonts/local/ter-f32n.pcf.gz
+lib/X11/fonts/local/ter-g12b.pcf.gz
+lib/X11/fonts/local/ter-g12bi.pcf.gz
+lib/X11/fonts/local/ter-g12i.pcf.gz
+lib/X11/fonts/local/ter-g12n.pcf.gz
 lib/X11/fonts/local/ter-g14b.pcf.gz
 lib/X11/fonts/local/ter-g14bi.pcf.gz
 lib/X11/fonts/local/ter-g14i.pcf.gz
@@ -110,6 +214,18 @@
 lib/X11/fonts/local/ter-g24bi.pcf.gz
 lib/X11/fonts/local/ter-g24i.pcf.gz
 lib/X11/fonts/local/ter-g24n.pcf.gz
+lib/X11/fonts/local/ter-g28b.pcf.gz
+lib/X11/fonts/local/ter-g28bi.pcf.gz
+lib/X11/fonts/local/ter-g28i.pcf.gz
+lib/X11/fonts/local/ter-g28n.pcf.gz
+lib/X11/fonts/local/ter-g32b.pcf.gz
+lib/X11/fonts/local/ter-g32bi.pcf.gz
+lib/X11/fonts/local/ter-g32i.pcf.gz
+lib/X11/fonts/local/ter-g32n.pcf.gz
+lib/X11/fonts/local/ter-k12b.pcf.gz
+lib/X11/fonts/local/ter-k12bi.pcf.gz
+lib/X11/fonts/local/ter-k12i.pcf.gz
+lib/X11/fonts/local/ter-k12n.pcf.gz
 lib/X11/fonts/local/ter-k14b.pcf.gz
 lib/X11/fonts/local/ter-k14bi.pcf.gz
 lib/X11/fonts/local/ter-k14i.pcf.gz
@@ -126,6 +242,18 @@
 lib/X11/fonts/local/ter-k24bi.pcf.gz
 lib/X11/fonts/local/ter-k24i.pcf.gz
 lib/X11/fonts/local/ter-k24n.pcf.gz
+lib/X11/fonts/local/ter-k28b.pcf.gz
+lib/X11/fonts/local/ter-k28bi.pcf.gz
+lib/X11/fonts/local/ter-k28i.pcf.gz
+lib/X11/fonts/local/ter-k28n.pcf.gz
+lib/X11/fonts/local/ter-k32b.pcf.gz
+lib/X11/fonts/local/ter-k32bi.pcf.gz
+lib/X11/fonts/local/ter-k32i.pcf.gz
+lib/X11/fonts/local/ter-k32n.pcf.gz
+lib/X11/fonts/local/ter-p12b.pcf.gz
+lib/X11/fonts/local/ter-p12bi.pcf.gz
+lib/X11/fonts/local/ter-p12i.pcf.gz
+lib/X11/fonts/local/ter-p12n.pcf.gz
 lib/X11/fonts/local/ter-p14b.pcf.gz
 lib/X11/fonts/local/ter-p14bi.pcf.gz
 lib/X11/fonts/local/ter-p14i.pcf.gz
@@ -142,6 +270,46 @@
 lib/X11/fonts/local/ter-p24bi.pcf.gz
 lib/X11/fonts/local/ter-p24i.pcf.gz
 lib/X11/fonts/local/ter-p24n.pcf.gz
+lib/X11/fonts/local/ter-p28b.pcf.gz
+lib/X11/fonts/local/ter-p28bi.pcf.gz
+lib/X11/fonts/local/ter-p28i.pcf.gz
+lib/X11/fonts/local/ter-p28n.pcf.gz
+lib/X11/fonts/local/ter-p32b.pcf.gz
+lib/X11/fonts/local/ter-p32bi.pcf.gz
+lib/X11/fonts/local/ter-p32i.pcf.gz
+lib/X11/fonts/local/ter-p32n.pcf.gz
+lib/X11/fonts/local/ter-u12b.pcf.gz
+lib/X11/fonts/local/ter-u12bi.pcf.gz
+lib/X11/fonts/local/ter-u12i.pcf.gz
+lib/X11/fonts/local/ter-u12n.pcf.gz
+lib/X11/fonts/local/ter-u14b.pcf.gz
+lib/X11/fonts/local/ter-u14bi.pcf.gz
+lib/X11/fonts/local/ter-u14i.pcf.gz
+lib/X11/fonts/local/ter-u14n.pcf.gz
+lib/X11/fonts/local/ter-u16b.pcf.gz
+lib/X11/fonts/local/ter-u16bi.pcf.gz
+lib/X11/fonts/local/ter-u16i.pcf.gz
+lib/X11/fonts/local/ter-u16n.pcf.gz
+lib/X11/fonts/local/ter-u20b.pcf.gz
+lib/X11/fonts/local/ter-u20bi.pcf.gz
+lib/X11/fonts/local/ter-u20i.pcf.gz
+lib/X11/fonts/local/ter-u20n.pcf.gz
+lib/X11/fonts/local/ter-u24b.pcf.gz
+lib/X11/fonts/local/ter-u24bi.pcf.gz
+lib/X11/fonts/local/ter-u24i.pcf.gz
+lib/X11/fonts/local/ter-u24n.pcf.gz
+lib/X11/fonts/local/ter-u28b.pcf.gz
+lib/X11/fonts/local/ter-u28bi.pcf.gz
+lib/X11/fonts/local/ter-u28i.pcf.gz
+lib/X11/fonts/local/ter-u28n.pcf.gz
+lib/X11/fonts/local/ter-u32b.pcf.gz
+lib/X11/fonts/local/ter-u32bi.pcf.gz
+lib/X11/fonts/local/ter-u32i.pcf.gz
+lib/X11/fonts/local/ter-u32n.pcf.gz
+lib/X11/fonts/local/ter-x12b.pcf.gz
+lib/X11/fonts/local/ter-x12bi.pcf.gz
+lib/X11/fonts/local/ter-x12i.pcf.gz
+lib/X11/fonts/local/ter-x12n.pcf.gz
 lib/X11/fonts/local/ter-x14b.pcf.gz
 lib/X11/fonts/local/ter-x14bi.pcf.gz
 lib/X11/fonts/local/ter-x14i.pcf.gz
@@ -158,5 +326,13 @@
 lib/X11/fonts/local/ter-x24bi.pcf.gz
 lib/X11/fonts/local/ter-x24i.pcf.gz
 lib/X11/fonts/local/ter-x24n.pcf.gz
+lib/X11/fonts/local/ter-x28b.pcf.gz
+lib/X11/fonts/local/ter-x28bi.pcf.gz
+lib/X11/fonts/local/ter-x28i.pcf.gz
+lib/X11/fonts/local/ter-x28n.pcf.gz
+lib/X11/fonts/local/ter-x32b.pcf.gz
+lib/X11/fonts/local/ter-x32bi.pcf.gz
+lib/X11/fonts/local/ter-x32i.pcf.gz
+lib/X11/fonts/local/ter-x32n.pcf.gz
 @exec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)
 @unexec (cd %D/lib/X11/fonts/local ; %D/bin/mkfontdir)