Update to Thomas E. Dickey's version 2.0 of luit.

History

Luit was written by Juliusz Chroboczek for the XFree86 Project in
2001-2002. There were improvements and fixes by several people, in
particular Tomohiro Kubota's extensions for CJK encodings.

There was no maintainer for some time; I adopted it in 2006 to
ensure that it continued to support xterm (details are listed in
the luit.log.html file within the source).

Besides the maintenance issue that attracted my attention in 2005
(untested changes to compiled-in file locations by Xorg hackers),
Luit has had from the outset a technical issue: its associated
font-encoding library.

Juliusz Chroboczek used the font-encoding library to work around
performance issues with direct use of iconv. This solution has
proven to be a drawback:

    the font-encoding library is little used (other than by luit),
    and also lacks a maintainer.  the font-encoding library does
    not provide the full range of encodings that iconv does.  the
    Xorg configure scripting and other dependencies surrounding
    the library have been subject to uncontrolled growth.

I solved the problem by implementing an efficient conversion using
iconv. Luit still supports the font-encoding library if it is found
by the configure script. If you choose, luit can easily be built
using iconv.

However, as of luit 2.0, the font-encoding library has been
deprecated:

    Luit includes all of the relevant functionality for using the
    ".enc" files which are distributed separately. You may have
    these files as a separate package, e.g., "xfonts-encodings",
    or as part of "xfonts-x11-fonts-misc", "x11-font-encodings" or
    even "encodings". If you have trouble finding the package, look
    for a specific file such as adobe-standard.enc. The encoding
    files are rarely packaged with luit, and oddly enough are never
    made a package dependency. The only other use that I am aware
    of for the files is for the defunct xprint program.

    To see which ".enc" files luit may use, run

	luit -list-fontenc

    Here is sample output. The old version of luit can use only
    about a third of these encodings, i.e.,

	big5.eten-0, big5hkscs-0, dec-special, gb18030.2000-0,
	gb18030.2000-1, gb2312.1980-0, gbk-0, ibm-cp437, ibm-cp850,
	ibm-cp852, ibm-cp866, iso8859-11, iso8859-13, iso8859-16,
	jisx0201.1976-0, jisx0208.1990-0, jisx0212.1990-0,
	ksc5601.1987-0, microsoft-cp1250, microsoft-cp1251,
	microsoft-cp1252, tcvn-0

    With luit 2.0, the -encoding option permits you to use the
    remaining files (as well as any you may have customized):

	adobe-dingbats, adobe-standard, adobe-symbol, armscii-8,
	ascii-0, big5-0, big5.cp950-0, cns11643-1, cns11643-2,
	cns11643-3, gb18030-0, iso8859-6.16, iso8859-6.8x,
	jisx0208.1983-0, ksc5601.1992-3, ksx1001.1997-0, ksx1001.1998-0,
	ksx1001.1998-3, ksxjohab-1, microsoft-ansi, microsoft-cp1253,
	microsoft-cp1254, microsoft-cp1255, microsoft-cp1256,
	microsoft-cp1257, microsoft-cp1258, microsoft-win3.1,
	mulearabic-0, mulearabic-1, mulearabic-2, mulelao-1,
	sun.unicode.india-0, suneu-greek, tis620-0, tis620-2,
	tis620.2529-1, tis620.2533-0, tis620.2533-1, viscii1.1-1

    Some of the ".enc" files are unused by the old luit because
    the font-encoding library has built-in tables of the ISO-8859-x
    encodings and a few others. With luit 2.0, you can make a list
    of the built-in tables as well as change luit's preference when
    looking in the font-encoding files, built-in tables and iconv
    tables.  Luit 2.0 can use the data from iconv directly without
    relying upon external ".enc" files. The ".enc" files (and
    built-in tables) are preferred for performance reasons. Existing
    users of luit would complain about the loss of 1- or 2-tenths
    of a second for startup with CJK encodings. Really.

    Normally luit uses your locale settings to determine the
    corresponding character encoding. Use --list-iconv to see the
    available choices, e.g.,

	luit -list-iconv

    Here is sample output on a suitably configured system. Your
    system may have fewer (locale support generally has been made
    more difficult to configure in systems geared toward novice
    developers such as Ubuntu). But the portable iconv implementation
    does support a wide range of encodings, and you may find
    additional encodings using

	iconv -l

    On the Debian system where I am writing this, that gives a list
    of 1168 encodings.

2 files changed, 11 insertions, 10 deletions

diff --git a/x11/luit/Makefile b/x11/luit/Makefile
index 3be4c4ffdf5..cadaabe81a9 100644
--- a/x11/luit/Makefile
+++ b/x11/luit/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.9 2013/03/15 23:25:20 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.10 2013/05/26 20:08:54 wiz Exp $
 
-DISTNAME=		luit-1.1.1
+DISTNAME=		luit-20130217
+# check if this line needs changes when packaging newer snapshots
+PKGNAME=		${DISTNAME:S/-2/-2.0.2/}
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_XORG:=app/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		ftp://invisible-island.net/luit/
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://invisible-island.net/luit/
@@ -16,6 +17,6 @@ USE_TOOLS+=		pkg-config
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 
-.include "../../fonts/libfontenc/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/luit/distinfo b/x11/luit/distinfo
index 8ef6cd8627f..e0790f1dff5 100644
--- a/x11/luit/distinfo
+++ b/x11/luit/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/06/03 18:00:47 wiz Exp $
+$NetBSD: distinfo,v 1.6 2013/05/26 20:08:54 wiz Exp $
 
-SHA1 (luit-1.1.1.tar.bz2) = 3130c14d7267cecce0ba2280643844b48cca49b0
-RMD160 (luit-1.1.1.tar.bz2) = 571ec95ef3be0f761810e50272071ed4273afc16
-Size (luit-1.1.1.tar.bz2) = 140044 bytes
+SHA1 (luit-20130217.tgz) = 487d608f7ad23c40dc1f03e8c1766c530367c67e
+RMD160 (luit-20130217.tgz) = eb4ba0710017f33b530feb3bbd566d49755a3475
+Size (luit-20130217.tgz) = 181709 bytes