Date: Mon, 21 Dec 2009 13:09:48 +0900 From: Hajimu UMEMOTO <ume@FreeBSD.org> To: Boris Samorodov <bsam@FreeBSD.org>, nobutaka@FreeBSD.org Cc: cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org, ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/Mk bsd.emacs.mk ports/audio/emms Makefile ports/databases/bbdb Makefile ports/databases/lsdb Makefile ports/deskutils/org-mode.el6 Makefile distinfo pkg-plist ports/deskutils/planner.el Makefile ports/deskutils/remember.el ... Message-ID: <ygeljgxc6ib.wl%ume@mahoroba.org> In-Reply-To: <200912202019.nBKKJO4a042874@repoman.freebsd.org> References: <200912202019.nBKKJO4a042874@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
>>>>> On Sun, 20 Dec 2009 20:19:24 +0000 (UTC)
>>>>> Boris Samorodov <bsam@FreeBSD.org> said:
bsam> Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
bsam> (they do not compile):
bsam> . lang/bigloo;
bsam> . mail/wanderlust;
bsam> . mail/wanderlust-devel;
bsam> . www/emacs-w3m.
Here is a proposed patch for mail/wanderlust.
Sincerely,
[-- Attachment #2 --]
Index: wanderlust/Makefile
diff -u wanderlust/Makefile.orig wanderlust/Makefile
--- wanderlust/Makefile.orig 2009-12-21 12:55:20.000000000 +0900
+++ wanderlust/Makefile 2009-12-21 12:58:52.000000000 +0900
@@ -24,10 +24,6 @@
.include <bsd.port.pre.mk>
-.if (${EMACS_PORT_NAME} == "emacs23")
-BROKEN= can not be installed with Emacs 23
-.endif
-
EMACS_W3M_PORT_NAME?= emacs-w3m
EMACS_W3M_LISP_FILE?= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3m/shimbun.el
@@ -79,10 +75,11 @@
WL_LISPDIR=${WL_LISPDIR} \
WL_ICONDIR=${WL_ICONDIR} \
SHIMBUN=${SHIMBUN}
-.if (${EMACS_PORT_NAME} == "emacs-devel")
-PLIST= ${PKGDIR}/pkg-plist.emacs22
-.else
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || \
+ (${EMACS_PORT_NAME} == "xemacs21-mule")
PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.else
+PLIST= ${PKGDIR}/pkg-plist.emacs22
.endif
WRK_STARTUP_FILE= ${WRKDIR}/wanderlust-startup.el
MAKE_ARGS+= EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD} \
@@ -97,10 +94,11 @@
post-extract:
@${CP} ${FILESDIR}/WL-CFG ${WRKSRC}
-.if (${EMACS_PORT_NAME} == "emacs-devel")
-STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.emacs22.el.tmpl
-.else
+.if (${EMACS_PORT_NAME} == "emacs20") || (${EMACS_PORT_NAME} == "emacs21") || \
+ (${EMACS_PORT_NAME} == "xemacs21-mule")
STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.${EMACS_PORT_NAME}.el.tmpl
+.else
+STARTUP_TMPL= ${FILESDIR}/wanderlust-startup.emacs22.el.tmpl
.endif
post-configure:
[-- Attachment #3 --]
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
ume@mahoroba.org ume@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ygeljgxc6ib.wl%ume>