5 files changed, 122 insertions, 148 deletions

diff --git a/converters/trans/Makefile b/converters/trans/Makefile
index cc22616be932..97320b48249d 100644
--- a/converters/trans/Makefile
+++ b/converters/trans/Makefile
@@ -1,42 +1,42 @@
 # New ports collection makefile for:    trans
-# Version required:     1.12
+# Version required:     1.20
 # Date created:         6 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1997/04/26 23:55:24 asami Exp $
+# $Id: Makefile,v 1.6 1997/05/05 16:53:57 ache Exp $
 #
 
-DISTNAME=       trans112
-PKGNAME=        trans-1.12
+DISTNAME=       trans120
+PKGNAME=        trans-1.20
 CATEGORIES=     converters russian
 MASTER_SITES=   http://www.kostis.net/freeware/
 
 MAINTAINER=     ache@FreeBSD.org
 
 LIBDIR= ${PREFIX}/lib/trans
-ALL= transtab transiso checkiso transce8
-
-post-build:
-	cd ${WRKSRC} && ${MAKE} bintab
+ALL= transhtm transiso transce8 transtab checkiso checkuni
 
 do-install:
-	cd ${WRKSRC} && $(INSTALL_PROGRAM) $(ALL) ${PREFIX}/bin
-	cd ${WRKSRC} && \
+	cd ${WRKSRC}/src && $(INSTALL_PROGRAM) $(ALL) ${PREFIX}/bin
+	cd ${WRKSRC}/src && \
 	for i in $(ALL); do \
 		$(INSTALL_MAN) $$i.man ${PREFIX}/man/cat1/$$i.1; \
 	done
 	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
-		${LIBDIR}/tables ${LIBDIR}/xlt ${LIBDIR}/doc ${LIBDIR}/bin
+		${LIBDIR}/cedf ${LIBDIR}/xlt ${LIBDIR}/doc ${LIBDIR}/bin \
+		${LIBDIR}/src
+	cd ${WRKSRC}/src && \
+		$(INSTALL_SCRIPT) checkall chkuni mkhtml mklist mkxlt \
+		${LIBDIR}/src
 	cd ${WRKSRC} && \
-		$(INSTALL_SCRIPT) checkall mkbintab mklist one iso ${LIBDIR}
-	cd ${WRKSRC} && \
-		$(INSTALL_DATA) iso10646 encoding.lis datatype.h ${LIBDIR}
+		$(INSTALL_DATA) README encoding.lis ${LIBDIR}
+	cd ${WRKSRC}/src && \
+		$(INSTALL_DATA) datatype.h ${LIBDIR}/src
 	cd ${WRKSRC}/bin && \
-		$(INSTALL_DATA) trans.[ch] trans.man utimbuf.h utf.[ch] \
+		$(INSTALL_DATA) one trans.[ch] trans.man utimbuf.h utf.[ch] \
 		${LIBDIR}/bin
-	cd ${WRKSRC}/tables && $(INSTALL_DATA) * ${LIBDIR}/tables
+	cd ${WRKSRC}/cedf && $(INSTALL_DATA) * ${LIBDIR}/cedf
 	cd ${WRKSRC}/doc && $(INSTALL_DATA) * ${LIBDIR}/doc
 	cd ${WRKSRC}/xlt && $(INSTALL_DATA) * ${LIBDIR}/xlt
 
-
 .include <bsd.port.mk>
diff --git a/converters/trans/distinfo b/converters/trans/distinfo
index f63d6da59205..61c436cbbffc 100644
--- a/converters/trans/distinfo
+++ b/converters/trans/distinfo
@@ -1 +1 @@
-MD5 (trans112.tar.gz) = e0efdf205c4706dabc0f71eab96ecceb
+MD5 (trans120.tar.gz) = 4d6d8cac0c045af820b027b99e6351b8
diff --git a/converters/trans/files/patch-aa b/converters/trans/files/patch-aa
index 307c3a78004e..957779bf52ed 100644
--- a/converters/trans/files/patch-aa
+++ b/converters/trans/files/patch-aa
@@ -1,5 +1,5 @@
-*** Makefile.orig	Thu May  1 03:12:00 1997
---- Makefile	Mon May  5 20:16:45 1997
+*** src/Makefile.orig	Thu May  1 03:12:00 1997
+--- src/Makefile	Mon May  5 20:16:45 1997
 ***************
 *** 33,46 ****
   #
