2 files changed, 121 insertions, 118 deletions

diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 86a9b0b3915f..58c05c4a3bf3 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -7,7 +7,7 @@
 # WITH_MUTT_CYRUS_SASL:	if defined, 'Cyrus sasl' support.
 #
 
-PORTNAME=	mutt
+PORTNAME=	mutt-devel
 PORTVERSION=	${VERSION}.j${JP_VERSION}
 PORTREVISION=	0
 CATEGORIES=	japanese mail
@@ -15,7 +15,7 @@ MASTER_SITES=	http://www.emaillab.org/mutt/1.5/ \
 		http://my.reset.jp/~iwashita/mutt/distfiles/ \
 		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
 		ftp://ftp.mutt.org/mutt/devel/
-DISTNAME=	${PORTNAME}-${VERSION}i
+DISTNAME=	mutt-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
 		manual_ja-${MANUALVERSION}i-1${EXTRACT_SUFX}
@@ -25,16 +25,16 @@ MAINTAINER=	st@be.to
 COMMENT=	Text-based mail client (Japanised development version)
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
-.if !defined(WITH_GETTEXT)
+.if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
-.else
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 LIB_DEPENDS+=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 .endif
-RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
+
+CONFLICTS=	mutt-* ja-mutt-1.[024]*
 
 VERSION=	1.5.6
 JP_VERSION=	1
@@ -48,7 +48,7 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
+WRKSRC=		${WRKDIR}/mutt-${VERSION}
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
 		LDFLAGS="${LDFLAGS}"
@@ -61,8 +61,11 @@ CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
 		--with-docdir=${DOCSDIR} \
 		--enable-pop --enable-imap \
 		--enable-default-japanese
-.if defined(WITH_GETTEXT)
-CONFIGURE_ARGS+=	--with-included-gettext
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB=	NLS="@comment "
+.else
+PLIST_SUB+=	NLS=""
 .endif
 .if defined(WITH_MUTT_CYRUS_SASL)
 CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
diff --git a/japanese/mutt-devel/pkg-plist b/japanese/mutt-devel/pkg-plist
index 3c36f41c16f8..f3fabe4aba5f 100644
--- a/japanese/mutt-devel/pkg-plist
+++ b/japanese/mutt-devel/pkg-plist
@@ -7,112 +7,112 @@ bin/pgpring
 bin/smime_keys
 etc/Muttrc
 etc/mime.types
