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
---
 japanese/ddskk/Makefile          | 4 ++--
 japanese/egg-canna/Makefile      | 6 +++++-
 japanese/lookup/Makefile         | 2 +-
 japanese/migemo-emacs21/Makefile | 2 +-
 japanese/migemo-emacs22/Makefile | 2 +-
 japanese/navi2ch/Makefile        | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'japanese')

diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index af658e869c6a..72102a562093 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ddskk
 PORTVERSION=	13.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/maintrunk/ \
 		ftp://ftp.ring.gr.jp/pub/elisp/skk/maintrunk/ \
@@ -22,7 +22,7 @@ USE_EMACS=      yes
 .include <bsd.port.pre.mk>
 
 .if defined(EMACS_PORT_NAME)
-.if (${EMACS_PORT_NAME} == "emacs22")
+.if (${EMACS_PORT_NAME} == "emacs23")
 DEPPORT_SUFFIX=
 .else
 DEPPORT_SUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/egg-canna/Makefile b/japanese/egg-canna/Makefile
index f04b355f6fc0..a747b0624d5e 100644
--- a/japanese/egg-canna/Makefile
+++ b/japanese/egg-canna/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	egg-canna
 PORTVERSION=	20011110
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	japanese editors elisp
 MASTER_SITES=	http://cgi18.plala.or.jp/nyy/canna/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
@@ -24,6 +24,10 @@ USE_EMACS=	yes
 
 .include <bsd.port.pre.mk>
 
+.if ${EMACS_PORT_NAME} == "emacs23"
+IGNORE=		does not build with Emacs 23
+.endif
+
 .if ${EMACS_PORT_NAME} == emacs20
 EMACS_SUFFIX=	${PKGNAMESUFFIX}
 .else
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index b947c7122ac3..930d60a53ccd 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lookup
 PORTVERSION=	1.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/lookup/dist/
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/japanese/migemo-emacs21/Makefile b/japanese/migemo-emacs21/Makefile
index 704ae5ac4356..98eab128c28f 100644
--- a/japanese/migemo-emacs21/Makefile
+++ b/japanese/migemo-emacs21/Makefile
@@ -13,7 +13,7 @@ PLIST=		${MASTERDIR}/pkg-plist
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
+EMACS_PORT_NAME=	emacs21
 BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME}
 RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel-${EMACS_PORT_NAME} \
 		migemo:${PORTSDIR}/japanese/migemo
diff --git a/japanese/migemo-emacs22/Makefile b/japanese/migemo-emacs22/Makefile
index 8d4208b36361..30ad0730e083 100644
--- a/japanese/migemo-emacs22/Makefile
+++ b/japanese/migemo-emacs22/Makefile
@@ -13,7 +13,7 @@ PLIST=		${MASTERDIR}/pkg-plist
 PKGMESSAGE=	${MASTERDIR}/pkg-message
 
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs22
+EMACS_PORT_NAME=	emacs22
 BUILD_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel
 RUN_DEPENDS=	${LOCALBASE}/${EMACS_LIBDIR_WITH_VER}/site-lisp/emu/emu.el:${PORTSDIR}/editors/apel \
 		migemo:${PORTSDIR}/japanese/migemo
diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile
index f2a2134d5789..ec5d3f831580 100644
--- a/japanese/navi2ch/Makefile
+++ b/japanese/navi2ch/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	navi2ch
 PORTVERSION=	1.8.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	japanese www elisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-- 
cgit v1.2.3