@@ -32,20 +32,3 @@
   #
   # LOPTS are linker options (if any)
   #
-***************
-*** 94,100 ****
-  #
-  
-  bintab:
-! 	mkbintab
-  
-  #
-  ###############################################################################
---- 95,101 ----
-  #
-  
-  bintab:
-! 	PATH=".:$$PATH" ./mkbintab
-  
-  #
-  ###############################################################################
diff --git a/converters/trans/pkg-descr b/converters/trans/pkg-descr
index 7d6306fe5afd..26ee922086fc 100644
--- a/converters/trans/pkg-descr
+++ b/converters/trans/pkg-descr
@@ -8,4 +8,3 @@ mentioned files describe 8-bit Character Encodings/Sets.
 It covers ISO 646, many IBM Codepages for MS-DOS, Microsoft Windows
 Codepages, ISO 8859-x, HP, Adobe, Apple Macintosh, Atari, NeXTSTEP
 Character Encodings, a few EBCDIC Encodings, koi8-r and a few more...
-
diff --git a/converters/trans/pkg-plist b/converters/trans/pkg-plist
index 959f5120720b..c28ba4692801 100644
--- a/converters/trans/pkg-plist
+++ b/converters/trans/pkg-plist
@@ -1,98 +1,97 @@
 bin/transtab
 bin/transiso
 bin/checkiso
+bin/checkuni
 bin/transce8
+bin/transhtm
 man/cat1/transtab.1
 man/cat1/transiso.1
 man/cat1/checkiso.1
+man/cat1/checkuni.1
 man/cat1/transce8.1
