7 files changed, 26 insertions, 22 deletions

diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index 239004efb781..37edcbfbf6e9 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -6,12 +6,10 @@
 #
 
 PORTNAME=	cedet
-PORTVERSION=	1.0.p7
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	devel elisp
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0pre7
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
-DISTNAME=	${PORTNAME}-1.0pre7
 
 MAINTAINER=	mva@FreeBSD.org
 COMMENT=	Collection of Emacs Development Environment Tools
diff --git a/devel/cedet/distinfo b/devel/cedet/distinfo
index bb872c9b6d6c..9869004008be 100644
--- a/devel/cedet/distinfo
+++ b/devel/cedet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cedet-1.0pre7.tar.gz) = 63392bea5b8e573e6cdf5cc7e43d76f931a35d7596718527ab5b598ca905991e
-SIZE (cedet-1.0pre7.tar.gz) = 2052276
+SHA256 (cedet-1.0.tar.gz) = f0d5c76d22a8d7dceaccb659be094c44cb999eae75db3545eef086d8dcd342f4
+SIZE (cedet-1.0.tar.gz) = 2100938
diff --git a/devel/cedet/files/patch-ede-Makefile b/devel/cedet/files/patch-ede-Makefile
index 193655e32f39..6faf32eb46e7 100644
--- a/devel/cedet/files/patch-ede-Makefile
+++ b/devel/cedet/files/patch-ede-Makefile
@@ -1,12 +1,12 @@
---- ede/Makefile.orig	2010-05-17 08:36:43.000000000 +0200
-+++ ede/Makefile	2010-05-17 08:38:03.000000000 +0200
+--- ede/Makefile.orig	2011-07-30 10:58:27.000000000 +0200
++++ ede/Makefile	2011-07-30 11:00:33.000000000 +0200
 @@ -23,13 +23,13 @@
- projects_LISP=project-am.el ede-simple.el ede-cpp-root.el ede-emacs.el ede-linux.el
+ projects_LISP=project-am.el ede-simple.el ede-cpp-root.el ede-emacs.el ede-linux.el ede-generic.el
  aux-lisp_LISP=autoconf-edit.el autoconf-compat.el makefile-edit.el
  ede_info_TEXINFOS=ede.texi ede-projects.texi ede-targets.texi ede-sourcecode.texi ede-compilers.texi
 -MAKEINFO=makeinfo
 +MAKEINFO=makeinfo --force --no-split
- VERSION=1.0pre7
+ VERSION=1.0
  DISTDIR=$(top)EDE-$(VERSION)
  
  
diff --git a/devel/cedet/files/patch-eieio-Makefile b/devel/cedet/files/patch-eieio-Makefile
index 1ff461ec0aa2..01297222dc1c 100644
--- a/devel/cedet/files/patch-eieio-Makefile
+++ b/devel/cedet/files/patch-eieio-Makefile
@@ -1,15 +1,15 @@
---- eieio/Makefile.orig	2010-05-17 19:24:01.000000000 +0200
-+++ eieio/Makefile	2010-05-17 19:25:02.000000000 +0200
-@@ -22,7 +22,7 @@
+--- eieio/Makefile.orig	2011-07-30 11:01:42.000000000 +0200
++++ eieio/Makefile	2011-07-30 11:03:02.000000000 +0200
+@@ -19,7 +19,7 @@
  ELISPPRELOAD= cedet-compat
  examples_LISP=chart.el eieio-speedbar.el linemark.el lmcompile.el
  eieio_info_TEXINFOS=eieio.texi
 -MAKEINFO=makeinfo
 +MAKEINFO=makeinfo --force --no-split
- test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el
+ test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el eieio-test-mro.el
  Misc_MISC=INSTALL ChangeLog NEWS
- VERSION=1.2
-@@ -30,7 +30,7 @@
+ VERSION=1.3
+@@ -27,7 +27,7 @@
  
  
  
@@ -18,7 +18,7 @@
  
  .PHONY: autoloads
  autoloads: 
-@@ -74,7 +74,7 @@
+@@ -71,7 +71,7 @@
  	@echo "(setq debug-on-error t)" >> $@-compile-script
  	"$(EMACS)" $(EMACSFLAGS) -l $@-compile-script -f batch-byte-compile $^
  
@@ -27,7 +27,7 @@
  	$(MAKEINFO) $<
  
  .PHONY: test
-@@ -97,9 +97,9 @@
+@@ -94,9 +94,9 @@
  
  .PHONY: dist
  
diff --git a/devel/cedet/files/patch-semantic-doc-semantic.info b/devel/cedet/files/patch-semantic-doc-semantic.info
index ffb9cbe09b82..b47358ddc982 100644
--- a/devel/cedet/files/patch-semantic-doc-semantic.info
+++ b/devel/cedet/files/patch-semantic-doc-semantic.info
@@ -1,5 +1,5 @@
---- semantic/doc/semantic.texi.orig	2010-05-17 19:00:23.000000000 +0200
-+++ semantic/doc/semantic.texi	2010-05-17 19:01:54.000000000 +0200
+--- semantic/doc/semantic.texi.orig	2011-07-30 11:05:10.000000000 +0200
++++ semantic/doc/semantic.texi	2011-07-30 11:05:54.000000000 +0200
 @@ -1,7 +1,7 @@
  \input texinfo  @c -*-texinfo-*-
  @c %**start of header
@@ -14,8 +14,8 @@
  @ifinfo
  @dircategory Emacs
  @direntry
--* Semantic: (semantic).	Infrastructure for parser based text analysis.
-+* Semantic-cedet: (semantic).	Infrastructure for parser based text analysis.
+-* Semantic: (semantic). Infrastructure for parser based text analysis.
++* Semantic-cedet: (semantic). Infrastructure for parser based text analysis.
  @end direntry
  @end ifinfo
  
diff --git a/devel/cedet/pkg-plist b/devel/cedet/pkg-plist
index 4902f8fc578c..15ae941353bc 100644
--- a/devel/cedet/pkg-plist
+++ b/devel/cedet/pkg-plist
@@ -139,6 +139,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-dired.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-files.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-files.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-generic.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-generic.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-load.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-load.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-loaddefs.el
@@ -216,6 +218,7 @@ bin/semanticdb.sh
 %%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-test-methodinvoke.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/eieio/eieio-test-mro.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
@@ -353,6 +356,8 @@ bin/semanticdb.sh
 %%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-cscope.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-cscope.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-debug.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-debug.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-ebrowse.el
diff --git a/devel/ecb/Makefile b/devel/ecb/Makefile
index 99dda440d976..e000efa4caee 100644
--- a/devel/ecb/Makefile
+++ b/devel/ecb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ecb
 PORTVERSION=	2.40
+PORTREVISION=	1
 CATEGORIES=	devel elisp
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/${PORTNAME:U}%20${PORTVERSION}