Date: Mon, 10 Oct 2016 13:56:13 +0000 (UTC) From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423666 - in head/mail/wanderlust: . files Message-ID: <201610101356.u9ADuD4c000922@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nobutaka Date: Mon Oct 10 13:56:13 2016 New Revision: 423666 URL: https://svnweb.freebsd.org/changeset/ports/423666 Log: - Fix configure error with Emacs 25. - Remove xemacs-related files and code that are no longer used. Added: head/mail/wanderlust/files/wanderlust-startup.el - copied unchanged from r423665, head/mail/wanderlust/files/wanderlust-startup.emacs24.el.tmpl Deleted: head/mail/wanderlust/files/wanderlust-startup.emacs20.el.tmpl head/mail/wanderlust/files/wanderlust-startup.emacs21.el.tmpl head/mail/wanderlust/files/wanderlust-startup.emacs22.el.tmpl head/mail/wanderlust/files/wanderlust-startup.emacs23.el.tmpl head/mail/wanderlust/files/wanderlust-startup.emacs24.el.tmpl head/mail/wanderlust/files/wanderlust-startup.xemacs21-mule.el.tmpl Modified: head/mail/wanderlust/Makefile Modified: head/mail/wanderlust/Makefile ============================================================================== --- head/mail/wanderlust/Makefile Mon Oct 10 13:54:36 2016 (r423665) +++ head/mail/wanderlust/Makefile Mon Oct 10 13:56:13 2016 (r423666) @@ -13,8 +13,6 @@ DISTNAME= wl-${PORTVERSION} MAINTAINER= nobutaka@FreeBSD.org COMMENT?= Yet another message interface on Emacsen -BROKEN= fails to configure - USE_EMACS= yes NO_ARCH= yes @@ -74,7 +72,7 @@ PLIST_SUB+= EMACS_PACKAGESDIR=${EMACS_PA WRK_STARTUP_FILE= ${WRKDIR}/wanderlust-startup.el MAKE_ARGS+= EMACS=${EMACS_CMD} \ LISPDIR=${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} \ - FLAGS="-batch -q -no-site-file -l ${WRK_STARTUP_FILE:C/\/\/*/\//g}" + FLAGS="-batch -q -no-site-file" INFO= wl wl-ja PLIST= ${PKGDIR}/pkg-plist.emacs MAKE_ARGS+= INFODIR=${STAGEDIR}${INFODIR} \ @@ -83,38 +81,12 @@ MAKE_ARGS+= INFODIR=${STAGEDIR}${INFODIR post-extract: @${CP} ${FILESDIR}/WL-CFG ${WRKSRC} -.if (${EMACS_PORT_NAME} == "emacs-devel") -STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.emacs22.el.tmpl -.else -STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl -.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" \ - < ${STARTUP_TMPL} > ${WRKDIR}/wanderlust-startup.el - -pre-build: -.if defined(EMACS_PACKAGESDIR) - @${CP} ${FILESDIR}/_pkg.el ${WRKSRC} -.endif - post-install: .if !exists(${EMACS_W3M_LISP_FILE}) -.if defined(EMACS_PACKAGESDIR) - ${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl -.else ${INSTALL_DATA} ${WRKSRC}/elmo/elmo-shimbun.el ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/wl .endif -.endif ${MAKE} install-samples ${MAKE} install-utils -.if defined(EMACS_PACKAGESDIR) - ${MAKE} install-manifest -.endif # local targets post-install-DOCS-on: @@ -143,13 +115,6 @@ install-utils: ${INSTALL_DATA} ${WRKSRC}/utils/${i} ${STAGEDIR}${PREFIX}/${UTILSDIR} .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/${STARTUPDIR} - ${INSTALL_DATA} ${WRKDIR}/wanderlust-startup.el ${STAGEDIR}${PREFIX}/${STARTUPDIR} - -install-manifest: - ${MKDIR} ${STAGEDIR}${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/ - ${CAT} ${PLIST} | ${GREP} -e "^%%EMACS_PACKAGESDIR%%" | \ - ${SED} -e "s!^%%EMACS_PACKAGESDIR%%!!" > ${WRKDIR}/${MANIFEST} - ${INSTALL_DATA} ${WRKDIR}/${MANIFEST} ${STAGEDIR}${PREFIX}/${EMACS_PACKAGESDIR}/pkginfo/ - ${INSTALL_DATA} ${FILESDIR}/_pkg.el ${STAGEDIR}${PREFIX}/${EMACS_PACKAGESDIR}/lisp/wl + ${INSTALL_DATA} ${FILESDIR}/wanderlust-startup.el ${STAGEDIR}${PREFIX}/${STARTUPDIR} .include <bsd.port.post.mk> Copied: head/mail/wanderlust/files/wanderlust-startup.el (from r423665, head/mail/wanderlust/files/wanderlust-startup.emacs24.el.tmpl) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/wanderlust/files/wanderlust-startup.el Mon Oct 10 13:56:13 2016 (r423666, copy of r423665, head/mail/wanderlust/files/wanderlust-startup.emacs24.el.tmpl) @@ -0,0 +1,4 @@ +(autoload 'wl "wl" "Wanderlust" t) +(autoload 'wl-draft "wl-draft" "Write draft with Wanderlust." t) +(load "mime-setup") +(provide 'wanderlust-startup)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610101356.u9ADuD4c000922>