- Update to version 1.1

5 files changed, 42 insertions, 14 deletions

diff --git a/devel/cedet/Makefile b/devel/cedet/Makefile
index 6a897abbae5e..e3be568d656b 100644
--- a/devel/cedet/Makefile
+++ b/devel/cedet/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	cedet
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTVERSION=	1.1
 CATEGORIES=	devel elisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
diff --git a/devel/cedet/distinfo b/devel/cedet/distinfo
index 433ba367e240..5400e31bf319 100644
--- a/devel/cedet/distinfo
+++ b/devel/cedet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cedet-1.0.1.tar.gz) = 8b651232f9a1c79cdddce9d0933c22a9240115272f2b395395c4f026151f96f4
-SIZE (cedet-1.0.1.tar.gz) = 2101932
+SHA256 (cedet-1.1.tar.gz) = 42c0650fa1d0c9a428d186b421f0057294bcfaec09c8b7bb4a0128ce2fe54b5c
+SIZE (cedet-1.1.tar.gz) = 2234539
diff --git a/devel/cedet/files/patch-ede-Makefile b/devel/cedet/files/patch-ede-Makefile
index 6faf32eb46e7..689ea9477fad 100644
--- a/devel/cedet/files/patch-ede-Makefile
+++ b/devel/cedet/files/patch-ede-Makefile
@@ -1,12 +1,12 @@
---- ede/Makefile.orig	2011-07-30 10:58:27.000000000 +0200
-+++ ede/Makefile	2011-07-30 11:00:33.000000000 +0200
+--- ede/Makefile.orig	2012-04-29 11:09:32.000000000 +0200
++++ ede/Makefile	2012-04-29 11:10:22.000000000 +0200
 @@ -23,13 +23,13 @@
- 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
+ misc_AUX=README 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
- VERSION=1.0
+ VERSION=1.1
  DISTDIR=$(top)EDE-$(VERSION)
  
  
diff --git a/devel/cedet/files/patch-eieio-Makefile b/devel/cedet/files/patch-eieio-Makefile
index 01297222dc1c..5ebcbfd0159e 100644
--- a/devel/cedet/files/patch-eieio-Makefile
+++ b/devel/cedet/files/patch-eieio-Makefile
@@ -1,14 +1,14 @@
---- eieio/Makefile.orig	2011-07-30 11:01:42.000000000 +0200
-+++ eieio/Makefile	2011-07-30 11:03:02.000000000 +0200
+--- eieio/Makefile.orig	2012-04-29 11:12:37.000000000 +0200
++++ eieio/Makefile	2012-04-29 11:13:46.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 eieio-test-mro.el
+ test_LISP=eieio-tests.el eieio-test-methodinvoke.el eieio-perftest.el eieio-test-mro.el eieio-test-persist.el
  Misc_MISC=INSTALL ChangeLog NEWS
- VERSION=1.3
+ VERSION=1.4
 @@ -27,7 +27,7 @@
  
  
diff --git a/devel/cedet/pkg-plist b/devel/cedet/pkg-plist
index 15ae941353bc..42717d7f777c 100644
--- a/devel/cedet/pkg-plist
+++ b/devel/cedet/pkg-plist
@@ -30,6 +30,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/cogre/wisent-dot-wy.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/cogre/wisent-dot.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/cogre/wisent-dot.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-android.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-android.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-autogen.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-autogen.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-compat.el
@@ -46,9 +48,13 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-graphviz.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-idutils.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-idutils.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-java.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-java.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
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-m3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-m3.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-utests.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet-utests.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/common/cedet.el
@@ -125,6 +131,10 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-compat.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-edit.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/autoconf-edit.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-android.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-android.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-arduino.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-arduino.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-auto.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-auto.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-base.el
@@ -148,6 +158,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-linux.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-locate.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-locate.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-m3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-m3.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-make.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-make.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-pconf.el
@@ -179,8 +191,6 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-proj.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-shell.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/ede/ede-shell.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
@@ -219,6 +229,7 @@ bin/semanticdb.sh
 %%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-test-persist.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
@@ -238,12 +249,18 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-c-by.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-c.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-c.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-clang.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-clang.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-el.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-el.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-erlang-by.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-erlang-by.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-erlang.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-erlang.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-f90-by.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-f90-by.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-f90.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-f90.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-gcc.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-gcc.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/bovine/semantic-java.el
@@ -299,6 +316,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-example.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-find.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-find.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-fmt-utest.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-fmt-utest.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-format.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-format.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-fw.el
@@ -326,6 +345,8 @@ bin/semanticdb.sh
 %%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-m3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semantic-m3.elc
 %%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
@@ -370,6 +391,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-find.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-global.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-global.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-javap.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-javap.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-javascript.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-javascript.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/semantic/semanticdb-mk.el
@@ -469,6 +492,8 @@ bin/semanticdb.sh
 %%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
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-android.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-android.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-args.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-args.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-compile.el
@@ -504,6 +529,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-load.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-load.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-loaddefs.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-m3.el
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-m3.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-map.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-map.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-mode.el
@@ -528,6 +555,8 @@ bin/semanticdb.sh
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode-test.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode.el
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/srecode.elc
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/templates/android-java.srt
+%%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/templates/arduino-pde.srt
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/templates/default.srt
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/templates/document-default.srt
 %%EMACS_VERSION_SITE_LISPDIR%%/cedet/srecode/templates/proj-test.srt