2 files changed, 21 insertions, 102 deletions

diff --git a/chinese/mutt/Makefile b/chinese/mutt/Makefile
index 07e5d63ee704..affabdcaa3c7 100644
--- a/chinese/mutt/Makefile
+++ b/chinese/mutt/Makefile
@@ -6,109 +6,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mutt
-PORTVERSION= 	1.2.5
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.guug.de/pub/mutt/ \
-		ftp://ftp.uib.no/pub/mutt/ \
-		ftp://pgp.rasip.fer.hr/pub/mutt/international/ \
-		ftp://ftp.gbnet.net/pub/mutt-international/ \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/ \
-		ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/mutt-international/ \
-		ftp://ftp.gwdg.de/pub/unix/mail/mutt/international/ \
-		ftp://ftp.iks-jena.de/pub/mitarb/lutz/crypt/software/pgp/mutt/
-DISTNAME=	${PORTNAME}-${PORTVERSION}i
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} charmaps-0.0.tar.gz
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-
-PATCH_SITES=	http://www.frmug.org/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
-		http://www.math.fu-berlin.de/~leitner/mutt/${PKGNAME:S/^mutt-//}/ \
-		http://www.efrei.fr/~parmelan/mutt/${PKGNAME:S/^mutt-//}/ \
-		ftp://www.frmug.org/pub/mutt/mutt/${PKGNAME:S/^mutt-//}/ \
-		ftp://riemann.iam.uni-bonn.de/pub/mutt/
-PATCHFILES=
-PATCH_DIST_STRIP=	-p1
+MASTERDIR=	${.CURDIR}/../../mail/mutt
 
 MAINTAINER=	ycheng@sinica.edu.tw
 
-.if defined(PACKAGE_BUILDING)
-WITH_SLANG=	yes
-BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
-RUN_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell \
-		urlview:${PORTSDIR}/textproc/urlview
-.if ${MACHINE_ARCH} != "alpha"
-#  coredump in sgmls
-WITH_DOCS=	yes
-.endif
-.endif
-
-LIB_DEPENDS=    intl.1:${PORTSDIR}/devel/gettext
-.if defined(WITH_SLANG)
-LIB_DEPENDS+=	slang.1:${PORTSDIR}/devel/libslang
-.elif defined(WITH_NCURSES_PORT)
-LIB_DEPENDS+=	ncurses.4:${PORTSDIR}/devel/ncurses
-CFLAGS+=	-I${PREFIX}/include/ncurses
-.endif
-.if defined(WITH_SSL)
-USE_OPENSSL=    RSA
-.endif
-.if defined(WITH_DOCS)
-BUILD_DEPENDS+=	sgmlfmt:${PORTSDIR}/textproc/sgmlformat
-.endif
-
-DIST_SUBDIR=	mutt
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=  CC="${CC} -I${LOCALBASE}/include" LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_ARGS= --enable-pop --enable-imap --enable-flock --disable-fcntl \
-		--with-sharedir=${PREFIX}/share/mutt \
-		--with-docdir=${PREFIX}/share/doc/mutt --with-charmaps \
-		--enable-locales-fix
-.if defined(WITH_SLANG)
-CONFIGURE_ARGS+=	--with-slang=${PREFIX}
-.elif defined(WITH_NCURSES_PORT)
-CONFIGURE_ARGS+=	--with-curses=${PREFIX}
-.endif
-.if defined(WITH_SSL)
-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
-.endif
-WRKSRC=		${WRKDIR}/${DISTNAME:S/i$//}
-MAN1=		mutt.1 mutt_dotlock.1
-MAN5=		muttrc.5
-
-pre-patch:
-	(cd ${WRKSRC}; ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/charmaps-0.0.tar.gz)
-
-post-patch:
-	cd ${WRKSRC}/charmaps/maps; ${LN} CP1251 WINDOWS-1251
-	cd ${WRKSRC}/charmaps/maps; ${RM} -f *.orig
-
-.if !defined(NOPORTDOCS)
-post-build:
-	${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml
-	${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-doc-ref
-	printf ",s|\$${PREFIX}|%s|g\nw\nq\n" ${PREFIX} | \
-		ed -s ${WRKSRC}/doc/mutt.man
-.if defined(WITH_DOCS)
-PLIST:=		${WRKDIR}/PLIST
-pre-install:
-	@${CAT} ${PKGDIR}/PLIST.htmlfiles >> ${PLIST}
-	@${CAT} ${PKGDIR}/PLIST >> ${PLIST}
-.endif
-.endif
-
-post-install:
-	@strip ${PREFIX}/bin/mutt
-.if !defined(NOPORTDOCS)
-	@${ECHO} "===>   Installing Mutt documentation"
-	@${MKDIR} ${PREFIX}/share/doc/mutt && ${CHMOD} a+rx ${PREFIX}/share/doc/mutt
-	@cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \
-		${PREFIX}/share/doc/mutt
-.if defined(WITH_DOCS)
-	env MANMODE=0755 ${INSTALL_MAN} -d ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/mutt/html
-	${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${PREFIX}/share/doc/mutt
-.endif
-.endif
+EXTRA_PATCHES=	${.CURDIR}/patches/patch-0a  \
+		${.CURDIR}/patches/patch-init.h  \
+		${.CURDIR}/patches/patch-pgp.c  \
+		${.CURDIR}/patches/patch-sendlib.c 
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/chinese/mutt/files/patch-parse.c b/chinese/mutt/files/patch-parse.c
new file mode 100644
index 000000000000..f2545cc43cb7
--- /dev/null
+++ b/chinese/mutt/files/patch-parse.c
@@ -0,0 +1,15 @@
+--- parse.c.orig	Sat Apr 22 16:49:29 2000
++++ parse.c	Sat Aug  5 14:25:02 2000
+@@ -407,10 +407,11 @@
+       else if (!mutt_strcasecmp ("description", line + 8))
+       {
+ 	mutt_str_replace (&p->description, c);
+-	rfc2047_decode (p->description, p->description, mutt_strlen (p->description) + 1);
+       }
+     }
+   }
++  if (p->description) rfc2047_decode (p->description, p->description, mutt_strlen (p->description) + 1);
++  if (p->filename) rfc2047_decode (p->filename, p->filename, mutt_strlen (p->filename) + 1);
+   p->offset = ftell (fp); /* Mark the start of the real data */
+   if (p->type == TYPETEXT && !p->subtype)
+     p->subtype = safe_strdup ("plain");