Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/terminus-font/Makefile,v
retrieving revision 1.20
diff -u -d -r1.20 Makefile
--- Makefile	22 Jun 2011 23:06:22 -0000	1.20
+++ Makefile	5 Aug 2011 11:34:55 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	terminus-font
-PORTVERSION=	4.35
+PORTVERSION=	4.36
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S|%SUBDIR%|${PORTNAME:L}/${PORTNAME}-${PORTVERSION}|}
 
@@ -27,8 +27,8 @@
 		GQ2 "Variant of grave accent and apostrophe" off \
 		IJ1 "Variant of cyrillic letters 'i' and 'short i'" off \
 		KA2 "Variant of cyrillic letter 'ka'" off \
-		CM2 "Variant of letters with circumflex, caron and macron" off \
-		HI2 "Higher uppercase letters, for size 18" off
+		HI2 "Higher uppercase letters, for size 18" off \
+		LL2 "Variant with more distinctive l (ell)" off
 
 SUB_LIST=	FONTDIR="${PREFIX}/${FONTDIR}"
 SUB_FILES=	pkg-message
@@ -43,7 +43,7 @@
 .if defined(WITH_AO2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ao2.diff
 .endif
-.if defined(WITH_DV1)
+.if defined(WITH_DV1) && !defined(WITH_HI2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/dv1.diff
 .endif
 .if defined(WITH_GE2)
@@ -55,12 +55,9 @@
 .if defined(WITH_IJ1)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ij1.diff
 .endif
-.if defined(WITH_KA2)
+.if defined(WITH_KA2) && !defined(WITH_HI2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ka2.diff
 .endif
-.if defined(WITH_CM2)
-	cd ${WRKSRC} && ${PATCH} -p1 -i alt/cm2.diff
-.endif
 .if defined(WITH_HI2)
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2.diff
 .if defined(WITH_DV1)
@@ -70,6 +67,9 @@
 	cd ${WRKSRC} && ${PATCH} -p1 -i alt/hi2-ka2.diff
 .endif
 .endif
+.if defined(WITH_LL2)
+	cd ${WRKSRC} && ${PATCH} -p1 -i alt/ll2.diff
+.endif
 
 post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/x11-fonts/terminus-font/distinfo,v
retrieving revision 1.10
diff -u -d -r1.10 distinfo
--- distinfo	22 Jun 2011 23:06:22 -0000	1.10
+++ distinfo	5 Aug 2011 11:34:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.35.tar.gz) = 6ae4cd2186050c96997052e167013aa21b6039a164f31fa06e9ae697f3d8b8dc
-SIZE (terminus-font-4.35.tar.gz) = 313577
+SHA256 (terminus-font-4.36.tar.gz) = 7b0dcebd8ef2e36aeeb7fcd97082ad881e95b2871e40c9a6255377bea6bcd345
+SIZE (terminus-font-4.36.tar.gz) = 309387