1 files changed, 53 insertions, 24 deletions

diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 8bb0f855721a..a506c989660d 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -4,61 +4,80 @@
 #
 # $FreeBSD$
 #
+# WITH_MUTT_CYRUS_SASL:	if defined, 'Cyrus sasl' support.
+#
 
 PORTNAME=	mutt
 PORTVERSION=	${VERSION}.j${JP_VERSION}
-PORTREVISION=	1
 CATEGORIES=	japanese mail
-MASTER_SITES=	ftp://ftp.mutt.org/pub/mutt/ \
+MASTER_SITES=	http://www.emaillab.org/mutt/1.4/ \
+		http://www5.xdsl.ne.jp/~shuna/mutt/distfiles/ \
 		http://ha4.seikyou.ne.jp/home/Kohtaro.Hitomi/mutt/ \
-		http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/ \
-		ftp://ftp.gbnet.net/pub/mutt-international/ \
-		ftp://ftp.guug.de/pub/mutt/ \
-		ftp://ftp.guug.de/pub/mutt/historic/
-DISTNAME=	${PORTNAME}-${VERSION}
+		ftp://ftp.mutt.org/pub/mutt/devel/
+DISTNAME=	${PORTNAME}-${VERSION}i
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		manual_ja-${MANUALVERSION}i-2${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.emaillab.org/mutt/1.2/ \
-		http://www5.xdsl.ne.jp/~shuna/distfiles/mutt/
-PATCHFILES=	${DISTNAME}i-jp${JP_VERSION}.diff.gz
-PATCH_DIST_STRIP=	-p1
+		${DISTNAME}-ja.${JP_VERSION}${EXTRACT_SUFX} \
+		manual_ja-${MANUALVERSION}i-0${EXTRACT_SUFX}
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
+		iconv.3:${PORTSDIR}/converters/libiconv
 .if !defined(WITH_GETTEXT)
 LIB_DEPENDS+=	intl.2:${PORTSDIR}/devel/gettext
-.endif
-.if defined(WITH_GETTEXT)
+.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
 
-VERSION=	1.2.5.1
-JP_VERSION=	0
-MANUALVERSION=	1.2
+VERSION=	1.4
+JP_VERSION=	1
+MANUALVERSION=	1.4
 
 FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 DIST_SUBDIR=	mutt
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
+USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CC="${CC} -I${LOCALBASE}/include -I${LOCALBASE}/include/slang" \
+		LDFLAGS=-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix \
+		--with-libiconv-prefix=${LOCALBASE} \
+		--without-wc-funcs \
 		--enable-flock --disable-fcntl \
+		--with-ssl \
 		--sysconfdir=${PREFIX}/etc \
 		--with-docdir=${DOCSDIR} \
-		--enable-pop --enable-imap
+		--enable-pop --enable-imap \
+		--enable-default-japanese
 .if defined(WITH_GETTEXT)
 CONFIGURE_ARGS+=	--with-included-gettext
 .endif
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
+.if defined(WITH_MUTT_CYRUS_SASL)
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
+.endif
+
+NOMANCOMPRESS=	yes
+MAN1=		flea.1 mutt.1 muttbug.1 mutt_dotlock.1
+MAN5=		muttrc.5 mbox.5
+
+DIFFDIR=	${WRKDIR}/${DISTNAME}-ja.${JP_VERSION}
+DIFFNAME=	patch-${VERSION}.tt.ja.${JP_VERSION}
+
+pre-patch:
+	(cd ${DIFFDIR}; ${PATCH} < ${FILESDIR}/prepatch-aa)
+	(cd ${WRKSRC}; ${PATCH} -p1 < ${DIFFDIR}/${DIFFNAME})
 
 pre-configure:
+.if defined(NOPORTDOCS)
+	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-aa
+	${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extrapatch-nodoc-ab
+.endif
 	(cd ${WRKSRC}; ${ACLOCAL} -I m4)
 
 post-configure:
@@ -69,10 +88,20 @@ post-configure:
 		s/^(s%\@AUTOHEADER\@%).+(%g)/\1${AUTOHEADER}\2/" \
 		${BUILD_WRKSRC}/config.status
 
+.if !defined(NOPORTDOCS)
 post-install:
+	${INSTALL_DATA} ${DIFFDIR}/INSTALL.JA-PATCH.ja ${DOCSDIR}
+	${INSTALL_DATA} ${DIFFDIR}/README.JA-PATCH.ja ${DOCSDIR}
+	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.en.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${DIFFDIR}/html/manual-ja-patch.ja.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${DIFFDIR}/html/usage-japanese.ja.html ${DOCSDIR}/html
+	${INSTALL_DATA} ${DIFFDIR}/samples/mutt-en.rc ${DOCSDIR}/samples
+	${INSTALL_DATA} ${DIFFDIR}/samples/mutt-ja.rc ${DOCSDIR}/samples
+	${INSTALL_DATA} ${DIFFDIR}/samples/sample.muttrc-tt ${DOCSDIR}/samples
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.tex ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.html ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/manual_ja.sgml ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>