- Fix 100% CPU problem. See

  http://sourceforge.net/mailarchive/message.php?msg_id=36769016
- Get ready for -emacs22 port
- update my mail address

Submitted by:	m.boyarov@bsd.by (Max N. Boyarov)
Approved by:	itetcu (mentor)
Obtained from:	cedet CVS

3 files changed, 67 insertions, 3 deletions

diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index 7f9871c9b4d7..8f93a8e8017b 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	cedet
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 DISTNAME=	${PORTNAME}-1.0pre3
 
-MAINTAINER=	dryice@dryice.name
+MAINTAINER?=	dryice@FreeBSD.org
 COMMENT=	Collection of Emacs Development Environment Tools
 
 PORTCLASS=	master
@@ -36,6 +36,13 @@ 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
+
 do-install:
 	${MKDIR} ${CEDET_LISPDIR}
 
@@ -92,10 +99,21 @@ do-install:
 
 # speedbar
 	${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
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/devel/cedet/files/semantic-idle.fix.emacs22.diff b/devel/cedet/files/semantic-idle.fix.emacs22.diff
new file mode 100644
index 000000000000..5d38332d5a6f
--- /dev/null
+++ b/devel/cedet/files/semantic-idle.fix.emacs22.diff
@@ -0,0 +1,46 @@
+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 5ad00e95bb43..30d4aec99ace 100644
--- a/devel/cedet/pkg-plist
+++ b/devel/cedet/pkg-plist
@@ -342,8 +342,8 @@ 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
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.el
-%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.elc
+%%EMACS22_HAVE%%%%EMACS_VERSION_SITE_LISPDIR%%/cedet/speedbar/speedbar.el
+%%EMACS22_HAVE%%%%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