update to 1.0.pre4. Thanks to m.boyarov@bsd.by (Max N. Boyarov).

Submitted by:	m.boyarov@bsd.by (Max N. Boyarov)

7 files changed, 169 insertions, 117 deletions

diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index f2228e88556d..e3d7187714bd 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -6,28 +6,27 @@
 #
 
 PORTNAME=	cedet
-PORTVERSION=	1.0.pre3
-PORTREVISION=	3
+PORTVERSION=	1.0.p4
 CATEGORIES=	devel elisp
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://dryice.name/computer/FreeBSD/distfiles/
+				http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-1.0pre3
+DISTNAME=	${PORTNAME}-1.0pre4
 
 MAINTAINER?=	dryice@FreeBSD.org
 COMMENT=	Collection of Emacs Development Environment Tools
 
 PORTCLASS=	master
 USE_EMACS=	yes
-EMACS_PORT_NAME?=	emacs21
+EMACS_PORT_NAME?=	emacs22
 
 CEDET_LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
 INFO=		bovine cogre ede eieio grammar-fw semantic \
 		semantic-appdev semantic-langdev semantic-user \
-		wisent
-#		wisent speedbar
+		wisent speedbar-cedet
+
 SEMANTIC_ELISP_SUBDIRS=	bovine wisent
 SEMANTIC_INFOS=	bovine.info grammar-fw.info semantic-appdev.info \
 		semantic-langdev.info semantic-user.info semantic.info \
@@ -36,12 +35,15 @@ SEMANTIC_INFOS=	bovine.info grammar-fw.info semantic-appdev.info \
 USE_GMAKE=	yes
 CONFLICTS=	eieio* semantic* speedbar*
 
-.if (${EMACS_PORT_NAME} == "emacs22")
-EXTRA_PATCHES+=	${FILESDIR}/semantic-idle.fix.emacs22.diff
-PLIST_SUB+=	EMACS22_HAVE="@comment "
-.else
-PLIST_SUB+=	EMACS22_HAVE=""
-.endif
+pre-build:
+#cleanup info
+	${RM} -f ${WRKSRC}/ede/ede.info
+	${RM} -f ${WRKSRC}/speedbar/speedbar.info
+.for i in ${SEMANTIC_INFOS}
+	${RM} -f ${WRKSRC}/semantic/doc/${i}
+.endfor
+	${RM} -f ${WRKSRC}/cogre/cogre.info
+	${RM} -f ${WRKSRC}/eieio/eieio.info
 
 do-install:
 	${MKDIR} ${CEDET_LISPDIR}
@@ -68,9 +70,7 @@ do-install:
 .for i in *.el *.elc
 	${INSTALL_DATA} ${WRKSRC}/ede/${i} ${CEDET_LISPDIR}/ede
 .endfor
-.for i in *.info*
-	${INSTALL_DATA} ${WRKSRC}/ede/${i} ${PREFIX}/info
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/ede/ede.info ${PREFIX}/info
 
 # eieio
 	${MKDIR} ${CEDET_LISPDIR}/eieio
@@ -92,28 +92,25 @@ do-install:
 .endfor
 .endfor
 
-.for i in *.info*
+.for i in ${SEMANTIC_INFOS}
 	${INSTALL_DATA} ${WRKSRC}/semantic/doc/${i} ${PREFIX}/info
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/semantic/semanticdb.sh ${PREFIX}/bin
 
-# speedbar
+# speedbar (Emacs-22 have own but version oldes than req in cedet)
 	${MKDIR} ${CEDET_LISPDIR}/speedbar
 
-# emacs22 have own
-.if (${EMACS_PORT_NAME} == "emacs22")
-	${RM} -f ${WRKSRC}/speedbar/speedbar.el
-	${RM} -f ${WRKSRC}/speedbar/speedbar.elc
-.endif
-
 .for i in *.el *.elc *.xpm
 	${INSTALL_DATA} ${WRKSRC}/speedbar/${i} ${CEDET_LISPDIR}/speedbar
 .endfor
 
