From 3cb246682f28b75689c85870b686a29b45b6b32f Mon Sep 17 00:00:00 2001
From: Boris Samorodov <bsam@FreeBSD.org>
Date: Sun, 20 Dec 2009 20:19:24 +0000
Subject: Changes to editors/emacs and Mk/bsd.emacs.mk were taken from
 PR/137956 by Ashish SHUKLA (thanks!).  [1]

Those ports which define EMACS_PORT_NAME to be "emacs21" were
not touched (this time). They may be converted to the new
world order by removing the above mentioned assignment.

Four ports were marked as BROKEN with EMACS_PORT_NAME=emacs23
(they do not compile):
. lang/bigloo;
. mail/wanderlust;
. mail/wanderlust-devel;
. www/emacs-w3m.

Three ports were marked as IGNORE with EMACS_PORT_NAME=emacs23:
. japanese/egg-canna (the port version is dated as of 2001,
  does not compile with Emacs 23 and seems it cannot be fixed);
. deskutils/remember.el (was incorporated into Emacs 23);
. editors/nxml (was incorporated into Emacs 23).

Changes that were made after (and as a result of) exp run. For
those ports:
. japanese/migemo-emacs21;
. japanese/migemo-emacs22
EMACS_PORT_NAME?= was changed to EMACS_PORT_NAME= to the apropriate
emacs port name.

PR:		ports/137956 [1], ports/141369 [2]
Submitted by:	Ashish SHUKLA <wahjava at gmail.com>  [1],
		bsam (me)  [2]
Exp-run by: miwi
---
 Mk/bsd.emacs.mk | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

(limited to 'Mk/bsd.emacs.mk')

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index c076204fe4e3..e5001f13e54a 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -1,5 +1,5 @@
 #
-#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.81 2009-06-23 15:05:31 pgollucci Exp $
+#	$FreeBSD: /tmp/pcvs/ports/Mk/bsd.emacs.mk,v 1.82 2009-12-20 20:19:14 bsam Exp $
 #
 #	bsd.emacs.mk - 19990829 Shigeyuki Fukushima.
 #
@@ -7,7 +7,7 @@
 Emacs_Include=			bsd.emacs.mk
 Emacs_Include_MAINTAINER=	ports@FreeBSD.org
 
-EMACS_PORT_NAME?=	emacs22
+EMACS_PORT_NAME?=	emacs23
 
 #
 # This file for ports which depend on emacs family.
@@ -87,6 +87,23 @@ EMACS_VER=		22.3
 EMACS_MAJOR_VER=	22
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
+EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs22
+EMACS_COMMON_PORT=	NO
+EMACS_HAS_MULE=		YES
+EMACS_NO_SUBDIRSEL=	NO
+.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
+COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
+DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
+PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
+.endif
+
+# Emacs-23.x
+.elif (${EMACS_PORT_NAME} == "emacs23")
+EMACS_NAME=		emacs
+EMACS_VER=		23.1
+EMACS_MAJOR_VER=	23
+EMACS_LIBDIR?=		share/${EMACS_NAME}
+EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
 EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
 EMACS_COMMON_PORT=	NO
 EMACS_HAS_MULE=		YES
@@ -191,7 +208,7 @@ PLIST?=                 ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 check-makevars::
 	@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
 	@${ECHO} "Valid values are:"
-	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs-devel"
+	@${ECHO} "	Emacs  family: emacs21 emacs22 emacs23 emacs-devel"
 	@${ECHO} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
 	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}
-- 
cgit v1.2.3