o Change MAINTAINER to submitter (blanket).

o Added -D_DONT_USE_CTYPE_INLINE_ to CFLAGS not to use inlined wcwidth().
o Modified pkg-plist to use %%DOCSDIR%%.

PR:		ports-jp/15003, ports/71331
Submitted by:	SHIOZAKI Takehiko <st@be.to>
Approved by:	maintainer blanket
Obtained from:	ports/71329

2 files changed, 77 insertions, 77 deletions

diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index d70bda84dded..1909da65cf8d 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -21,7 +21,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX}
 DIST_SUBDIR=	mutt
 
-MAINTAINER=	iwashita@cqmail.net
+MAINTAINER=	st@be.to
 COMMENT=	Text-based mail client (Japanised Version)
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
@@ -46,7 +46,7 @@ USE_AUTOCONF_VER=	213
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=	CC="${CC} -D_DONT_USE_CTYPE_INLINE_ -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--without-wc-funcs \
diff --git a/japanese/mutt/pkg-plist b/japanese/mutt/pkg-plist
index b7bc3f1d7ae2..c97951d58695 100644
--- a/japanese/mutt/pkg-plist
+++ b/japanese/mutt/pkg-plist
@@ -6,77 +6,77 @@ bin/pgpewrap
 bin/pgpring
 etc/Muttrc
 etc/mime.types
-%%PORTDOCS%%share/doc/mutt/COPYRIGHT
-%%PORTDOCS%%share/doc/mutt/ChangeLog
-%%PORTDOCS%%share/doc/mutt/GPL
-%%PORTDOCS%%share/doc/mutt/INSTALL
-%%PORTDOCS%%share/doc/mutt/INSTALL.JA-PATCH.ja
-%%PORTDOCS%%share/doc/mutt/INSTALL.ja
-%%PORTDOCS%%share/doc/mutt/NEWS
-%%PORTDOCS%%share/doc/mutt/NEWS.ja
-%%PORTDOCS%%share/doc/mutt/PGP-Notes.txt
-%%PORTDOCS%%share/doc/mutt/PGP-Notes.ja.txt
-%%PORTDOCS%%share/doc/mutt/README
-%%PORTDOCS%%share/doc/mutt/README.JA-PATCH.ja
-%%PORTDOCS%%share/doc/mutt/README.SECURITY
-%%PORTDOCS%%share/doc/mutt/README.SECURITY.ja
-%%PORTDOCS%%share/doc/mutt/README.SSL
-%%PORTDOCS%%share/doc/mutt/README.SSL.ja
-%%PORTDOCS%%share/doc/mutt/README.ja
-%%PORTDOCS%%share/doc/mutt/TODO
-%%PORTDOCS%%share/doc/mutt/applying-patches.txt
-%%PORTDOCS%%share/doc/mutt/applying-patches.ja.txt
-%%PORTDOCS%%share/doc/mutt/devel-notes.txt
-%%PORTDOCS%%share/doc/mutt/html/INSTALL.JA-PATCH.ja.html
-%%PORTDOCS%%share/doc/mutt/html/README.JA-PATCH.ja.html
-%%PORTDOCS%%share/doc/mutt/html/manual-1.html
-%%PORTDOCS%%share/doc/mutt/html/manual-2.html
-%%PORTDOCS%%share/doc/mutt/html/manual-3.html
-%%PORTDOCS%%share/doc/mutt/html/manual-4.html
-%%PORTDOCS%%share/doc/mutt/html/manual-5.html
-%%PORTDOCS%%share/doc/mutt/html/manual-6.html
-%%PORTDOCS%%share/doc/mutt/html/manual-7.html
-%%PORTDOCS%%share/doc/mutt/html/manual.html
-%%PORTDOCS%%share/doc/mutt/html/manual-ja-patch.en.html
-%%PORTDOCS%%share/doc/mutt/html/manual-ja-patch.ja.html
-%%PORTDOCS%%share/doc/mutt/html/usage-japanese.ja.html
-%%PORTDOCS%%share/doc/mutt/manual.txt
-%%PORTDOCS%%share/doc/mutt/manual_ja.html
-%%PORTDOCS%%share/doc/mutt/manual_ja.sgml
-%%PORTDOCS%%share/doc/mutt/manual_ja.tex
-%%PORTDOCS%%share/doc/mutt/manual_ja.txt
-%%PORTDOCS%%share/doc/mutt/patch-notes.txt
-%%PORTDOCS%%share/doc/mutt/samples/Mush.rc
-%%PORTDOCS%%share/doc/mutt/samples/Pine.rc
-%%PORTDOCS%%share/doc/mutt/samples/Tin.rc
-%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
-%%PORTDOCS%%share/doc/mutt/samples/mutt-en.rc
-%%PORTDOCS%%share/doc/mutt/samples/mutt-ja.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp2.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp5.rc
-%%PORTDOCS%%share/doc/mutt/samples/pgp6.rc
-%%PORTDOCS%%share/doc/mutt/samples/sample.mailcap
-%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc
-%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tlr
-%%PORTDOCS%%share/doc/mutt/samples/sample.muttrc-tt
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-3.2.5.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.1.5.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.2.0.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.aix-4.3.2.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.freebsd-3.3.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.3.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.glibc-2.1.90.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.01.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-10.20.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.hpux-11.00.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.irix-6.5.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0a.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.osf1-4.0d.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.4.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.5.1.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6-cjk.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.6.rc
-%%PORTDOCS%%share/doc/mutt/samples/iconv/iconv.solaris-2.7.rc
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/GPL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.JA-PATCH.ja
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS.ja
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/PGP-Notes.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.JA-PATCH.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/README.SECURITY.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL
+%%PORTDOCS%%%%DOCSDIR%%/README.SSL.ja
+%%PORTDOCS%%%%DOCSDIR%%/README.ja
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.txt
+%%PORTDOCS%%%%DOCSDIR%%/applying-patches.ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/devel-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/INSTALL.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/README.JA-PATCH.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.en.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manual-ja-patch.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/html/usage-japanese.ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.html
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.sgml
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.tex
+%%PORTDOCS%%%%DOCSDIR%%/manual_ja.txt
+%%PORTDOCS%%%%DOCSDIR%%/patch-notes.txt
+%%PORTDOCS%%%%DOCSDIR%%/samples/Mush.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/Pine.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/Tin.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/gpg.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-en.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/mutt-ja.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp2.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/pgp6.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.mailcap
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tlr
+%%PORTDOCS%%%%DOCSDIR%%/samples/sample.muttrc-tt
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
+%%PORTDOCS%%%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
 share/locale/bg/LC_MESSAGES/mutt.mo
 share/locale/ca/LC_MESSAGES/mutt.mo
 share/locale/cs/LC_MESSAGES/mutt.mo
@@ -104,7 +104,7 @@ share/locale/tr/LC_MESSAGES/mutt.mo
 share/locale/uk/LC_MESSAGES/mutt.mo
 share/locale/zh_CN/LC_MESSAGES/mutt.mo
 share/locale/zh_TW/LC_MESSAGES/mutt.mo
-%%PORTDOCS%%@dirrm share/doc/mutt/samples/iconv
-%%PORTDOCS%%@dirrm share/doc/mutt/samples
-%%PORTDOCS%%@dirrm share/doc/mutt/html
-%%PORTDOCS%%@dirrm share/doc/mutt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples/iconv
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%