1 files changed, 80 insertions, 210 deletions

diff --git a/mail/mew/Makefile b/mail/mew/Makefile
index e2b97ff34b36..367320308534 100644
--- a/mail/mew/Makefile
+++ b/mail/mew/Makefile
@@ -5,238 +5,108 @@
 # $FreeBSD$
 #
 
-PORTNAME=	mew-${EMACS_PORT_NAME}
-PORTVERSION=	1.94.1
-CATEGORIES=	mail elisp
+PORTNAME=	mew
+PORTVERSION=	${MEW_VER}
+CATEGORIES=	editors elisp
 MASTER_SITES=	ftp://ftp.mew.org/pub/Mew/ \
 		ftp://ftp.kyushu-u.ac.jp/pub/Misc/mew/ \
 		${MASTER_SITE_PORTS_JP}
-DISTNAME=	mew-${PORTVERSION}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 
-MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
+MAINTAINER?=	kiri@FreeBSD.org
 
-### crypto
-#RESTRICTED=	"USA ITAR export restrictions (has PGP hooks)"
+# distfile version
+MEW_VER=	1.94.2
 
-RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+.if !defined(EMACS_PORT_NAME)
+# setup.el filename
+EMACS_SETUPEL=	${PORTNAME}-setup.el
+.endif
 
-SCRIPTS_ENV=	AWK=${AWK} CAT=${CAT} CP=${CP} ECHO=${ECHO} MKDIR="${MKDIR}" \
-		RM=${RM} TOUCH=${TOUCH} SED=${SED} \
-		EMACSDIR=${EMACSDIR} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
-		ETCDIR=${ETCDIR} SAMPLEDIR=${SAMPLEDIR} WRKTMPDIR=${WRKTMPDIR} \
-		PORTDIR=${.CURDIR:S!^${PORTSDIR}/!!} \
-		EMACS_CMD=${EMACS_CMD} EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		PKGNAME=${PKGNAME} TMPL_FILES="${TMPL_FILES}" \
-		VERSION=${PORTVERSION} \
-		SITE_STARTUP_FILE=${SITE_STARTUP_FILE} REQUIRE="${REQUIRE}"
-MAKE_ARGS=	PREFIX=${PREFIX} EMACS=${EMACS_CMD} ELISPDIR=${ELISPDIR} \
-		INFODIR=${INFODIR} ETCDIR=${ETCDIR}
-MAKE_ENV=	EMACSPKGDIR=${EMACSPKGDIR} MANDIR=${PKGMANDIR} \
-		PKG_PKGINFODIR=${PKG_PKGINFODIR} XEMACS_VER_OVER20=${XEMACS_VER_OVER20} \
-		MKDIR="${MKDIR}" PERL=${PERL5} PERL_BADLANG=0
-INSTALL_TARGET=	${INST_TARGET_LIST}
-PLIST_SUB=	EMACS_LISPDIR=${EMACS_LISPDIR} \
-		EMACS_ETCDIR=${EMACS_ETCDIR} \
-		EMACS_INFODIR=${EMACS_INFODIR} \
-		EMACS_PKGDIR=${EMACS_PKGDIR}
-PATCHDIR=	${.CURDIR}/../mew/files
-SCRIPTDIR=	${.CURDIR}/../mew/scripts
-FILESDIR=	${.CURDIR}/../mew/files
+# document install directory by install-doc target
+MEW_DOCDIR?=	share/doc/${PORTNAME}
 
+# emacs port setup
 EMACS_PORT_NAME?=	emacs
-SAMPLEFILES=		Addrbook
-SAMPLEDOTEMACS=		dot.emacs.el
-PORTDOCS=		00changes 00copyright 00copyright.jis 00diff 00readme
-TMPL_FILES=		user-install ${SITE_STARTUP_FILE} ${SAMPLEDOTEMACS}
-EMACSDIR=		${PREFIX}/${EMACS_LIBDIR_WITH_VER}
-ELISPDIR=		${PREFIX}/${EMACS_LISPDIR}/mew
-INFODIR=		${PREFIX}/${EMACS_INFODIR}
-ETCDIR=			${PREFIX}/${EMACS_ETCDIR}/mew
-EMACSPKGDIR=		${PREFIX}/${EMACS_PKGDIR}
-PKGELISPDIR=		${PREFIX}/${EMACS_PKG_LISPDIR}/mew
-PKGINFODIR=		${PREFIX}/${EMACS_PKG_INFODIR}
-PKGMANDIR=		${PREFIX}/${EMACS_PKG_MANDIR}/mew
-PKGETCDIR=		${PREFIX}/${EMACS_PKG_ETCDIR}/mew
-PKG_PKGINFODIR=		${PREFIX}/${EMACS_PKG_PKGINFODIR}
-WRKTMPDIR=		${WRKDIR}/tmp
-SAMPLEDIR=		${PREFIX}/share/examples/mew
-PORTDOCDIR=		${PREFIX}/share/doc/mew
-COMMENT_TEXT=		Message interface to Emacs Window for ${EMACS_PORT_NAME}
 
