- Update to 1.0.b2.b

- Register conflicts with eieio, semantic, and speedbar

PR:		ports/67728
Submitted by:	maintainer

3 files changed, 13 insertions, 8 deletions

diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index f372009..53b7dfa 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cedet
-PORTVERSION=	1.0.b1.c
+PORTVERSION=	1.0.b2.b
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	cedet
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/beta/:S/.c/c/}
+DISTNAME=	${PORTNAME}-1.0beta2b
 
 MAINTAINER=	dryice@liu.com.cn
 COMMENT=	Collection of Emacs Development Environment Tools
@@ -23,6 +23,7 @@ INFO=		cogre ede eieio semantic speedbar
 SEMANTIC_ELISP_SUBDIRS=	bovine wisent
 
 USE_GMAKE=	yes
+CONFLICTS=	eieio* semantic* speedbar*
 
 do-install:
 	${MKDIR} ${CEDET_LISPDIR}
diff --git a/devel/cedet/distinfo b/devel/cedet/distinfo
index e736e01..309b9d8 100644
--- a/devel/cedet/distinfo
+++ b/devel/cedet/distinfo
@@ -1,2 +1,2 @@
-MD5 (cedet-1.0beta1c.tar.gz) = 720e627f15922cab14ee79fd34e0d81d
-SIZE (cedet-1.0beta1c.tar.gz) = 1047291
+MD5 (cedet-1.0beta2b.tar.gz) = f99691f093ec9dad732cbe7d9625cdd3
+SIZE (cedet-1.0beta2b.tar.gz) = 1249567
diff --git a/devel/cedet/pkg-plist b/devel/cedet/pkg-plist
index dc50af3..fb1a863 100644
--- a/devel/cedet/pkg-plist
+++ b/devel/cedet/pkg-plist
@@ -20,6 +20,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-autogen.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-compat.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-compat.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-edebug.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-edebug.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-load.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-load.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-loaddefs.el
@@ -205,10 +207,14 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-grammar-wy.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-grammar.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-grammar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-html.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-html.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ia-sb.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ia-sb.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ia.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ia.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-idle.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-idle.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-imenu.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-imenu.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-lex.el
@@ -254,10 +260,10 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/senator.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/bison-wisent.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/bison-wisent.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/semantic-wisent.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/semantic-wisent.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-awk-wy.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-awk-wy.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-bovine.el
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-bovine.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-calc-wy.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-calc-wy.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-calc.el
@@ -274,8 +280,6 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-grammar-macros.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-grammar.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-grammar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-java-lex.el
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-java-lex.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-java-tags-wy.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-java-tags-wy.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent/wisent-java-tags.el