-lib/trans/tables/adobeiso
-lib/trans/tables/adobestd
-lib/trans/tables/adobesym
-lib/trans/tables/applecro
-lib/trans/tables/applegk2
-lib/trans/tables/applegrk
-lib/trans/tables/appleice
-lib/trans/tables/applerom
-lib/trans/tables/applerom.net
-lib/trans/tables/applerum
-lib/trans/tables/appletur
-lib/trans/tables/atarist
-lib/trans/tables/cp1250
-lib/trans/tables/cp1251
-lib/trans/tables/cp1252
-lib/trans/tables/cp1252.net
-lib/trans/tables/cp1253
-lib/trans/tables/cp1254
-lib/trans/tables/cp1255
-lib/trans/tables/cp1256
-lib/trans/tables/cp437
-lib/trans/tables/cp737
-lib/trans/tables/cp850
-lib/trans/tables/cp850.net
-lib/trans/tables/cp851
-lib/trans/tables/cp852
-lib/trans/tables/cp852.net
-lib/trans/tables/cp853
-lib/trans/tables/cp853.net
-lib/trans/tables/cp855
-lib/trans/tables/cp857
-lib/trans/tables/cp857.net
-lib/trans/tables/cp860
-lib/trans/tables/cp861
-lib/trans/tables/cp862
-lib/trans/tables/cp863
-lib/trans/tables/cp864
-lib/trans/tables/cp865
-lib/trans/tables/cp866
-lib/trans/tables/cp866.net
-lib/trans/tables/cp869
-lib/trans/tables/cp869.net
-lib/trans/tables/cp895
-lib/trans/tables/cyrilbas
-lib/trans/tables/decmcs
-lib/trans/tables/ebc037
-lib/trans/tables/ebc1047
-lib/trans/tables/ebc1047.net
-lib/trans/tables/ebc875
-lib/trans/tables/ebc875.net
-lib/trans/tables/hp48
-lib/trans/tables/hproman8
-lib/trans/tables/hproman8.net
-lib/trans/tables/iso646.ca
-lib/trans/tables/iso646.ch
-lib/trans/tables/iso646.de
-lib/trans/tables/iso646.es
-lib/trans/tables/iso646.fi
-lib/trans/tables/iso646.fr
-lib/trans/tables/iso646.gb
-lib/trans/tables/iso646.irv
-lib/trans/tables/iso646.it
-lib/trans/tables/iso646.nl
-lib/trans/tables/iso646.no
-lib/trans/tables/iso646.pt
-lib/trans/tables/iso646.se
-lib/trans/tables/iso8859.1
-lib/trans/tables/iso8859.10
-lib/trans/tables/iso8859.2
-lib/trans/tables/iso8859.3
-lib/trans/tables/iso8859.4
-lib/trans/tables/iso8859.5
-lib/trans/tables/iso8859.6
-lib/trans/tables/iso8859.7
-lib/trans/tables/iso8859.8
-lib/trans/tables/iso8859.9
-lib/trans/tables/koi8-r
-lib/trans/tables/koi8-r.net
-lib/trans/tables/mslinedr
-lib/trans/tables/symbol
-lib/trans/tables/nextstep.enc
-lib/trans/tables/nextstep.net
-lib/trans/tables/template
-lib/trans/tables/tex-dcr.in
-lib/trans/tables/tex-dcr.out
-lib/trans/tables/wingding
-lib/trans/tables/wingreek
+man/cat1/transhtm.1
+lib/trans/cedf/adobeiso
+lib/trans/cedf/adobestd
+lib/trans/cedf/adobesym
+lib/trans/cedf/applecro
+lib/trans/cedf/applegk2
+lib/trans/cedf/applegrk
+lib/trans/cedf/appleice
+lib/trans/cedf/applerom
+lib/trans/cedf/applerum
+lib/trans/cedf/appletur
+lib/trans/cedf/atarist
+lib/trans/cedf/cp1250
+lib/trans/cedf/cp1251
+lib/trans/cedf/cp1252
+lib/trans/cedf/cp1253
+lib/trans/cedf/cp1254
+lib/trans/cedf/cp1255
+lib/trans/cedf/cp1256
+lib/trans/cedf/cp1257
+lib/trans/cedf/cp1258
+lib/trans/cedf/cp437
+lib/trans/cedf/cp737
+lib/trans/cedf/cp775
+lib/trans/cedf/cp850
+lib/trans/cedf/cp851
+lib/trans/cedf/cp852
+lib/trans/cedf/cp853
+lib/trans/cedf/cp855
+lib/trans/cedf/cp857
+lib/trans/cedf/cp860
+lib/trans/cedf/cp861
+lib/trans/cedf/cp862
+lib/trans/cedf/cp863
+lib/trans/cedf/cp864
+lib/trans/cedf/cp865
+lib/trans/cedf/cp866
+lib/trans/cedf/cp869
+lib/trans/cedf/cp874
+lib/trans/cedf/cp895
+lib/trans/cedf/cyrilbas
+lib/trans/cedf/decmcs
+lib/trans/cedf/ebc037
+lib/trans/cedf/ebc1026
+lib/trans/cedf/ebc1047
+lib/trans/cedf/ebc500
+lib/trans/cedf/ebc875
+lib/trans/cedf/hp48
+lib/trans/cedf/hproman8
+lib/trans/cedf/iso10646
+lib/trans/cedf/iso6429
+lib/trans/cedf/iso646
+lib/trans/cedf/iso646.ca
+lib/trans/cedf/iso646.ch
+lib/trans/cedf/iso646.de
+lib/trans/cedf/iso646.es
+lib/trans/cedf/iso646.fi
+lib/trans/cedf/iso646.fr
+lib/trans/cedf/iso646.gb
+lib/trans/cedf/iso646.irv
+lib/trans/cedf/iso646.it
+lib/trans/cedf/iso646.nl
+lib/trans/cedf/iso646.no
+lib/trans/cedf/iso646.pt
+lib/trans/cedf/iso646.se
+lib/trans/cedf/iso8859.1
+lib/trans/cedf/iso8859.10
+lib/trans/cedf/iso8859.2
+lib/trans/cedf/iso8859.3
+lib/trans/cedf/iso8859.4
+lib/trans/cedf/iso8859.5
+lib/trans/cedf/iso8859.6
+lib/trans/cedf/iso8859.7
+lib/trans/cedf/iso8859.8
+lib/trans/cedf/iso8859.9
+lib/trans/cedf/koi8-r
+lib/trans/cedf/mslinedr
+lib/trans/cedf/nextstep
+lib/trans/cedf/symbol
+lib/trans/cedf/tex-dcr.in
+lib/trans/cedf/tex-dcr.out
+lib/trans/cedf/wingding
+lib/trans/cedf/wingreek
 lib/trans/xlt/adobeiso
 lib/trans/xlt/adobestd
 lib/trans/xlt/adobesym