-# emacs22 have own
-.if (${EMACS_PORT_NAME} != "emacs22")
-	${INSTALL_DATA} ${WRKSRC}/speedbar/speedbar.info ${PREFIX}/info
-.endif
+	${INSTALL_DATA} ${WRKSRC}/speedbar/speedbar-cedet.info ${PREFIX}/info
+
+#contrib
+	${MKDIR} ${CEDET_LISPDIR}/contrib
+.for i in *.el *.elc
+	${INSTALL_DATA} ${WRKSRC}/contrib/${i} ${CEDET_LISPDIR}/contrib
+.endfor
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/cedet/distinfo b/devel/cedet/distinfo
index be14f6bccaa3..ca78cccca7c4 100644
--- a/devel/cedet/distinfo
+++ b/devel/cedet/distinfo
@@ -1,3 +1,3 @@
-MD5 (cedet-1.0pre3.tar.gz) = 2932fa2a8ab8fc63402ecb8194ca26b4
-SHA256 (cedet-1.0pre3.tar.gz) = e62dfd7ce6761ee1df1b5abb17ce0693ecc59dfcc18803f00e1c5ce1f4096c82
-SIZE (cedet-1.0pre3.tar.gz) = 1357388
+MD5 (cedet-1.0pre4.tar.gz) = fdc22624ae284166d9617acdc6ecbfda
+SHA256 (cedet-1.0pre4.tar.gz) = 9bead2d8e7e5f1ddb07b18674216c7ec85418fa29d14355c247de58666dc2c64
+SIZE (cedet-1.0pre4.tar.gz) = 1452946
diff --git a/devel/cedet/files/patch-info b/devel/cedet/files/patch-info
new file mode 100644
index 000000000000..33cbbe8f9315
--- /dev/null
+++ b/devel/cedet/files/patch-info
@@ -0,0 +1,102 @@
+--- ede/Makefile.orig	2007-09-06 01:48:40.000000000 +0300
++++ ede/Makefile	2007-09-06 01:48:54.000000000 +0300
+@@ -19,7 +19,7 @@
+ aux-lisp_LISP=autoconf-edit.el autoconf-compat.el
+ misc_AUX=NEWS README TODO ede-proj-skel.el ChangeLog
+ ede_info_TEXINFOS=ede.texi ede-projects.texi ede-targets.texi ede-sourcecode.texi ede-compilers.texi
+-MAKEINFO=makeinfo
++MAKEINFO=makeinfo --force --no-split
+ test_AUX=
+ VERSION=1.0pre4
+ DISTDIR=$(top)EDE-$(VERSION)
+--- speedbar/Makefile.orig	2007-09-06 01:31:01.000000000 +0300
++++ speedbar/Makefile	2007-09-06 01:33:18.000000000 +0300
+@@ -17,7 +17,7 @@
+ EMACS=emacs
+ speedbar_LISP=dframe.el speedbar.el
+ info_TEXINFOS=speedbar.texi
+-MAKEINFO=makeinfo
++MAKEINFO=makeinfo --force --no-split
+ opt_LISP=rpm.el sb-gud.el sb-info.el sb-rmail.el sb-w3.el sb-texinfo.el bigclock.el sb-html.el sb-ant.el
+ aux_AUX=INSTALL ChangeLog
+ images_MISC=sb-dir-plus.xpm sb-dir-minus.xpm sb-dir.xpm sb-pg-plus.xpm sb-pg-minus.xpm sb-pg.xpm sb-mail.xpm sb-tag-plus.xpm sb-tag-minus.xpm sb-tag.xpm sb-tag-gt.xpm sb-tag-v.xpm sb-tag-type.xpm sb-image.el sb-obj.xpm sb-chk.xpm sb-objod.xpm sb-label.xpm sb-ro.xpm sb-doc.xpm sb-info.xpm sb-doc-plus.xpm sb-doc-minus.xpm sb-box.xpm sb-box-plus.xpm sb-box-minus.xpm
+@@ -26,7 +26,7 @@
+ 
+ 
+ 
+-all: autoloads init speedbar speedbar.info
++all: autoloads init speedbar speedbar-cedet.info
+ 
+ .PHONY: autoloads
+ autoloads: 
+@@ -55,7 +55,7 @@
+ 	@echo "(setq debug-on-error t)" >> $@-compile-script
+ 	"$(EMACS)" -batch --no-site-file -l $@-compile-script -f batch-byte-compile $^
+ 
+-speedbar.info: $(info_TEXINFOS)
++speedbar-cedet.info: $(info_TEXINFOS)
+ 	$(MAKEINFO) $<
+ 
+ .PHONY: opt
+@@ -78,9 +78,9 @@
+ 
+ .PHONY: dist
+ 
+-dist: autoloads speedbar.info
++dist: autoloads speedbar-cedet.info
+ 	mkdir $(DISTDIR)
+-	cp speedbar-loaddefs.el $(init_LISP) $(speedbar_LISP) $(info_TEXINFOS) speedbar.info* $(opt_LISP) $(aux_AUX) $(images_MISC) $(ede_FILES) $(DISTDIR)
++	cp speedbar-loaddefs.el $(init_LISP) $(speedbar_LISP) $(info_TEXINFOS) speedbar-cedet.info* $(opt_LISP) $(aux_AUX) $(images_MISC) $(ede_FILES) $(DISTDIR)
+ 
+ Makefile: Project.ede
+ 	@echo Makefile is out of date!  It needs to be regenerated by EDE.
+diff -u speedbar/speedbar.texi.orig speedbar/speedbar.texi
+--- speedbar/speedbar.texi.orig	2007-09-06 03:05:54.000000000 +0300
++++ speedbar/speedbar.texi	2007-09-06 03:09:15.000000000 +0300
+@@ -20,12 +20,12 @@
+ @c Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ @c Boston, MA 02110-1301, USA.
+ 
+-@setfilename speedbar.info
+-@settitle Speedbar: File/Tag summarizing utility
++@setfilename speedbar-cedet.info
++@settitle Speedbar: File/Tag summarizing utility (cedet version)
+ 
+ @dircategory Emacs
+ @direntry
+-* Speedbar: (speedbar).        File/Tag summarizing utility.
++* Speedbar-cedet: (speedbar-cedet). File/Tag summarizing utility.
+ @end direntry
+ @ifnottex
+ Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+@@ -51,14 +51,9 @@
+ @end quotation
+ @end ifnottex
+ 
+-@dircategory Emacs
+-@direntry
+-* Speedbar: (speedbar). File/Tag summarizing utility.
+-@end direntry
+-
+ @titlepage
+ @sp 10
+-@center @titlefont{Speedbar}
++@center @titlefont{Speedbar-cedet}
+ @sp 2
+ @center Eric Ludlam
+ @vskip 0pt plus 1 fill
+
+Diff finished.  Thu Sep  6 03:09:28 2007
+--- semantic/doc/Makefile.orig	2007-09-06 03:20:16.000000000 +0300
++++ semantic/doc/Makefile	2007-09-06 03:20:39.000000000 +0300
+@@ -11,7 +11,7 @@
+ 
+ images_MISC=grammar-fw-ov.png grammar-fw-ov.txt
+ semantic-grammar_TEXINFOS=grammar-fw.texi
+-MAKEINFO=makeinfo
++MAKEINFO=makeinfo --force --no-split
+ Documentation_TEXINFOS=semantic.texi glossary.texi overview.texi installation.texi fdl.texi internals.texi semanticheader.texi
+ semantic-user_info_TEXINFOS=user-guide.texi minor-modes.texi
+ semantic-appdev_info_TEXINFOS=app-dev-guide.texi tags.texi
+
+Diff finished.  Thu Sep  6 03:20:56 2007
diff --git a/devel/cedet/files/patch-semantic-semantic-ede-grammar.el b/devel/cedet/files/patch-semantic-semantic-ede-grammar.el
deleted file mode 100644
index 2293d1015daf..000000000000
--- a/devel/cedet/files/patch-semantic-semantic-ede-grammar.el
+++ /dev/null
@@ -1,23 +0,0 @@
---- semantic/semantic-ede-grammar.el.orig	Mon Nov 13 11:46:53 2006
-+++ semantic/semantic-ede-grammar.el	Mon Nov 13 11:47:29 2006
-@@ -191,15 +191,15 @@
- (autoload 'ede-proj-target-elisp "semantic-ede-proj-target-grammar"
-   "Target class for Emacs/Semantic grammar files." nil nil)
- 
-+(ede-proj-register-target "semantic grammar"
-+			  semantic-ede-proj-target-grammar)
-+
-+(provide 'semantic-ede-grammar)
-+
- ;;;###autoload
- (eval-after-load "ede-proj"
-     (quote
-      (require 'semantic-ede-grammar)
-      ))
--
--(ede-proj-register-target "semantic grammar"
--			  semantic-ede-proj-target-grammar)
--
--(provide 'semantic-ede-grammar)
- 
- ;;; semantic-ede-grammar.el ends here
diff --git a/devel/cedet/files/patch-speedbar-sb-info.el b/devel/cedet/files/patch-speedbar-sb-info.el
deleted file mode 100644
index 87c310abcd3f..000000000000
--- a/devel/cedet/files/patch-speedbar-sb-info.el
+++ /dev/null
@@ -1,14 +0,0 @@
---- speedbar/sb-info.el.orig	Mon Nov 13 11:30:08 2006
-+++ speedbar/sb-info.el	Mon Nov 13 11:30:38 2006
-@@ -247,9 +247,10 @@
-   (Info-speedbar-hierarchy-buttons nil 0)
-   )
- 
-+(provide 'sb-info)
-+
- ;;; Overriding preinstalled code.
- ;;;###autoload
- (eval-after-load "info" '(require 'sb-info))
- 
--(provide 'sb-info)
- ;;; sb-info.el ends here
diff --git a/devel/cedet/files/semantic-idle.fix.emacs22.diff b/devel/cedet/files/semantic-idle.fix.emacs22.diff
deleted file mode 100644
index 5d38332d5a6f..000000000000
--- a/devel/cedet/files/semantic-idle.fix.emacs22.diff
+++ /dev/null
@@ -1,46 +0,0 @@
-Index: semantic-idle.el
-===================================================================
-RCS file: /cvsroot/cedet/cedet/semantic/semantic-idle.el,v
-retrieving revision 1.33
-retrieving revision 1.35
-diff -u -r1.33 -r1.35
---- semantic/semantic-idle.el	30 Jun 2005 01:31:20 -0000	1.33
-+++ semantic/semantic-idle.el	12 Sep 2006 01:16:12 -0000	1.35
-@@ -1,10 +1,10 @@
- ;;; semantic-idle.el --- Schedule parsing tasks in idle time
- 
--;;; Copyright (C) 2003, 2004, 2005 Eric M. Ludlam
-+;;; Copyright (C) 2003, 2004, 2005, 2006 Eric M. Ludlam
- 
- ;; Author: Eric M. Ludlam <zappo@gnu.org>
- ;; Keywords: syntax
--;; X-RCS: $Id: semantic-idle.el,v 1.33 2005/06/30 01:31:20 zappo Exp $
-+;; X-RCS: $Id: semantic-idle.el,v 1.35 2006/09/12 01:16:12 zappo Exp $
- 
- ;; This file is not part of GNU Emacs.
- 
-@@ -20,8 +20,8 @@
- 
- ;; You should have received a copy of the GNU General Public License
- ;; along with GNU Emacs; see the file COPYING.  If not, write to the
--;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--;; Boston, MA 02111-1307, USA.
-+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+;; Boston, MA 02110-1301, USA.
- 
- ;;; Commentary:
- ;;
-@@ -286,12 +286,9 @@
-   (when (zerop (recursion-depth))
-     (unwind-protect
-         (semantic-safe "idle error: %S"
--          ;; Disable the auto parse timer while re-parsing
--          (semantic-idle-scheduler-kill-timer)
-           ;; Handle re-parsing and other scheduled services
-           (save-match-data (semantic-idle-core-handler)))
--      ;; Enable again the auto parse timer
--      (semantic-idle-scheduler-setup-timer))))
-+      )))
- 
- ;;; REPARSING
- ;;
diff --git a/devel/cedet/pkg-plist b/devel/cedet/pkg-plist
index 30d4aec99ace..ba9e57ad37df 100644
--- a/devel/cedet/pkg-plist
+++ b/devel/cedet/pkg-plist
@@ -22,6 +22,8 @@ bin/semanticdb.sh
 %%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-files.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-files.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
