- Camaelon and WildMenus have beenn moved out into seperate ports

Approved by:	maintainer

6 files changed, 6 insertions, 26 deletions

diff --git a/deskutils/etoile-dictionaryreader/Makefile b/deskutils/etoile-dictionaryreader/Makefile
index 8c9cacd5cbaa..817721159b1f 100644
--- a/deskutils/etoile-dictionaryreader/Makefile
+++ b/deskutils/etoile-dictionaryreader/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etoile
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://florida.ethz.ch/ports/distfiles/
 DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
@@ -23,6 +24,6 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
-USE_GNUSTEP_MAKE_DIRS=	Bundles/Camaelon Bundles/WildMenus Services/User/DictionaryReader
+USE_GNUSTEP_MAKE_DIRS+=	Services/User/DictionaryReader
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile-dictionaryreader/pkg-descr b/deskutils/etoile-dictionaryreader/pkg-descr
index f45b40c0435f..522b3419afd1 100644
--- a/deskutils/etoile-dictionaryreader/pkg-descr
+++ b/deskutils/etoile-dictionaryreader/pkg-descr
@@ -5,7 +5,6 @@ workflow by reshaping or recombining provided Services (aka Applications),
 Components etc. Flexibility and modularity on both User Interface and code
 level should allow us to scale from PDA to computer environment.
 
-Currently this package only installs Camaelon, DictionaryReader and
-WildMenus.
+Currently this package only installs DictionaryReader.
 
 WWW: http://www.etoile-project.org/
diff --git a/deskutils/etoile-dictionaryreader/pkg-plist b/deskutils/etoile-dictionaryreader/pkg-plist
index 483430b343d8..cb00fdb88f10 100644
--- a/deskutils/etoile-dictionaryreader/pkg-plist
+++ b/deskutils/etoile-dictionaryreader/pkg-plist
@@ -12,16 +12,6 @@ Local/Applications/DictionaryReader.app/Resources/jargon.dict
 Local/Applications/DictionaryReader.app/Resources/jargon.index
 Local/Applications/DictionaryReader.app/library_paths.openapp
 Local/Applications/DictionaryReader.app/stamp.make
-Local/Library/Bundles/WildMenus.themeEngine/Resources/Info-gnustep.plist
-Local/Library/Bundles/WildMenus.themeEngine/WildMenus
-Local/Library/Bundles/WildMenus.themeEngine/stamp.make
-System/Library/Bundles/Camaelon.themeEngine/Camaelon
-System/Library/Bundles/Camaelon.themeEngine/Resources/Info-gnustep.plist
-System/Library/Bundles/Camaelon.themeEngine/stamp.make
-@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources
-@dirrm System/Library/Bundles/Camaelon.themeEngine
-@dirrm Local/Library/Bundles/WildMenus.themeEngine/Resources
-@dirrm Local/Library/Bundles/WildMenus.themeEngine
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj
 @dirrm Local/Applications/DictionaryReader.app/Resources
diff --git a/deskutils/etoile/Makefile b/deskutils/etoile/Makefile
index 8c9cacd5cbaa..817721159b1f 100644
--- a/deskutils/etoile/Makefile
+++ b/deskutils/etoile/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	etoile
 PORTVERSION=	0.1.${SNAPSHOT}
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	http://florida.ethz.ch/ports/distfiles/
 DISTNAME=	etoile_0+${SNAPSHOT}+dfsg.orig
@@ -23,6 +24,6 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 MAKEFILE=	GNUmakefile
-USE_GNUSTEP_MAKE_DIRS=	Bundles/Camaelon Bundles/WildMenus Services/User/DictionaryReader
+USE_GNUSTEP_MAKE_DIRS+=	Services/User/DictionaryReader
 
 .include <bsd.port.mk>
diff --git a/deskutils/etoile/pkg-descr b/deskutils/etoile/pkg-descr
index f45b40c0435f..522b3419afd1 100644
--- a/deskutils/etoile/pkg-descr
+++ b/deskutils/etoile/pkg-descr
@@ -5,7 +5,6 @@ workflow by reshaping or recombining provided Services (aka Applications),
 Components etc. Flexibility and modularity on both User Interface and code
 level should allow us to scale from PDA to computer environment.
 
-Currently this package only installs Camaelon, DictionaryReader and
-WildMenus.
+Currently this package only installs DictionaryReader.
 
 WWW: http://www.etoile-project.org/
diff --git a/deskutils/etoile/pkg-plist b/deskutils/etoile/pkg-plist
index 483430b343d8..cb00fdb88f10 100644
--- a/deskutils/etoile/pkg-plist
+++ b/deskutils/etoile/pkg-plist
@@ -12,16 +12,6 @@ Local/Applications/DictionaryReader.app/Resources/jargon.dict
 Local/Applications/DictionaryReader.app/Resources/jargon.index
 Local/Applications/DictionaryReader.app/library_paths.openapp
 Local/Applications/DictionaryReader.app/stamp.make
-Local/Library/Bundles/WildMenus.themeEngine/Resources/Info-gnustep.plist
-Local/Library/Bundles/WildMenus.themeEngine/WildMenus
-Local/Library/Bundles/WildMenus.themeEngine/stamp.make
-System/Library/Bundles/Camaelon.themeEngine/Camaelon
-System/Library/Bundles/Camaelon.themeEngine/Resources/Info-gnustep.plist
-System/Library/Bundles/Camaelon.themeEngine/stamp.make
-@dirrm System/Library/Bundles/Camaelon.themeEngine/Resources
-@dirrm System/Library/Bundles/Camaelon.themeEngine
-@dirrm Local/Library/Bundles/WildMenus.themeEngine/Resources
-@dirrm Local/Library/Bundles/WildMenus.themeEngine
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj/DictionaryReader.gorm
 @dirrm Local/Applications/DictionaryReader.app/Resources/English.lproj
 @dirrm Local/Applications/DictionaryReader.app/Resources