5 files changed, 196 insertions, 61 deletions

diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index c0b025c42ad9..f6aa9efd34f0 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.28
-PORTREVISION=	1
+PORTVERSION=	4.30
 CATEGORIES=	x11-fonts
-MASTER_SITES=	http://www.is-vn.bg/hamster/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:L}/${PORTNAME}-${PORTVERSION}|}
+
 PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	vlad@vlad.uz.ua
@@ -37,43 +37,43 @@ FONTDIR=	lib/X11/fonts/${PORTNAME}
 PLIST_SUB+=	FONTDIR=${FONTDIR}
 
 .if defined(WITH_AO2)
-PATCHFILES+=	terminus-font-4.28-ao2.diff.gz
+PATCHFILES+=	terminus-font-4.30-ao2.diff.gz
 .endif
 
 .if defined(WITH_DV1)
-PATCHFILES+=	terminus-font-4.28-dv1.diff.gz
+PATCHFILES+=	terminus-font-4.30-dv1.diff.gz
 .endif
 
 .if defined(WITH_GE1)
-PATCHFILES+=	terminus-font-4.28-ge1.diff.gz
+PATCHFILES+=	terminus-font-4.30-ge1.diff.gz
 .endif
 
 .if defined(WITH_GQ2)
-PATCHFILES+=	terminus-font-4.28-gq2.diff.gz
+PATCHFILES+=	terminus-font-4.30-gq2.diff.gz
 .endif
 
 .if defined(WITH_IJ1)
-PATCHFILES+=	terminus-font-4.28-ij1.diff.gz
+PATCHFILES+=	terminus-font-4.30-ij1.diff.gz
 .endif
 
 .if defined(WITH_KA2)
-PATCHFILES+=	terminus-font-4.28-ka2.diff.gz
+PATCHFILES+=	terminus-font-4.30-ka2.diff.gz
 .endif
 
 .if defined(WITH_CM2)
-PATCHFILES+=	terminus-font-4.28-cm2.diff.gz
+PATCHFILES+=	terminus-font-4.30-cm2.diff.gz
 .endif
 
 post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
-	@${MKDIR} ${LOCALBASE}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR}
+	@${MKDIR} ${PREFIX}/${FONTDIR}
+	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${PREFIX}/${FONTDIR}
 
 post-install:
