Date: Sun, 2 Apr 2006 20:42:25 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/95238: bsd.port.mk: include bsd.emacs.mk only when USE_EMACS is set Message-ID: <200604022042.k32KgPI2082361@www.freebsd.org> Resent-Message-ID: <200604022050.k32KoOgx051309@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 95238
>Category: ports
>Synopsis: bsd.port.mk: include bsd.emacs.mk only when USE_EMACS is set
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Apr 02 20:50:24 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: MANTANI Nobutaka
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
FreeBSD bullet.internal.nobutaka.org 7.0-CURRENT FreeBSD 7.0-CURRENT #32: Sun Mar 26 12:17:05 JST 2006 nobutaka@bullet.internal.nobutaka.org:/usr/obj/usr/src/sys/BULLET i386
>Description:
With current bsd.port.mk, bsd.emacs.mk is included when USE_EMACS or
EMACS_PORT_NAME is set. But if EMACS_PORT_NAME is set from command line or
/etc/make.conf, every port depends on the corresponding emacs port and
this causes infinite dependency loop (e.g. editors/apel -> editors/emacs-devel
-> editors/emacs-devel ...). This behaviour prevents from building emacs lisp
ports for emacs-devel by setting EMACS_PORT_NAME=emacs22 from command line or
/etc/make.conf.
So I would like to modify bsd.port.mk to include bsd.emacs.mk only when
USE_EMACS is set. Six ports (editors/doxymacs, lang/tuareg-mode.el,
mail/rmime, math/proofgeneral, textproc/tdtd.el and textproc/uim-el) should be
modified to set USE_EMACS by this modification.
>How-To-Repeat:
# cd /usr/ports/editors/apel
# make EMACS_PORT_NAME=emacs22 install
>Fix:
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.529
diff -u -r1.529 bsd.port.mk
--- ports/Mk/bsd.port.mk 23 Feb 2006 15:37:20 -0000 1.529
+++ ports/Mk/bsd.port.mk 2 Apr 2006 19:38:45 -0000
@@ -1339,7 +1339,7 @@
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
.endif
-.if defined(USE_EMACS) || defined(EMACS_PORT_NAME)
+.if defined(USE_EMACS)
.include "${PORTSDIR}/Mk/bsd.emacs.mk"
.endif
Index: ports/editors/doxymacs/Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/doxymacs/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/editors/doxymacs/Makefile 15 Mar 2006 18:21:24 -0000 1.4
+++ ports/editors/doxymacs/Makefile 2 Apr 2006 19:38:45 -0000
@@ -15,6 +15,7 @@
MAINTAINER= dryice@dryice.name
COMMENT= Doxymacs is Doxygen + {X}Emacs
+USE_EMACS= yes
EMACS_PORT_NAME?= emacs21
BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/w3/w3.el:${PORTSDIR}/www/w3-4 \
xmllint:${PORTSDIR}/textproc/libxml2
Index: ports/lang/tuareg-mode.el/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/tuareg-mode.el/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/lang/tuareg-mode.el/Makefile 2 Jan 2006 02:10:25 -0000 1.4
+++ ports/lang/tuareg-mode.el/Makefile 2 Apr 2006 19:38:45 -0000
@@ -13,6 +13,7 @@
MAINTAINER= dd@FreeBSD.org
COMMENT= Emacs major mode for editing Caml code
+USE_EMACS= yes
EMACS_PORT_NAME?= emacs20
DOC_FILES= README HISTORY append-tuareg.el custom-tuareg.el
Index: ports/mail/rmime/Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/rmime/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/mail/rmime/Makefile 2 Jan 2006 02:10:25 -0000 1.4
+++ ports/mail/rmime/Makefile 2 Apr 2006 19:38:45 -0000
@@ -19,6 +19,7 @@
MAINTAINER= dd@FreeBSD.org
COMMENT= Decode MIME messages inside Emacs (works with RMAIL, VM, and mh-e)
+USE_EMACS= yes
EMACS_PORT_NAME?= emacs20
RUN_DEPENDS= metamail:${PORTSDIR}/mail/metamail
Index: ports/math/proofgeneral/Makefile
===================================================================
RCS file: /home/pcvs/ports/math/proofgeneral/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- ports/math/proofgeneral/Makefile 28 Oct 2005 06:34:44 -0000 1.3
+++ ports/math/proofgeneral/Makefile 2 Apr 2006 19:38:45 -0000
@@ -51,6 +51,7 @@
.include "${PORTSDIR}/Mk/bsd.emacs.mk"
MAKE_ARGS+= EMACS_NAME=${EMACS_NAME} EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
+USE_EMACS= yes
USE_GMAKE= yes
USE_PERL5= yes
USE_REINPLACE= yes
Index: ports/textproc/tdtd.el/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/tdtd.el/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- ports/textproc/tdtd.el/Makefile 16 Dec 2005 07:04:43 -0000 1.4
+++ ports/textproc/tdtd.el/Makefile 2 Apr 2006 19:38:45 -0000
@@ -15,6 +15,7 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= An emacs major mode for editing SGML and XML DTDs
+USE_EMACS= yes
EMACS_PORT_NAME?= emacs20
EMACS_NO_BUILD_DEPENDS= YES
Index: ports/textproc/uim-el/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/uim-el/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- ports/textproc/uim-el/Makefile 7 Mar 2006 08:27:43 -0000 1.5
+++ ports/textproc/uim-el/Makefile 2 Apr 2006 19:38:45 -0000
@@ -23,6 +23,7 @@
USE_PERL5_BUILD=yes
USE_GMAKE= yes
USE_ICONV= yes
+USE_EMACS= yes
GNU_CONFIGURE= yes
EMACS_PORT_NAME?= emacs21
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604022042.k32KgPI2082361>