-%%PORTDOCS%%share/doc/mutt/COPYRIGHT
-%%PORTDOCS%%share/doc/mutt/ChangeLog
-%%PORTDOCS%%share/doc/mutt/ChangeLog.old
-%%PORTDOCS%%share/doc/mutt/GPL
-%%PORTDOCS%%share/doc/mutt/INSTALL
-%%PORTDOCS%%share/doc/mutt/INSTALL.ja
-%%PORTDOCS%%share/doc/mutt/INSTALL.JA-PATCH.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
-%%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/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/ca-bundle.crt
-%%PORTDOCS%%share/doc/mutt/samples/gpg.rc
-%%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%%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/smime.rc
-%%PORTDOCS%%share/doc/mutt/samples/smime_keys_test.pl
-%%PORTDOCS%%share/doc/mutt/samples/colors.default
-%%PORTDOCS%%share/doc/mutt/samples/colors.linux
-%%PORTDOCS%%share/doc/mutt/smime-notes.txt
-%%PORTDOCS%%share/doc/mutt/smime-notes.ja.txt
-share/locale/ca/LC_MESSAGES/mutt.mo
-share/locale/cs/LC_MESSAGES/mutt.mo
-share/locale/da/LC_MESSAGES/mutt.mo
-share/locale/de/LC_MESSAGES/mutt.mo
-share/locale/el/LC_MESSAGES/mutt.mo
-share/locale/eo/LC_MESSAGES/mutt.mo
-share/locale/es/LC_MESSAGES/mutt.mo
-share/locale/et/LC_MESSAGES/mutt.mo
-share/locale/fr/LC_MESSAGES/mutt.mo
-share/locale/gl/LC_MESSAGES/mutt.mo
-share/locale/hu/LC_MESSAGES/mutt.mo
-share/locale/id/LC_MESSAGES/mutt.mo
-share/locale/it/LC_MESSAGES/mutt.mo
-share/locale/ja/LC_MESSAGES/mutt.mo
-share/locale/ko/LC_MESSAGES/mutt.mo
-share/locale/lt/LC_MESSAGES/mutt.mo
-share/locale/nl/LC_MESSAGES/mutt.mo
-share/locale/pl/LC_MESSAGES/mutt.mo
-share/locale/pt_BR/LC_MESSAGES/mutt.mo
-share/locale/ru/LC_MESSAGES/mutt.mo
-share/locale/sk/LC_MESSAGES/mutt.mo
-share/locale/sv/LC_MESSAGES/mutt.mo
-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
+%%DOCSDIR%%/COPYRIGHT
+%%DOCSDIR%%/ChangeLog
+%%DOCSDIR%%/ChangeLog.old
+%%DOCSDIR%%/GPL
+%%DOCSDIR%%/INSTALL
+%%DOCSDIR%%/INSTALL.ja
+%%DOCSDIR%%/INSTALL.JA-PATCH.ja
+%%DOCSDIR%%/NEWS
+%%DOCSDIR%%/NEWS.ja
+%%DOCSDIR%%/PGP-Notes.txt
+%%DOCSDIR%%/PGP-Notes.ja.txt
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.ja
+%%DOCSDIR%%/README.JA-PATCH.ja
+%%DOCSDIR%%/README.SECURITY
+%%DOCSDIR%%/README.SECURITY.ja
+%%DOCSDIR%%/README.SSL
+%%DOCSDIR%%/README.SSL.ja
+%%DOCSDIR%%/TODO
+%%DOCSDIR%%/applying-patches.txt
+%%DOCSDIR%%/applying-patches.ja.txt
+%%DOCSDIR%%/devel-notes.txt
+%%DOCSDIR%%/html/INSTALL.JA-PATCH.ja.html
+%%DOCSDIR%%/html/README.JA-PATCH.ja.html
+%%DOCSDIR%%/html/manual-1.html
+%%DOCSDIR%%/html/manual-2.html
+%%DOCSDIR%%/html/manual-3.html
+%%DOCSDIR%%/html/manual-4.html
+%%DOCSDIR%%/html/manual-5.html
+%%DOCSDIR%%/html/manual-6.html
+%%DOCSDIR%%/html/manual-7.html
+%%DOCSDIR%%/html/manual.html
+%%DOCSDIR%%/html/manual-ja-patch.en.html
+%%DOCSDIR%%/html/manual-ja-patch.ja.html
+%%DOCSDIR%%/html/usage-japanese.ja.html
+%%DOCSDIR%%/manual.txt
+%%DOCSDIR%%/manual_ja.html
+%%DOCSDIR%%/manual_ja.sgml
+%%DOCSDIR%%/manual_ja.tex
+%%DOCSDIR%%/manual_ja.txt
+%%DOCSDIR%%/patch-notes.txt
+%%DOCSDIR%%/samples/Mush.rc
+%%DOCSDIR%%/samples/Pine.rc
+%%DOCSDIR%%/samples/Tin.rc
+%%DOCSDIR%%/samples/ca-bundle.crt
+%%DOCSDIR%%/samples/gpg.rc
+%%DOCSDIR%%/samples/iconv/iconv.aix-3.2.5.rc
+%%DOCSDIR%%/samples/iconv/iconv.aix-4.1.5.rc
+%%DOCSDIR%%/samples/iconv/iconv.aix-4.2.0.rc
+%%DOCSDIR%%/samples/iconv/iconv.aix-4.3.2.rc
+%%DOCSDIR%%/samples/iconv/iconv.freebsd-3.3.rc
+%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.3.rc
+%%DOCSDIR%%/samples/iconv/iconv.glibc-2.1.90.rc
+%%DOCSDIR%%/samples/iconv/iconv.hpux-10.01.rc
+%%DOCSDIR%%/samples/iconv/iconv.hpux-10.20.rc
+%%DOCSDIR%%/samples/iconv/iconv.hpux-11.00.rc
+%%DOCSDIR%%/samples/iconv/iconv.irix-6.5.rc
+%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0a.rc
+%%DOCSDIR%%/samples/iconv/iconv.osf1-4.0d.rc
+%%DOCSDIR%%/samples/iconv/iconv.solaris-2.4.rc
+%%DOCSDIR%%/samples/iconv/iconv.solaris-2.5.1.rc
+%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6-cjk.rc
+%%DOCSDIR%%/samples/iconv/iconv.solaris-2.6.rc
+%%DOCSDIR%%/samples/iconv/iconv.solaris-2.7.rc
+%%DOCSDIR%%/samples/mutt-en.rc
+%%DOCSDIR%%/samples/mutt-ja.rc
+%%DOCSDIR%%/samples/pgp2.rc
+%%DOCSDIR%%/samples/pgp5.rc
+%%DOCSDIR%%/samples/pgp6.rc
+%%DOCSDIR%%/samples/sample.mailcap
+%%DOCSDIR%%/samples/sample.muttrc
+%%DOCSDIR%%/samples/sample.muttrc-tlr
+%%DOCSDIR%%/samples/sample.muttrc-tt
+%%DOCSDIR%%/samples/smime.rc
+%%DOCSDIR%%/samples/smime_keys_test.pl
+%%DOCSDIR%%/samples/colors.default
+%%DOCSDIR%%/samples/colors.linux
+%%DOCSDIR%%/smime-notes.txt
+%%DOCSDIR%%/smime-notes.ja.txt
+%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples/iconv
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/samples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%