-	@cd ${LOCALBASE}/${FONTDIR}; mkfontdir
-	@${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true
-	@command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true
+	@cd ${PREFIX}/${FONTDIR}; mkfontdir
+	@${CP} ${PREFIX}/${FONTDIR}/fonts.dir ${PREFIX}/${FONTDIR}/fonts.scale || true
+	@command fc-cache -f -v ${PREFIX}/${FONTDIR} || true
 
 .include <bsd.port.post.mk>
diff --git a/x11-fonts/terminus-font/distinfo b/x11-fonts/terminus-font/distinfo
index 13d43176fe73..b4ec04364e99 100644
--- a/x11-fonts/terminus-font/distinfo
+++ b/x11-fonts/terminus-font/distinfo
@@ -1,27 +1,24 @@
-MD5 (terminus-font-4.28.tar.gz) = 15bf2f17b625312383fd9dae0925a17e
-SHA256 (terminus-font-4.28.tar.gz) = 1e8010ded51141d26ec0bb9bea70cc1360d27d562b80ca7c2dcbf3fef90fb20f
-SIZE (terminus-font-4.28.tar.gz) = 229336
-MD5 (terminus-font-4.28-ao2.diff.gz) = b7baceaca1b08c3ce1e5377d78f670d0
-SHA256 (terminus-font-4.28-ao2.diff.gz) = ec49f123d447f269a1fdee6afca7efc85ac2faf04277ab2a1385063c985074fc
-SIZE (terminus-font-4.28-ao2.diff.gz) = 3559
-MD5 (terminus-font-4.28-cm2.diff.gz) = 640526f36cc475246d6f94e2c63218b6
-SHA256 (terminus-font-4.28-cm2.diff.gz) = 9c29419e8221b95785234a5e7a6032c16d866e2fc29f20062b68ea4c183b8e02
-SIZE (terminus-font-4.28-cm2.diff.gz) = 1428
-MD5 (terminus-font-4.28-dv1.diff.gz) = 74e2db5288065403a58c28672590c1cd
-SHA256 (terminus-font-4.28-dv1.diff.gz) = dec607b66ecd31ada8800e5c16af24692e7c5acb9e5f528156a57232a9c7b194
-SIZE (terminus-font-4.28-dv1.diff.gz) = 1098
-MD5 (terminus-font-4.28-ge1.diff.gz) = 7815830460294d79d8508199499e1408
-SHA256 (terminus-font-4.28-ge1.diff.gz) = 4279c670d01fb46617101ba2ad6816ecd3e45d8abc8c6c35e9d7f9439c6a6a67
-SIZE (terminus-font-4.28-ge1.diff.gz) = 1045
-MD5 (terminus-font-4.28-gq2.diff.gz) = dfda5fabd3e1ee1f5fdbd2a54c127745
-SHA256 (terminus-font-4.28-gq2.diff.gz) = 624e62318b54e9c2356f5c41fe0a4b1a6916d57634abfbe79237d12a235ef0c5
-SIZE (terminus-font-4.28-gq2.diff.gz) = 579
-MD5 (terminus-font-4.28-ij1.diff.gz) = 54ea26d7671d57d611ee4229f000fc10
-SHA256 (terminus-font-4.28-ij1.diff.gz) = c394e8351276f7bbb3bde9fe4407971ee157bf1570ba60146ba6d89c437affcc
-SIZE (terminus-font-4.28-ij1.diff.gz) = 1306
-MD5 (terminus-font-4.28-ka2.diff.gz) = 9095d6b44822b77c157dc53f68daa778
-SHA256 (terminus-font-4.28-ka2.diff.gz) = 94893a33f856da419676423133e1f1ae9480eab7b00c50909b07eadeaaf59b50
-SIZE (terminus-font-4.28-ka2.diff.gz) = 967
-MD5 (terminus-font-4.28-kx3.diff.gz) = 5b815931819bebf6ba37e4137340b01c
-SHA256 (terminus-font-4.28-kx3.diff.gz) = fb4776c6dcb31b17d2ae020af2e928c5c2d06c5f800201b9d2ed75131ded3804
-SIZE (terminus-font-4.28-kx3.diff.gz) = 3242
+MD5 (terminus-font-4.30.tar.gz) = 6f8bd95b593851f9f5c210a9d33cbbf1
+SHA256 (terminus-font-4.30.tar.gz) = ca15718f715f1ca7af827a8ab5543b0c0339b2515f39f8c15f241b2bc1a15a9a
+SIZE (terminus-font-4.30.tar.gz) = 267236
+MD5 (terminus-font-4.30-ao2.diff.gz) = f1193b61ff9ec832dfb4e5bb193df7d2
+SHA256 (terminus-font-4.30-ao2.diff.gz) = 4586eb56533c3fad417b13d64c88bb97a3604f68dac1fc4c90372c9c93cc82ac
+SIZE (terminus-font-4.30-ao2.diff.gz) = 4064
+MD5 (terminus-font-4.30-dv1.diff.gz) = a94f276f1ce268e81a1a85dbf1d97376
+SHA256 (terminus-font-4.30-dv1.diff.gz) = fc2c3a28e1542ec19083c0739c39fa2e914047173cd78e0da824c41ba2315399
+SIZE (terminus-font-4.30-dv1.diff.gz) = 1242
+MD5 (terminus-font-4.30-ge1.diff.gz) = 4313d28cdf524c3f8b0539e45031dacc
+SHA256 (terminus-font-4.30-ge1.diff.gz) = c84dab5738dbd174399e05ff62e4e7ebaf77c6b1ff24c8c423bd4a7cd47b5f90
+SIZE (terminus-font-4.30-ge1.diff.gz) = 1158
+MD5 (terminus-font-4.30-gq2.diff.gz) = f03b1e0185dabefaca6d209e628e6049
+SHA256 (terminus-font-4.30-gq2.diff.gz) = a021be2398dbc3895ad1bfc7367fd45c96fee42b1c98a53a52aa19732441c563
+SIZE (terminus-font-4.30-gq2.diff.gz) = 648
+MD5 (terminus-font-4.30-ij1.diff.gz) = 1700ce92665bd8c4f2082e68e1957570
+SHA256 (terminus-font-4.30-ij1.diff.gz) = 3c9d74b764d144e963e6d2e41969593a4888b2a3c131466226c0b455993f37ba
+SIZE (terminus-font-4.30-ij1.diff.gz) = 1494
+MD5 (terminus-font-4.30-ka2.diff.gz) = 9424c0fde2e72c3d7453b01caf92369e
+SHA256 (terminus-font-4.30-ka2.diff.gz) = e829803252a6250172902afa65a9cd207ffdf0b57248c26506b9e8abac0363ce
+SIZE (terminus-font-4.30-ka2.diff.gz) = 1067
+MD5 (terminus-font-4.30-cm2.diff.gz) = 02950bf29b803ff673f4434aceb539ea
+SHA256 (terminus-font-4.30-cm2.diff.gz) = eae31c02216ea9b586eea121b7ab70ac71a869c8a62551c719ef1fac397db744
+SIZE (terminus-font-4.30-cm2.diff.gz) = 1429
diff --git a/x11-fonts/terminus-font/files/patch-aa b/x11-fonts/terminus-font/files/patch-aa
index df78d0b89079..d309a3f93bed 100644
--- a/x11-fonts/terminus-font/files/patch-aa
+++ b/x11-fonts/terminus-font/files/patch-aa
@@ -1,42 +1,45 @@
---- Makefile.orig	2008-09-14 21:57:18.000000000 +0400
-+++ Makefile	2008-10-23 19:51:40.000000000 +0400
+--- Makefile-orig	2010-07-17 09:12:42.000000000 +0300
++++ Makefile	2010-07-17 09:22:50.000000000 +0300
 @@ -6,6 +6,7 @@
  BDF2RAW	= $(PERL) ./bdftopsf.pl -h
  UCS2X11	= $(PERL) ./ucstoany.pl
  BDF2PCF	= bdftopcf
-+MKITALIC	= mkitalic
++MKITALIC = mkitalic
  
  R_88591	= ISO8859 1
  R_88592	= ISO8859 2
-@@ -56,19 +57,26 @@
+@@ -58,21 +59,29 @@
  
  PCF_12N	= ter-112n.pcf ter-212n.pcf ter-512n.pcf ter-712n.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-712b.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-712i.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-712bi.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_12I = ter-112i.pcf ter-212i.pcf ter-512i.pcf ter-712i.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-712bi.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-714n.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-714b.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-714i.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-714bi.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_14I = ter-114i.pcf ter-214i.pcf ter-514i.pcf ter-714i.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-714bi.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-716n.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-716b.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-716i.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-716bi.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_16I = ter-116i.pcf ter-216i.pcf ter-516i.pcf ter-716i.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-716bi.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-720n.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-720b.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-720i.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-720bi.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_20I = ter-120i.pcf ter-220i.pcf ter-520i.pcf ter-720i.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-720bi.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_22N	= ter-122n.pcf ter-222n.pcf ter-522n.pcf ter-722n.pcf ter-922n.pcf ter-c22n.pcf ter-d22n.pcf ter-f22n.pcf ter-g22n.pcf ter-k22n.pcf ter-p22n.pcf ter-u22n.pcf ter-x22n.pcf
+ PCF_22B	= ter-122b.pcf ter-222b.pcf ter-522b.pcf ter-722b.pcf ter-922b.pcf ter-c22b.pcf ter-d22b.pcf ter-f22b.pcf ter-g22b.pcf ter-k22b.pcf ter-p22b.pcf ter-u22b.pcf ter-x22b.pcf
++PCF_22I = ter-122i.pcf ter-224i.pcf ter-522i.pcf ter-722i.pcf ter-922i.pcf ter-c22i.pcf ter-d22i.pcf ter-f22i.pcf ter-g22i.pcf ter-k22i.pcf ter-p22i.pcf ter-u22i.pcf ter-x22i.pcf ter-122bi.pcf ter-222bi.pcf ter-522bi.pcf ter-722bi.pcf ter-922bi.pcf ter-c22bi.pcf ter-d22bi.pcf ter-f22bi.pcf ter-g22bi.pcf ter-k22bi.pcf ter-p22bi.pcf ter-u22bi.pcf ter-x22bi.pcf
  PCF_24N	= ter-124n.pcf ter-224n.pcf ter-524n.pcf ter-724n.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-724b.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-724i.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-724bi.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_24I = ter-124i.pcf ter-224i.pcf ter-524i.pcf ter-724i.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-724bi.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-728n.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-728b.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-728i.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-728bi.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_28I = ter-128i.pcf ter-228i.pcf ter-528i.pcf ter-728i.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-728bi.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-732n.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-732b.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_12B) $(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-732i.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-732bi.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_N12	= $(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	= $(PCF_12N) $(PCF_12B) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
++PCF_32I = ter-132i.pcf ter-232i.pcf ter-532i.pcf ter-732i.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-732bi.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_22N) $(PCF_22B) $(PCF_22I) $(PCF_24N) $(PCF_24B) $(PCF_24I) $(PCF_28N) $(PCF_28B) $(PCF_28I) $(PCF_32N) $(PCF_32B) $(PCF_32I)
+ PCF_N12	= $(PCF_12N) $(PCF_14N) $(PCF_14B) $(PCF_16N) $(PCF_16B) $(PCF_20N) $(PCF_20B) $(PCF_22N) $(PCF_22B) $(PCF_24N) $(PCF_24B) $(PCF_28N) $(PCF_28B) $(PCF_32N) $(PCF_32B)
  
- EEE	= ter-x12n.pcf ter-x12b.pcf ter-x14n.pcf ter-x14b.pcf ter-x16n.pcf ter-x16b.pcf ter-x20n.pcf ter-x20b.pcf
-@@ -1098,6 +1106,48 @@
+ EEE	= ter-x12n.pcf ter-x12b.pcf ter-x14n.pcf ter-x14b.pcf ter-x16n.pcf ter-x16b.pcf ter-x20n.pcf ter-x20b.pcf ter-x22n.pcf ter-x22b.pcf
+@@ -1182,6 +1191,54 @@
  X_PT154	= uni/x11gr.uni uni/ascii-h.uni uni/pt-154.uni
  X_10646	= uni/x11gr.uni uni/10646-1.uni
  
@@ -64,6 +67,12 @@
 +ter-u20bi.bdf: ter-u20b.bdf
 +	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
++ter-u22i.bdf: ter-u20n.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
++ter-u22bi.bdf: ter-u20b.bdf
++	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
++
 +ter-u24i.bdf: ter-u24n.bdf
 +	$(MKITALIC) ${.ALLSRC} > ${.TARGET}
 +
@@ -85,7 +94,7 @@
  ter-112n.pcf: ter-u12n.bdf $(X_88591)
  	$(UCS2X11) ter-u12n.bdf $(R_88591) $(X_88591) | $(BDF2PCF) -o $@
  
-@@ -1644,6 +1694,552 @@
+@@ -1806,6 +1863,630 @@
  ter-x32b.pcf: ter-u32b.bdf $(X_10646)
  	$(UCS2X11) ter-u32b.bdf $(R_10646) $(X_10646) | $(BDF2PCF) -o $@
  
@@ -401,6 +410,84 @@
 +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-722i.pcf: ter-u22i.bdf $(X_88597)
++	$(UCS2X11) ter-u22i.bdf $(R_88597) $(X_88597) | $(BDF2PCF) -o $@
++
++ter-722bi.pcf: ter-u22bi.bdf $(X_88597)
++	$(UCS2X11) ter-u22bi.bdf $(R_88597) $(X_88597) | $(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 $@
 +
@@ -638,7 +725,7 @@
  install-pcf: $(PCF)
  	mkdir -p $(DESTDIR)$(x11dir)
  	for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done
-@@ -1659,4 +2255,4 @@
+@@ -1821,4 +2502,4 @@
  	for i in $(PCF_N12) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done
  
  clean:
diff --git a/x11-fonts/terminus-font/pkg-descr b/x11-fonts/terminus-font/pkg-descr
index ab48b91a8b22..b4c3f9c7bf6c 100644
--- a/x11-fonts/terminus-font/pkg-descr
+++ b/x11-fonts/terminus-font/pkg-descr
@@ -10,4 +10,4 @@ font, contributed by "Sascha Blank" <sblank@tiscali.de> which is NOT
 in the original release.
 
 Author: Dimitar Toshkov Zhekov <jimmy@is-vn.bg>
-WWW: http://www.is-vn.bg/hamster/
+WWW: http://terminus-font.sourceforge.net
diff --git a/x11-fonts/terminus-font/pkg-plist b/x11-fonts/terminus-font/pkg-plist
index fb36f5f132fc..b1af7d9e7838 100644
--- a/x11-fonts/terminus-font/pkg-plist
+++ b/x11-fonts/terminus-font/pkg-plist
@@ -16,6 +16,10 @@
 %%FONTDIR%%/ter-120bi.pcf.gz
 %%FONTDIR%%/ter-120i.pcf.gz
 %%FONTDIR%%/ter-120n.pcf.gz
+%%FONTDIR%%/ter-122b.pcf.gz
+%%FONTDIR%%/ter-122bi.pcf.gz
+%%FONTDIR%%/ter-122i.pcf.gz
+%%FONTDIR%%/ter-122n.pcf.gz
 %%FONTDIR%%/ter-124b.pcf.gz
 %%FONTDIR%%/ter-124bi.pcf.gz
 %%FONTDIR%%/ter-124i.pcf.gz
@@ -44,6 +48,9 @@
 %%FONTDIR%%/ter-220bi.pcf.gz
 %%FONTDIR%%/ter-220i.pcf.gz
 %%FONTDIR%%/ter-220n.pcf.gz
+%%FONTDIR%%/ter-222b.pcf.gz
+%%FONTDIR%%/ter-222bi.pcf.gz
+%%FONTDIR%%/ter-222n.pcf.gz
 %%FONTDIR%%/ter-224b.pcf.gz
 %%FONTDIR%%/ter-224bi.pcf.gz
 %%FONTDIR%%/ter-224i.pcf.gz
@@ -72,6 +79,10 @@
 %%FONTDIR%%/ter-520bi.pcf.gz
 %%FONTDIR%%/ter-520i.pcf.gz
 %%FONTDIR%%/ter-520n.pcf.gz
+%%FONTDIR%%/ter-522b.pcf.gz
+%%FONTDIR%%/ter-522bi.pcf.gz
+%%FONTDIR%%/ter-522i.pcf.gz
+%%FONTDIR%%/ter-522n.pcf.gz
 %%FONTDIR%%/ter-524b.pcf.gz
 %%FONTDIR%%/ter-524bi.pcf.gz
 %%FONTDIR%%/ter-524i.pcf.gz
@@ -100,6 +111,10 @@
 %%FONTDIR%%/ter-720bi.pcf.gz
 %%FONTDIR%%/ter-720i.pcf.gz
 %%FONTDIR%%/ter-720n.pcf.gz
+%%FONTDIR%%/ter-722b.pcf.gz
+%%FONTDIR%%/ter-722bi.pcf.gz
+%%FONTDIR%%/ter-722i.pcf.gz
+%%FONTDIR%%/ter-722n.pcf.gz
 %%FONTDIR%%/ter-724b.pcf.gz
 %%FONTDIR%%/ter-724bi.pcf.gz
 %%FONTDIR%%/ter-724i.pcf.gz
@@ -128,6 +143,10 @@
 %%FONTDIR%%/ter-920bi.pcf.gz
 %%FONTDIR%%/ter-920i.pcf.gz
 %%FONTDIR%%/ter-920n.pcf.gz
+%%FONTDIR%%/ter-922b.pcf.gz
+%%FONTDIR%%/ter-922bi.pcf.gz
+%%FONTDIR%%/ter-922i.pcf.gz
+%%FONTDIR%%/ter-922n.pcf.gz
 %%FONTDIR%%/ter-924b.pcf.gz
 %%FONTDIR%%/ter-924bi.pcf.gz
 %%FONTDIR%%/ter-924i.pcf.gz
@@ -156,6 +175,10 @@
 %%FONTDIR%%/ter-c20bi.pcf.gz
 %%FONTDIR%%/ter-c20i.pcf.gz
 %%FONTDIR%%/ter-c20n.pcf.gz
+%%FONTDIR%%/ter-c22b.pcf.gz
+%%FONTDIR%%/ter-c22bi.pcf.gz
+%%FONTDIR%%/ter-c22i.pcf.gz
+%%FONTDIR%%/ter-c22n.pcf.gz
 %%FONTDIR%%/ter-c24b.pcf.gz
 %%FONTDIR%%/ter-c24bi.pcf.gz
 %%FONTDIR%%/ter-c24i.pcf.gz
@@ -184,6 +207,10 @@
 %%FONTDIR%%/ter-d20bi.pcf.gz
 %%FONTDIR%%/ter-d20i.pcf.gz
 %%FONTDIR%%/ter-d20n.pcf.gz
+%%FONTDIR%%/ter-d22b.pcf.gz
+%%FONTDIR%%/ter-d22bi.pcf.gz
+%%FONTDIR%%/ter-d22i.pcf.gz
+%%FONTDIR%%/ter-d22n.pcf.gz
 %%FONTDIR%%/ter-d24b.pcf.gz
 %%FONTDIR%%/ter-d24bi.pcf.gz
 %%FONTDIR%%/ter-d24i.pcf.gz
@@ -212,6 +239,10 @@
 %%FONTDIR%%/ter-f20bi.pcf.gz
 %%FONTDIR%%/ter-f20i.pcf.gz
 %%FONTDIR%%/ter-f20n.pcf.gz
+%%FONTDIR%%/ter-f22b.pcf.gz
+%%FONTDIR%%/ter-f22bi.pcf.gz
+%%FONTDIR%%/ter-f22i.pcf.gz
+%%FONTDIR%%/ter-f22n.pcf.gz
 %%FONTDIR%%/ter-f24b.pcf.gz
 %%FONTDIR%%/ter-f24bi.pcf.gz
 %%FONTDIR%%/ter-f24i.pcf.gz
@@ -240,6 +271,10 @@
 %%FONTDIR%%/ter-g20bi.pcf.gz
 %%FONTDIR%%/ter-g20i.pcf.gz
 %%FONTDIR%%/ter-g20n.pcf.gz
+%%FONTDIR%%/ter-g22b.pcf.gz
+%%FONTDIR%%/ter-g22bi.pcf.gz
+%%FONTDIR%%/ter-g22i.pcf.gz
+%%FONTDIR%%/ter-g22n.pcf.gz
 %%FONTDIR%%/ter-g24b.pcf.gz
 %%FONTDIR%%/ter-g24bi.pcf.gz
 %%FONTDIR%%/ter-g24i.pcf.gz
@@ -268,6 +303,10 @@
 %%FONTDIR%%/ter-k20bi.pcf.gz
 %%FONTDIR%%/ter-k20i.pcf.gz
 %%FONTDIR%%/ter-k20n.pcf.gz
+%%FONTDIR%%/ter-k22b.pcf.gz
+%%FONTDIR%%/ter-k22bi.pcf.gz
+%%FONTDIR%%/ter-k22i.pcf.gz
+%%FONTDIR%%/ter-k22n.pcf.gz
 %%FONTDIR%%/ter-k24b.pcf.gz
 %%FONTDIR%%/ter-k24bi.pcf.gz
 %%FONTDIR%%/ter-k24i.pcf.gz
@@ -296,6 +335,10 @@
 %%FONTDIR%%/ter-p20bi.pcf.gz
 %%FONTDIR%%/ter-p20i.pcf.gz
 %%FONTDIR%%/ter-p20n.pcf.gz
+%%FONTDIR%%/ter-p22b.pcf.gz
+%%FONTDIR%%/ter-p22bi.pcf.gz
+%%FONTDIR%%/ter-p22i.pcf.gz
+%%FONTDIR%%/ter-p22n.pcf.gz
 %%FONTDIR%%/ter-p24b.pcf.gz
 %%FONTDIR%%/ter-p24bi.pcf.gz
 %%FONTDIR%%/ter-p24i.pcf.gz
@@ -324,6 +367,10 @@
 %%FONTDIR%%/ter-u20bi.pcf.gz
 %%FONTDIR%%/ter-u20i.pcf.gz
 %%FONTDIR%%/ter-u20n.pcf.gz
+%%FONTDIR%%/ter-u22b.pcf.gz
+%%FONTDIR%%/ter-u22bi.pcf.gz
+%%FONTDIR%%/ter-u22i.pcf.gz
+%%FONTDIR%%/ter-u22n.pcf.gz
 %%FONTDIR%%/ter-u24b.pcf.gz
 %%FONTDIR%%/ter-u24bi.pcf.gz
 %%FONTDIR%%/ter-u24i.pcf.gz
@@ -352,6 +399,10 @@
 %%FONTDIR%%/ter-x20bi.pcf.gz
 %%FONTDIR%%/ter-x20i.pcf.gz
 %%FONTDIR%%/ter-x20n.pcf.gz
+%%FONTDIR%%/ter-x22b.pcf.gz
+%%FONTDIR%%/ter-x22bi.pcf.gz
+%%FONTDIR%%/ter-x22i.pcf.gz
+%%FONTDIR%%/ter-x22n.pcf.gz
 %%FONTDIR%%/ter-x24b.pcf.gz
 %%FONTDIR%%/ter-x24bi.pcf.gz
 %%FONTDIR%%/ter-x24i.pcf.gz