Upgrade to 1.12

5 files changed, 71 insertions, 36 deletions

diff --git a/converters/trans/Makefile b/converters/trans/Makefile
index d1773cbc9983..cc22616be932 100644
--- a/converters/trans/Makefile
+++ b/converters/trans/Makefile
@@ -1,36 +1,42 @@
 # New ports collection makefile for:    trans
-# Version required:     1.11
+# Version required:     1.12
 # Date created:         6 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1996/11/30 08:58:45 asami Exp $
+# $Id: Makefile,v 1.5 1997/04/26 23:55:24 asami Exp $
 #
 
-DISTNAME=       trans111
-PKGNAME=        trans-1.11
+DISTNAME=       trans112
+PKGNAME=        trans-1.12
 CATEGORIES=     converters russian
-MASTER_SITES=   ftp://ftp.informatik.uni-erlangen.de/pub/doc/ISO/charsets/
+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
+
 do-install:
 	cd ${WRKSRC} && $(INSTALL_PROGRAM) $(ALL) ${PREFIX}/bin
 	cd ${WRKSRC} && \
 	for i in $(ALL); do \
 		$(INSTALL_MAN) $$i.man ${PREFIX}/man/cat1/$$i.1; \
 	done
-	${MKDIR} ${LIBDIR}/tables ${LIBDIR}/xlt ${LIBDIR}/doc
+	install -d -o ${BINOWN} -g ${BINGRP} -m 755 \
+		${LIBDIR}/tables ${LIBDIR}/xlt ${LIBDIR}/doc ${LIBDIR}/bin
 	cd ${WRKSRC} && \
-	$(INSTALL_SCRIPT) checkall mkbintab mklist one iso ${LIBDIR}
+		$(INSTALL_SCRIPT) checkall mkbintab mklist one iso ${LIBDIR}
 	cd ${WRKSRC} && \
-	$(INSTALL_DATA) iso10646 encoding.lis bin/trans.[ch] bin/trans.man \
-		bin/utimbuf.h bin/utf.[ch] ${LIBDIR}
+		$(INSTALL_DATA) iso10646 encoding.lis datatype.h ${LIBDIR}
+	cd ${WRKSRC}/bin && \
+		$(INSTALL_DATA) trans.[ch] trans.man utimbuf.h utf.[ch] \
+		${LIBDIR}/bin
 	cd ${WRKSRC}/tables && $(INSTALL_DATA) * ${LIBDIR}/tables
-	cd ${WRKSRC}/xlt && $(INSTALL_DATA) * ${LIBDIR}/xlt
 	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 b9476f1395f3..f63d6da59205 100644
--- a/converters/trans/distinfo
+++ b/converters/trans/distinfo
@@ -1 +1 @@
-MD5 (trans111.tar.gz) = f3662698202017a49196d2f387fabb0e
+MD5 (trans112.tar.gz) = e0efdf205c4706dabc0f71eab96ecceb
diff --git a/converters/trans/files/patch-aa b/converters/trans/files/patch-aa
index 9b29b1d85561..307c3a78004e 100644
--- a/converters/trans/files/patch-aa
+++ b/converters/trans/files/patch-aa
@@ -1,7 +1,7 @@
-*** Makefile.orig	Sat Jun  1 04:11:00 1996
---- Makefile	Wed Nov 27 13:01:22 1996
+*** Makefile.orig	Thu May  1 03:12:00 1997
+--- Makefile	Mon May  5 20:16:45 1997
 ***************
-*** 30,43 ****
+*** 33,46 ****
   #
   # CC      = bcc
   # CC      = cl
@@ -16,7 +16,7 @@
   #
   # LOPTS are linker options (if any)
   #
---- 30,44 ----
+--- 33,47 ----
   #
   # CC      = bcc
   # CC      = cl
@@ -32,3 +32,20 @@
   #
   # LOPTS are linker options (if any)
   #
+***************
+*** 94,100 ****
+  #
+  
+  bintab:
+! 	mkbintab
+  
+  #
+  ###############################################################################
+--- 95,101 ----
+  #
+  
+  bintab:
+! 	PATH=".:$$PATH" ./mkbintab
+  
+  #
+  ###############################################################################
diff --git a/converters/trans/files/patch-ac b/converters/trans/files/patch-ac
index c831ee767d76..3e2e46b5b24f 100644
--- a/converters/trans/files/patch-ac
+++ b/converters/trans/files/patch-ac
@@ -1,12 +1,21 @@
-*** bin/trans.h.bak	Sat Jun  1 04:11:00 1996
---- bin/trans.h	Wed Nov 27 12:52:37 1996
+*** bin/trans.h.bak	Thu May  1 03:12:00 1997
+--- bin/trans.h	Mon May  5 19:35:52 1997
 ***************
-*** 96,98 ****
---- 96,102 ----
-  	NeXTSTEP	-DUSE_UTIMBUF -DNO_UTIMBUF
+*** 81,87 ****
+  /*
+  	if you want to use non-ANSI utime (), uncomment the following line
+  */
+! /* #define	USE_UTIMBUF */
   
-   *****************************************************************************/
-+ 
-+ #ifdef __FreeBSD__
-+ #define USE_UTIMBUF
-+ #endif
+  /*
+  	if your compiler doesn't define utimbuf, ...
+--- 81,89 ----
+  /*
+  	if you want to use non-ANSI utime (), uncomment the following line
+  */
+! #ifdef __FreeBSD__
+! #define      USE_UTIMBUF
+! #endif
+  
+  /*
+  	if your compiler doesn't define utimbuf, ...
diff --git a/converters/trans/pkg-plist b/converters/trans/pkg-plist
index f04e6bdd9e61..959f5120720b 100644
--- a/converters/trans/pkg-plist
+++ b/converters/trans/pkg-plist
@@ -48,6 +48,7 @@ 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
@@ -84,9 +85,9 @@ 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/symbol
 lib/trans/tables/template
 lib/trans/tables/tex-dcr.in
 lib/trans/tables/tex-dcr.out
@@ -134,6 +135,7 @@ lib/trans/xlt/cp866
 lib/trans/xlt/cp866.net
 lib/trans/xlt/cp869
 lib/trans/xlt/cp869.net
+lib/trans/xlt/cp895
 lib/trans/xlt/cyrilbas
 lib/trans/xlt/decmcs
 lib/trans/xlt/ebc037
@@ -170,9 +172,9 @@ lib/trans/xlt/iso8859.9
 lib/trans/xlt/koi8-r
 lib/trans/xlt/koi8-r.net
 lib/trans/xlt/mslinedr
+lib/trans/xlt/symbol
 lib/trans/xlt/nextstep.enc
 lib/trans/xlt/nextstep.net
-lib/trans/xlt/symbol
 lib/trans/xlt/template
 lib/trans/xlt/tex-dcr.in
 lib/trans/xlt/tex-dcr.out
@@ -198,16 +200,17 @@ lib/trans/doc/other.inf
 lib/trans/doc/sources
 lib/trans/doc/todo
 lib/trans/doc/winother.inf
-lib/trans/one
-lib/trans/iso
+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/encoding.lis
+lib/trans/one
+lib/trans/iso
 lib/trans/iso10646
-lib/trans/trans.c
-lib/trans/trans.h
-lib/trans/trans.man
-lib/trans/utimbuf.h
-lib/trans/utf.c
-lib/trans/utf.h
+lib/trans/encoding.lis
+lib/trans/datatype.h