@@ -101,30 +100,27 @@ lib/trans/xlt/applegk2
 lib/trans/xlt/applegrk
 lib/trans/xlt/appleice
 lib/trans/xlt/applerom
-lib/trans/xlt/applerom.net
 lib/trans/xlt/applerum
 lib/trans/xlt/appletur
 lib/trans/xlt/atarist
 lib/trans/xlt/cp1250
 lib/trans/xlt/cp1251
 lib/trans/xlt/cp1252
-lib/trans/xlt/cp1252.net
 lib/trans/xlt/cp1253
 lib/trans/xlt/cp1254
 lib/trans/xlt/cp1255
 lib/trans/xlt/cp1256
+lib/trans/xlt/cp1257
+lib/trans/xlt/cp1258
 lib/trans/xlt/cp437
 lib/trans/xlt/cp737
+lib/trans/xlt/cp775
 lib/trans/xlt/cp850
-lib/trans/xlt/cp850.net
 lib/trans/xlt/cp851
 lib/trans/xlt/cp852
-lib/trans/xlt/cp852.net
 lib/trans/xlt/cp853
-lib/trans/xlt/cp853.net
 lib/trans/xlt/cp855
 lib/trans/xlt/cp857
-lib/trans/xlt/cp857.net
 lib/trans/xlt/cp860
 lib/trans/xlt/cp861
 lib/trans/xlt/cp862
@@ -132,20 +128,18 @@ lib/trans/xlt/cp863
 lib/trans/xlt/cp864
 lib/trans/xlt/cp865
 lib/trans/xlt/cp866
-lib/trans/xlt/cp866.net
 lib/trans/xlt/cp869
-lib/trans/xlt/cp869.net
+lib/trans/xlt/cp874
 lib/trans/xlt/cp895
 lib/trans/xlt/cyrilbas
 lib/trans/xlt/decmcs
 lib/trans/xlt/ebc037
+lib/trans/xlt/ebc1026
 lib/trans/xlt/ebc1047
-lib/trans/xlt/ebc1047.net
+lib/trans/xlt/ebc500
 lib/trans/xlt/ebc875
-lib/trans/xlt/ebc875.net
 lib/trans/xlt/hp48
 lib/trans/xlt/hproman8
-lib/trans/xlt/hproman8.net
 lib/trans/xlt/iso646.ca
 lib/trans/xlt/iso646.ch
 lib/trans/xlt/iso646.de
@@ -170,12 +164,9 @@ lib/trans/xlt/iso8859.7
 lib/trans/xlt/iso8859.8
 lib/trans/xlt/iso8859.9
 lib/trans/xlt/koi8-r
-lib/trans/xlt/koi8-r.net
 lib/trans/xlt/mslinedr
+lib/trans/xlt/nextstep
 lib/trans/xlt/symbol
-lib/trans/xlt/nextstep.enc
-lib/trans/xlt/nextstep.net
-lib/trans/xlt/template
 lib/trans/xlt/tex-dcr.in
 lib/trans/xlt/tex-dcr.out
 lib/trans/xlt/wingding
@@ -192,25 +183,26 @@ lib/trans/doc/format
 lib/trans/doc/history
 lib/trans/doc/hp.inf
 lib/trans/doc/iso10646.inf
+lib/trans/doc/iso6429.inf
 lib/trans/doc/iso646.inf
 lib/trans/doc/iso8859.inf
-lib/trans/doc/network
 lib/trans/doc/nextstep.inf
 lib/trans/doc/other.inf
 lib/trans/doc/sources
 lib/trans/doc/todo
 lib/trans/doc/winother.inf
+lib/trans/bin/one
 lib/trans/bin/trans.c
 lib/trans/bin/trans.h
 lib/trans/bin/trans.man
 lib/trans/bin/utimbuf.h
 lib/trans/bin/utf.c
 lib/trans/bin/utf.h
-lib/trans/checkall
-lib/trans/mkbintab
-lib/trans/mklist
-lib/trans/one
-lib/trans/iso
-lib/trans/iso10646
+lib/trans/src/checkall
+lib/trans/src/chkuni
+lib/trans/src/mkhtml
+lib/trans/src/mklist
+lib/trans/src/mkxlt
+lib/trans/src/datatype.h
+lib/trans/README
 lib/trans/encoding.lis
-lib/trans/datatype.h