-.if (${EMACS_PORT_NAME} == "emacs")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/emacs
-EMACS_NAME=		emacs
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		info
-EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "emacs20")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/emacs20
-EMACS_NAME=		emacs
-EMACS_VER=		20.6
-EMACS_MAJOR_VER=	20
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		info
-.elif (${EMACS_PORT_NAME} == "mule")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/mule
-EMACS_NAME=		mule
-EMACS_VER=		19.34
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	${EMACS_LIBDIR}/${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR}/info
-EMACS_SITELISPDIR=	${EMACS_LIBDIR}/site-lisp
-SITE_STARTUP_FILE=	mew-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs
-EMACS_NAME=		xemacs
-EMACS_VER=		19.16
-EMACS_MAJOR_VER=	19
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR_WITH_VER}/info
-EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs20")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs20
-EMACS_NAME=		xemacs
-EMACS_VER=		20.4
-EMACS_MAJOR_VER=	20
-EMACS_CMD=		${EMACS_NAME}-${EMACS_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_ETCDIR=		${EMACS_LIBDIR}/etc
-EMACS_LISPDIR=		${EMACS_LIBDIR}/site-lisp
-EMACS_INFODIR=		${EMACS_LIBDIR}/info
-EMACS_SITELISPDIR=	${EMACS_LISPDIR}
-SITE_STARTUP_FILE=	mew-xemacs-startup.el
-.elif (${EMACS_PORT_NAME} == "xemacs21")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs21
-EMACS_NAME=		xemacs
-EMACS_VER=		21.1.12
-EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-BUILD_DEPENDS=	${EMACS_CMD}:${PORTSDIR}/editors/xemacs21-mule
-EMACS_NAME=		xemacs
-EMACS_VER=		21.1.9
-EMACS_MAJOR_VER=	21
-EMACS_CMD=		${EMACS_NAME}${EMACS_MAJOR_VER}-mule
-EMACS_LIBDIR=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PKGDIR=		${EMACS_LIBDIR}/site-packages
-EMACS_PKG_LISPDIR=	${EMACS_PKGDIR}/lisp
-EMACS_PKG_INFODIR=	${EMACS_PKGDIR}/info
-EMACS_PKG_MANDIR=	${EMACS_PKGDIR}/man
-EMACS_PKG_ETCDIR=	${EMACS_PKGDIR}/etc
-EMACS_PKG_PKGINFODIR=	${EMACS_PKGDIR}/pkginfo
-EMACS_ETCDIR=		${EMACS_PKG_ETCDIR}
-EMACS_LISPDIR=		${EMACS_PKG_LISPDIR}
-EMACS_INFODIR=		${EMACS_PKG_INFODIR}
-.else
-NO_BUILD=	yes
-NO_INSTALL=	yes
-.endif
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-INST_TARGET_LIST=	install-package
-XEMACS_VER_OVER20=	yes
-.else
-INST_TARGET_LIST=	install install-info
-REQUIRE=		(require \'${SITE_STARTUP_FILE:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
-.endif
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule") || \
-	(${EMACS_PORT_NAME} == "xemacs21-mule")
-INST_TARGET_LIST+=	install-jinfo
-.endif
+# target name for make build and install
+ALL_TARGET?=	all # info
+INSTALL_TARGET?=install install-info install-etc
 
-post-configure:
-	@${MKDIR} ${WRKTMPDIR}
-	@cd ${FILESDIR}; \
-	${CP} ${SAMPLEFILES} ${WRKTMPDIR}
+# depends
+RUN_DEPENDS=	imali:${PORTSDIR}/mail/im
+
+# 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}
 
-pre-install:
-	${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/tmpl2file.sh
-	@${MKDIR} ${ELISPDIR} ${INFODIR}
-.if (${EMACS_NAME} == "xemacs")
-	@${MKDIR} ${ETCDIR}/etc
+pre-configure:
+.if defined(EMACS_SETUPEL)
+	@${CP} ${FILESDIR}/${EMACS_SETUPEL}.in ${WRKDIR}
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PORTDOCDIR}/contrib
-	@cd ${WRKSRC}; \
-	${INSTALL_DATA} ${PORTDOCS} ${PORTDOCDIR}; \
-	${INSTALL_DATA} contrib/* ${PORTDOCDIR}/contrib
-	@${MKDIR} ${SAMPLEDIR}/dot.emacs
-	@cd ${WRKTMPDIR}; \
-	${INSTALL_DATA} ${SAMPLEFILES} ${SAMPLEDIR}; \
-	${INSTALL_DATA} ${SAMPLEDOTEMACS} ${SAMPLEDIR}/dot.emacs; \
-	${INSTALL_SCRIPT} user-install ${SAMPLEDIR}
-.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} <= 20
-	@cd ${WRKSRC}/etc; \
-	${INSTALL_DATA} *.xpm Mew.* ${PREFIX}/${EMACS_ETCDIR}/mew; \
-	${INSTALL_DATA} etc/* ${PREFIX}/${EMACS_ETCDIR}/mew/etc
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
-.elif (${EMACS_NAME} != "xemacs")
-	@${INSTALL_DATA} ${WRKSRC}/info/*.texi ${PORTDOCDIR}
-.endif
-.endif
-.if (${EMACS_NAME} != "xemacs") || ${EMACS_MAJOR_VER} <= 20
-	@install-info ${WRKSRC}/info/mew.info ${INFODIR}/dir
-.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "mule")
-	@install-info ${WRKSRC}/info/mew.jis.info ${INFODIR}/dir
+.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 \
+			${CP} -R $${dir} ${PREFIX}/${MEW_DOCDIR}/ ; \
+		done)
+	${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${PREFIX}/${MEW_DOCDIR}
 .endif
-.if defined(SITE_STARTUP_FILE)
-	@${MKDIR} ${PREFIX}/${EMACS_SITELISPDIR}
-	@${INSTALL_DATA} ${WRKTMPDIR}/${SITE_STARTUP_FILE} \
-		${PREFIX}/${EMACS_SITELISPDIR}/mew-${EMACS_PORT_NAME}-startup.el
-.endif
-	@${CAT} ${PKGMESSAGE}
 
-## for make DESCR,COMMENT and PLIST (only maintainer use)
-#arrange:
-#	${MKDIR} ${PKGDIR}
-#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/COMMENT
-#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=DESCR \
+############################################################
+## Make DESCR,COMMENT and PLIST (only for MAINTAINER use)
+############################################################
+#COMMENT_TEXT=	Message interface to Emacs Window for ${EMACS_PORT_NAME}
+#.if ${EMACS_PORT_NAME} == "xemacs21" || ${EMACS_PORT_NAME} == "xemacs21-mule"
+#ELISPDIR=	${PREFIX}/${EMACS_PACKAGESDIR}/lisp/${PORTNAME}
+#INFODIR=	${PREFIX}/${EMACS_PACKAGESDIR}/info
+#ETCDIR=		${PREFIX}/${EMACS_PACKAGESDIR}/etc/${PORTNAME}
+#.else
+#ELISPDIR=	${PREFIX}/${EMACS_SITE_LISPDIR}/${PORTNAME}
+#INFODIR=	${PREFIX}/info
+#ETCDIR=		${PREFIX}/${EMACS_LIBDIR}/etc/${PORTNAME}
+#REQUIRE=	(require \'${EMACS_SETUPEL:S/^mew-/&${EMACS_PORT_NAME}-/:S/.el$//})
+#.endif
+#SCRIPTS_ENV+=	EMACS_PORTSDIR=${EMACS_PORTSDIR:S,^${PORTSDIR}/,,} \
+#		PKGNAME=${PKGNAME} ELISPDIR=${ELISPDIR} INFODIR=${INFODIR} \
+#		ETCDIR=${ETCDIR} EMACS_CMD=${EMACS_CMD:S,${PREFIX}/bin/,,} \
+#		PORTNAME=${PORTNAME} EMACS_PORT_NAME=${EMACS_PORT_NAME}
+#
+#pre-plist:
+#	mkdir -p ${ELISPDIR} ${INFODIR} ${ETCDIR} \
+#		${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp
+#
+#pre-arrange:
+#	${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment
+#	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \
 #		${SH} ${FILESDIR}/tmpl2file.sh
 #	${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh
-#	${CHOWN} kiri:staff ${PKGDIR} ${PKGDIR}/COMMENT ${PKGDIR}/DESCR ${PKGDIR}/MESSAGE
-#.if (${EMACS_NAME} == "xemacs") && ${EMACS_MAJOR_VER} > 20
-#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
+#	${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}$,,} \
+#			${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} EMACS_INFODIR=${EMACS_INFODIR}" \
-#		DIRRM2RMDIRS="${EMACS_ETCDIR} ${EMACS_LISPDIR} ${EMACS_INFODIR} ${EMACS_PKGDIR} ${EMACS_PKG_MANDIR} ${EMACS_PKG_PKGINFODIR}" \
-#		INFOFILES=mew.info DIRRMDEPTH=2 plist
+#	${MAKE} PLIST_SUB_EXCLS="${PLIST_SUB_EXCLS}" \
+#		DIRRM2RMDIRS="${ETCDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${ELISPDIR:S,^${PREFIX}/,,:S,/${PORTNAME}$,,} \
+#			${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}