Update to 2.6.1.

Move master port from mail/wanderlust-emacs to mail/wanderlust.
mail/wanderlust supports emacs21.
Remove mail/wanderlust-emacs and mail/wanderlust-mule.

Approved by:	knu

1 files changed, 0 insertions, 167 deletions

diff --git a/mail/wanderlust-emacs/Makefile b/mail/wanderlust-emacs/Makefile
deleted file mode 100644
index 7b0cdb5e2313..000000000000
--- a/mail/wanderlust-emacs/Makefile
+++ /dev/null
@@ -1,167 +0,0 @@
-# New ports collection makefile for:	Wanderlust (for emacs)
-# Date created:		7 Apr 1999
-# Whom: 		MANTANI Nobutaka <nobutaka@nobutaka.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	wanderlust
-PORTVERSION=	2.4.1
-CATEGORIES=	mail elisp
-MASTER_SITES=	ftp://ftp.gohome.org/wl/stable/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,text/elisp/wl/stable/&,} \
-		ftp://ftp.jaist.ac.jp/pub/GNU/elisp/ftp.gohome.org/wl/stable/ \
-		http://www.jpl.org/elips/wl/
-
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	wl-${PORTVERSION}
-
-MAINTAINER=	nobutaka@FreeBSD.org
-
-MIMEUI_PRODUCT?=	semi
-MIMEUI_BRANCH?=		1.13
-MIMEUI_PORT_NAME?=	${MIMEUI_PRODUCT}${MIMEUI_BRANCH:S/.//}-${EMACS_PORT_NAME}
-MIMEUI_COOKIE=	${MIMEUI_PRODUCT}-${EMACS_PORT_NAME}-${MIMEUI_BRANCH}.FreeBSD-packages
-
-.if !defined (IS_SLAVE)
-# for emacs19
-EMACS_PORT_NAME=	emacs
-.endif
-
-.if (${EMACS_PORT_NAME} == "emacs20" || ${EMACS_PORT_NAME} == "mule" || \
-     ${EMACS_PORT_NAME} == "xemacs21-mule")
-WITH_MULE=yes
-.else
-WITHOUT_MULE=yes
-.endif
-
-# depends on semi
-BUILD_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-RUN_DEPENDS+=	${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
-
-# depends on nkf
-.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
-BUILD_DEPENDS+=	nkf:${PORTSDIR}/japanese/nkf
-.endif
-
-.if defined(EMACS_PACKAGESDIR)
-ALL_TARGET=	package
-INSTALL_TARGET=	install-package
-UTILSDIR=	${EMACS_PACKAGESDIR}/lisp/wl
-STARTUPDIR=	${EMACS_PACKAGESDIR}/lisp/wl
-.else
-ALL_TARGET=	all info
-INSTALL_TARGET=	install install-info
-INFODIR=	${PREFIX}/info
-UTILSDIR=	${EMACS_SITE_LISPDIR}/wl
-.if (${EMACS_PORT_NAME} == "xemacs20")
-STARTUPDIR=	${EMACS_SITE_LISPDIR}
-.else
-STARTUPDIR=	${EMACS_VERSION_SITE_LISPDIR}
-.endif
-.endif
-
-DIRSECTION=	"The Emacs editor and associated tools"
-PORTDOCDIR=	share/doc/wanderlust
-DOCS=		README README.ja ChangeLog BUGS BUGS.ja \
-		NEWS NEWS.ja doc/wl-ja.texi doc/wl.texi
-SAMPLESDIR=	share/examples/wanderlust
-SAMPLESLANG=	en ja
-SAMPLES=	dot.addresses dot.folders dot.wl
-UTILS=		bbdb-wl.el im-wl.el ssl.el
-
-PLIST_SUB+=	EMACS_PACKAGESDIR=${EMACS_PACKAGESDIR} \
-		DIRSECTION=${DIRSECTION}
-
-PLIST=		${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
-		LISPDIR=${PREFIX}/${EMACS_SITE_LISPDIR} \
-		FLAGS="-batch -q -no-site-file -l ${WRKDIR}/wanderlust-startup.el"
-.if defined(EMACS_PACKAGESDIR)
-MAKE_ARGS+=	PACKAGEDIR=${PREFIX}/${EMACS_PACKAGESDIR}
-.else
-MAKE_ARGS+=	INFODIR=${INFODIR}
-.endif
-
-post-extract:
-	@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@${ECHO} '(setq wl-info-lang (list "en" "ja"))' >> ${WRKSRC}/WL-CFG
-.else
-	@${ECHO} '(setq wl-info-lang "en")' >> ${WRKSRC}/WL-CFG
-.endif
-
-post-configure:
-	@${SED} \
-		-e "s,%%PREFIX%%,${PREFIX},g" \
-		-e "s,%%EMACS_LIBDIR%%,${EMACS_LIBDIR},g" \
-		-e "s,%%EMACS_LIBDIR_WITH_VER%%,${EMACS_LIBDIR_WITH_VER},g" \
-		-e "s,%%EMACS_PACKAGESDIR%%,${EMACS_PACKAGESDIR},g" \
-		< ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl > ${WRKDIR}/wanderlust-startup.el
-	@${CP} ${WRKSRC}/wl/wl-vars.el ${WRKSRC}/wl/wl-vars.el.temp
-.if (${EMACS_PORT_NAME} == "emacs" || ${EMACS_PORT_NAME} == "xemacs20")
-	@nkf -e ${WRKSRC}/wl/wl-vars.el.temp > ${WRKSRC}/wl/wl-vars.el
-.endif
-
-pre-build:
-.if defined(EMACS_PACKAGESDIR)
-	@${CP} ${FILESDIR}/_pkg.el ${WRKSRC}
-.endif
-
-post-install:
-.if !defined(EMACS_PACKAGESDIR)
-	@${MAKE} install-info
-.endif
-.if !defined(NOPORTDOCS)
-	@${MAKE} install-docs
-.endif
-	@${MAKE} install-samples
-	@${MAKE} install-utils
-.if defined(EMACS_PACKAGESDIR)
-	@${MAKE} install-manifest
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-# local targets
-install-info:
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl.info ${INFODIR}/dir
-.if defined(WITH_MULE) && !defined(WITHOUT_MULE)
-	@install-info --section=${DIRSECTION} ${WRKSRC}/doc/wl-ja.info ${INFODIR}/dir
-.endif
-
-install-docs:
-	@${MKDIR} ${PREFIX}/${PORTDOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/elmo/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.elmo
-	${INSTALL_DATA} ${WRKSRC}/wl/ChangeLog ${PREFIX}/${PORTDOCDIR}/ChangeLog.wl
-
-install-samples:
-.for l in ${SAMPLESLANG}
-	${MKDIR} ${PREFIX}/${SAMPLESDIR}/$l
-	for i in ${SAMPLES} ; do \
-		${INSTALL_DATA} ${WRKSRC}/samples/$l/$$i ${PREFIX}/${SAMPLESDIR}/$l; \
-	done
-.endfor
-	${MKDIR} ${PREFIX}/share/wanderlust
-	${INSTALL_DATA} ${WRKSRC}/etc/ja.Emacs ${PREFIX}/share/wanderlust
-
-install-utils:
-	@${MKDIR} ${PREFIX}/${UTILSDIR}
-.for i in ${UTILS}
-	${INSTALL_DATA} ${WRKSRC}/utils/${i} ${PREFIX}/${UTILSDIR}
-.endfor
-.if (${EMACS_PORT_NAME} == "emacs")
-	@${INSTALL_DATA} ${WRKSRC}/wl/wl-mule.el ${PREFIX}/${EMACS_SITE_LISPDIR}/wl
-.endif
-	@${MKDIR} ${PREFIX}/${STARTUPDIR}
-	@${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${PREFIX}/${STARTUPDIR}
-
-install-manifest:
-	@${CAT} ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \
-		${SED} -e "s!^%%EMACS_PACKAGESDIR%%!!" > ${WRKDIR}/${MANIFEST}
-	@${INSTALL_DATA} ${WRKDIR}/${MANIFEST} ${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/
-	@${INSTALL_DATA} ${FILESDIR}/_pkg.el ${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl
-
-.include <bsd.port.mk>