6 files changed, 37 insertions, 30 deletions

diff --git a/converters/aish/Makefile b/converters/aish/Makefile
index 33d93d0c0f98..14a0ca603b31 100644
--- a/converters/aish/Makefile
+++ b/converters/aish/Makefile
@@ -1,21 +1,22 @@
-# New ports collection makefile for: aish
-# Version required:	1.12
+# New ports collection makefile for:	aish
+# Version required:	1.13
 # Date created:		01 Aug 1998
 # Whom:			Masanori Kiriake <seiken@nbs.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	aish112
-PKGNAME=	aish-1.12
+DISTNAME=	aish113u
+PKGNAME=	aish-1.13
 CATEGORIES=	converters
-MASTER_SITES=	ftp://ftp.tohoku.ac.jp/pub/unix/aish/
-DISTFILES=	aish112u.tar.gz aish112man.tar.gz
+MASTER_SITES=	http://hp.vector.co.jp/authors/VA004474/etc/
 
-MANLANG=	ja
-MAN1=		aish.1 autodecode.1
-MAKE_ENV=	PATH=/usr/bin:$$PATH
+MAINTAINER=	ports@FreeBSD.org
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/ja/aish
+	${INSTALL_DATA} ${WRKSRC}/aish.txt ${PREFIX}/share/doc/ja/aish
+.endif
 
-post-extract:
-	${MV} ${WRKDIR}/*1 ${WRKSRC}
 .include <bsd.port.mk>
diff --git a/converters/aish/distinfo b/converters/aish/distinfo
index ae366b5e51f8..562a82da0144 100644
--- a/converters/aish/distinfo
+++ b/converters/aish/distinfo
@@ -1,2 +1 @@
-MD5 (aish112u.tar.gz) = 4dd4d7a7404836858a9df7f97c26d306
-MD5 (aish112man.tar.gz) = cdf2a2590f87ca1e7680ab3ba2ed4332
+MD5 (aish113u.tar.gz) = 4aa59c74acc67af013d33089b9811298
diff --git a/converters/aish/files/patch-aa b/converters/aish/files/patch-aa
index 77696a6436a3..562208f2f485 100644
--- a/converters/aish/files/patch-aa
+++ b/converters/aish/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.orig	Mon Sep 18 01:47:03 1995
-+++ Makefile	Mon Aug  3 10:42:13 1998
-@@ -1,7 +1,7 @@
+--- Makefile.orig	Wed Nov 18 20:13:30 1998
++++ Makefile	Fri Nov 12 02:17:34 1999
+@@ -1,12 +1,12 @@
  # aish/koish 1993,94,95 by H.Ogasawara (COR.)
  
  # install directory
@@ -8,20 +8,24 @@
 +DSTDIR	= ${PREFIX}/bin
  
  #### *** UNIX
- CC	= cc
-@@ -134,10 +134,11 @@
- 	rm -f *.o $(SYSCHK) $(PROG) $(MPROG) core *~ autodecode
- 
- install: $(SYSCHK) $(PROG) $(MPROG) autodecode 
+-CC	= gcc
++CC	?= gcc
+ LK	= $(CC)
+-CFLAGS	= -O -DUNIX=1 -DUUENCODE=1 -DMIMEDEC=1
++CFLAGS	+= -DUNIX=1 -DUUENCODE=1 -DMIMEDEC=1
+ #CFLAGS	= -O -DUNIX=1 -DUUENCODE=1
+ SYSOBJ	= ai_unix.o
+ SYSCHK	= syschk.h
+@@ -127,9 +127,9 @@
+ clean:
+ 	rm -f *.o $(SYSCHK) $(PROG) $(MPROG) core *~
+ install: $(PROG) $(MPROG)
 -	install -c -s $(PROG) $(DSTDIR)
 -	install -c -s $(MPROG) $(DSTDIR)
 -	install -c -m 0755 ishcat $(DSTDIR)
--	-install -c -m 0755 autodecode $(DSTDIR)
 +	${BSD_INSTALL_PROGRAM} $(PROG) $(DSTDIR)
 +	${BSD_INSTALL_PROGRAM} $(MPROG) $(DSTDIR)
 +	${BSD_INSTALL_SCRIPT} ishcat $(DSTDIR)
-+	${BSD_INSTALL_SCRIPT} autodecode $(DSTDIR)
-+	${BSD_INSTALL_MAN} aish.1 autodecode.1 ${PREFIX}/man/ja/man1
- 
- installc: $(SYSCHK) $(PROG) $(MPROG) autodecode
- 	cp $(PROG) $(MPROG) ishcat autodecode $(DSTDIR)
+ oldc:
+ 	sed '/^##--OLDC-b/,/^##--OLDC-e/s/^#//' Makefile | \
+ 	sed '/^##--NEWC-b/,/^##--NEWC-e/s/.*/#&/' > aisholdc.mk
diff --git a/converters/aish/pkg-comment b/converters/aish/pkg-comment
index ccddf956c6a8..03420033f9af 100644
--- a/converters/aish/pkg-comment
+++ b/converters/aish/pkg-comment
@@ -1 +1 @@
-Ish/uuencode converter
+Ish/uuencode/Base64 converter
diff --git a/converters/aish/pkg-descr b/converters/aish/pkg-descr
index b47dc702594b..c08cc729e4d3 100644
--- a/converters/aish/pkg-descr
+++ b/converters/aish/pkg-descr
@@ -1,2 +1,4 @@
-ish/uuencode converter.
+Ish/uuencode/Base64 text-to-binary file converter.
 Multi volume ish file supported.
+
+WWW: http://hp.vector.co.jp/authors/VA004474/etc/etc.html
diff --git a/converters/aish/pkg-plist b/converters/aish/pkg-plist
index 8f25f74f1a53..9d519aec4d7e 100644
--- a/converters/aish/pkg-plist
+++ b/converters/aish/pkg-plist
@@ -1,4 +1,5 @@
 bin/aish
 bin/aishmv
 bin/ishcat
-bin/autodecode
+share/doc/ja/aish/aish.txt
+@dirrm share/doc/ja/aish