@@ -68,6 +70,23 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/sformat.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/working.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/working.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/cedet-contrib-load.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/cedet-contrib-load.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/cedet-contrib.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/cedet-contrib.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/contrib-loaddefs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/semantic-tag-folding.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/semantic-tag-folding.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/semanticdb-javascript.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/semanticdb-javascript.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-csharp-wy.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-csharp-wy.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-csharp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-csharp.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-javascript-jv-wy.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-javascript-jv-wy.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-javascript.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib/wisent-javascript.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-compat.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-compat.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-edit.el
@@ -104,6 +123,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-proj-skel.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-proj.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-proj.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-simple.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-simple.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-source.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-source.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-speedbar.el
@@ -135,8 +156,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-opt.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-speedbar.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-speedbar.elc
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-tests.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-test-methodinvoke.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-tests.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/linemark.el
@@ -180,6 +201,10 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/document-vars.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/document.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/document.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-adebug-eieio.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-adebug-eieio.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-adebug.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-adebug.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-analyze.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-analyze.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ast.el
@@ -198,6 +223,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-decorate-mode.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-decorate.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-decorate.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-dep.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-dep.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-doc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-doc.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-ede-grammar.el
@@ -224,11 +251,15 @@ bin/semanticdb.sh
 %%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-spp.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-lex-spp.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-lex.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-lex.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-load.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-load.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-loaddefs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-mru-bookmark.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-mru-bookmark.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-regtest.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-regtest.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-sb.el
@@ -243,12 +274,16 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-tag.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-texi.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-texi.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-utest.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-utest.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-util-modes.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-util-modes.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-util.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-util.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-ebrowse.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-ebrowse.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-el.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-el.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-file.el
@@ -342,14 +377,15 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar-load.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar-load.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar-loaddefs.el
-%%EMACS22_HAVE%%%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.el
-%%EMACS22_HAVE%%%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.elc
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/wisent
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede
+@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/contrib
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/icons
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common
 @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/cedet/cogre