Some minor fixes in Japanese support.

PR:		ports/20026
Submitted by:	IWASHITA Yoji <shuna@pop16.odn.ne.jp> (Maintainer)

7 files changed, 46 insertions, 4 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 9f3377c554db..2c081059deb1 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -41,7 +41,6 @@ ALL_TARGET=	all
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix --with-included-gettext \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt \
 		--enable-pop --enable-imap
 
diff --git a/japanese/mutt-devel/files/patch-ac b/japanese/mutt-devel/files/patch-ac
new file mode 100644
index 000000000000..0b5edfaac924
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ac
@@ -0,0 +1,26 @@
+--- handler.c.orig	Wed Jul 19 13:37:07 2000
++++ handler.c	Wed Jul 19 13:42:28 2000
+@@ -187,7 +187,11 @@
+     if(ch != EOF)
+     {
+       mutt_decoder_push_one (dec, ch);
++#ifdef KANJI
++      if (ch == '\n' || l++ == 1024)
++#else
+       if (l++ == 1024)
++#endif
+       {
+ 	mutt_decoder_pop_to_state (dec, s);
+ 	l = 0;
+@@ -270,7 +274,11 @@
+     else
+       mutt_decoder_push_one (dec, ch);
+     
++#ifdef KANJI
++    if (ch == '\n' || (l += 3) >= 1024)
++#else
+     if ((l += 3) >= 1024)
++#endif
+     {
+       mutt_decoder_pop_to_state (dec, s);
+       l = 0;
diff --git a/japanese/mutt-devel/files/patch-ad b/japanese/mutt-devel/files/patch-ad
new file mode 100644
index 000000000000..6f41fd35ea12
--- /dev/null
+++ b/japanese/mutt-devel/files/patch-ad
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Wed Jul 19 14:29:18 2000
++++ Makefile.am	Wed Jul 19 14:31:11 2000
+@@ -122,7 +122,6 @@
+ 	fi
+ 
+ install-data-local: Muttrc
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ 	-if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
+ 		mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 86baa3adef44..99792d12c1ee 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -44,7 +44,6 @@ share/doc/mutt/manual_ja.sgml
 share/doc/mutt/manual_ja.tex
 share/doc/mutt/manual_ja.txt
 @dirrm share/doc/mutt
-@dirrm share/mutt
 share/locale/cs/LC_MESSAGES/mutt.mo
 share/locale/da/LC_MESSAGES/mutt.mo
 share/locale/de/LC_MESSAGES/mutt.mo
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 9f3377c554db..2c081059deb1 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -41,7 +41,6 @@ ALL_TARGET=	all
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix --with-included-gettext \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/etc \
-		--with-sharedir=${PREFIX}/share/mutt \
 		--with-docdir=${PREFIX}/share/doc/mutt \
 		--enable-pop --enable-imap
 
diff --git a/japanese/mutt/files/patch-ad b/japanese/mutt/files/patch-ad
new file mode 100644
index 000000000000..6f41fd35ea12
--- /dev/null
+++ b/japanese/mutt/files/patch-ad
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Wed Jul 19 14:29:18 2000
++++ Makefile.am	Wed Jul 19 14:31:11 2000
+@@ -122,7 +122,6 @@
+ 	fi
+ 
+ install-data-local: Muttrc
+-	$(srcdir)/mkinstalldirs $(DESTDIR)$(sharedir)
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ 	-if [ -f $(DESTDIR)$(sharedir)/Muttrc ] ; then \
+ 		mv $(DESTDIR)$(sharedir)/Muttrc $(DESTDIR)$(sysconfdir) ; \
diff --git a/japanese/mutt/pkg-plist b/japanese/mutt/pkg-plist
index 86baa3adef44..99792d12c1ee 100644
--- a/japanese/mutt/pkg-plist
+++ b/japanese/mutt/pkg-plist
@@ -44,7 +44,6 @@ share/doc/mutt/manual_ja.sgml
 share/doc/mutt/manual_ja.tex
 share/doc/mutt/manual_ja.txt
 @dirrm share/doc/mutt
-@dirrm share/mutt
 share/locale/cs/LC_MESSAGES/mutt.mo
 share/locale/da/LC_MESSAGES/mutt.mo
 share/locale/de/LC_MESSAGES/mutt.mo