1 files changed, 33 insertions, 38 deletions

diff --git a/mail/mew2-emacs20/Makefile b/mail/mew2-emacs20/Makefile
index 49818c47260f..2afca38a8eef 100644
--- a/mail/mew2-emacs20/Makefile
+++ b/mail/mew2-emacs20/Makefile
@@ -8,54 +8,47 @@
 PORTNAME=	mew
 PORTVERSION=	${MEW_VER}
 CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/old/ \
-		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/old/ \
+MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
+		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
 		${MASTER_SITE_PORTS_JP}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
 MAINTAINER?=	kiri@FreeBSD.org
 
-# distfile version
-MEW_VER=	1.94.2
+# Mew major version
+MEW_MAJOR_VER?=	2
 
-.if !defined(EMACS_PORT_NAME)
-# setup.el filename
-EMACS_SETUPEL=	${PORTNAME}-setup.el
-.endif
+# distfile version
+MEW_VER=	${MEW_MAJOR_VER}.0
 
 # document install directory by install-doc target
-MEW_DOCDIR?=	share/doc/${PORTNAME}
+MEW_DOCDIR?=	share/doc/${PORTNAME}${MEW_MAJOR_VER}
 
 # emacs port setup
-EMACS_PORT_NAME?=	emacs
+EMACS_PORT_NAME?=	emacs20
 
 # target name for make build and install
-ALL_TARGET?=	all # info
-INSTALL_TARGET?=install install-info install-etc
-
-# depends
-RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+ALL_TARGET?=	all info jinfo
+INSTALL_TARGET?=	install install-info install-jinfo install-etc
 
 # environments
-MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR}
-SCRIPTS_ENV+=	TARGETS="${EMACS_SETUPEL}" EMACS_SETUPEL=${EMACS_SETUPEL:S/.el$//}
-PLIST_SUB+=	MEW_DOCDIR=${MEW_DOCDIR} EMACS_SETUPEL=${EMACS_SETUPEL}
+MAKE_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} MEW_MAJOR_VER=${MEW_MAJOR_VER}
+PLIST_SUB+=	MEW_MAJOR_VER=${MEW_MAJOR_VER}
 
-pre-configure:
-.if defined(EMACS_SETUPEL)
-	@${CP} ${FILESDIR}/${EMACS_SETUPEL}.in ${WRKDIR}
-.endif
+# manuals
+MAN1=		mewcat.1 mewdecode.1 mewencode.1 mewls.1
+
+post-patch:
+	for f in mew-key.el info/mew.texi; do \
+		${PERL} -i -pe 's,%%MEW_MAJOR_VER%%,${MEW_MAJOR_VER},g' ${WRKSRC}/$${f}; \
+	done
 
 post-install:
-.if defined(EMACS_SETUPEL)
-	${INSTALL_DATA} ${WRKDIR}/${EMACS_SETUPEL} \
-			${PREFIX}/${EMACS_LIBDIR}/site-lisp
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${MEW_DOCDIR}
 	(cd ${WRKSRC} ; \
 		${INSTALL_DATA} 00* ${PREFIX}/${MEW_DOCDIR}/ ; \
-		for dir in contrib patches; do \
+		for dir in contrib; do \
 			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
 		done)
 	${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
@@ -64,16 +57,15 @@ post-install:
 ############################################################
 ## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
 ############################################################
-#COMMENT_TEXT=	Message interface to Emacs Window for ${EMACS_PORT_NAME}
+#COMMENT_TEXT=	'Message interface to Emacs Window (version ${MEW_MAJOR_VER}) for ${EMACS_PORT_NAME}'
 #.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
-#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}
+#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}${MEW_MAJOR_VER}
 #INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
-#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}
+#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
 #.else
-#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}${MEW_MAJOR_VER}
 #INFODIR=	${PREFIX}/info
-#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}
-#REQUIRE=	(require \'${EMACS_SETUPEL:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
+#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}${MEW_MAJOR_VER}
 #.endif
 #SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
 #		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
@@ -87,27 +79,30 @@ post-install:
 #pre-arrange:
 #	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
+#		MEW_MAJOR_VER=${MEW_MAJOR_VER} \
 #		${SH} ${FILESDIR}/tmpl2file.sh
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
+#	${SETENV} EMACS_PORT_NAME=${EMACS_PORT_NAME} WRKTMPDIR=${PKGDIR} \
+#		${SH} ${FILESDIR}/message.sh
 #	${CHOWN} kiri:staff ${PKGDIR}/pkg-comment ${PKGDIR}/pkg-descr ${PKGDIR}/pkg-message
 #
 #arrange:
 #.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
 #	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
+#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
 #			${EMACS_PACKAGESDIR} ${EMACS_PACKAGESDIR}/lisp \
 #			${EMACS_PACKAGESDIR}/info ${EMACS_PACKAGESDIR}/etc \
 #			${EMACS_PACKAGESDIR}/man ${EMACS_PACKAGESDIR}/pkginfo" \
 #		DIRRMDEPTH=2 plist
 #.else
 #	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
-#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
-#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
+#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}${MEW_MAJOR_VER}$,,} \
 #			${EMACS_LIBDIR}/${EMACS_VER}/site-lisp \
 #			${EMACS_LIBDIR}/${EMACS_VER}" \
 #		INFOFILES="mew.info mew.jis.info" DIRRMDEPTH=2 plist
 #.endif
 #	${INSTALL} -c -m 644 -o kiri -g staff ${WRKPLIST} ${PLIST}
+#	${PERL} -i -pe 's@((?!mew)...|^.{0,2})%%MEW_MAJOR_VER%%@$$1\x32@g' ${PLIST}
 
 .include <bsd.port.mk>