- added EtoileMenus, Camaelon, WildMenus

2 files changed, 33 insertions, 22 deletions

diff --git a/x11/gnustep-app/Makefile b/x11/gnustep-app/Makefile
index 47101405d745..02cf11f37bd6 100644
--- a/x11/gnustep-app/Makefile
+++ b/x11/gnustep-app/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnustep-app
 PORTVERSION=	1.13.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -38,20 +38,6 @@ USE_GNUSTEP_SYSTEM_LIBS+=	\
 	ServicesBarKit:deskutils/etoile-servicesbarkit \
 	IconKit:x11-themes/etoile-iconkit \
 
-USE_GNUSTEP_SYSTEM_APPS+=	\
-	GShisen:games/gshisen \
-	ProjectCenter:devel/projectcenter.app \
-	Preferences:deskutils/preferences.app \
-	GWorkspace:deskutils/gworkspace \
-	TextEdit:editors/textedit.app \
-	TimeMon:sysutils/timemon \
-	Terminal:x11/terminal.app \
-	Emacs:editors/emacs.app \
-	GSPdf:print/gspdf \
-	SystemPreferences:deskutils/systempreferences \
-	WrapperFactory:deskutils/gnustep-wrapper \
-	GRubik:games/grubik \
-
 USE_GNUSTEP_LOCAL_LIBS+=	\
 	Pantomime:mail/pantomime \
 	GToolKit:x11-toolkits/gtoolkit \
@@ -73,7 +59,31 @@ USE_GNUSTEP_LOCAL_LIBS+=	\
 	RSSKit:www/etoile-rsskit \
 	EtoileExtensions:deskutils/etoile-etoileextensionskit \
 
-USE_GNUSTEP_LOCAL_BUNDLES+=	Cddb:audio/cddb-bundle
+USE_GNUSTEP_SYSTEM_BUNDLES+=	\
+	EtoileMenus:x11-themes/etoile-etoilemenus \
+
+USE_GNUSTEP_LOCAL_BUNDLES+=	\
+	Cddb:audio/cddb-bundle
+
+USE_GNUSTEP_SYSTEM_THEMES+=	\
+	Camaelon:x11-themes/etoile-camaelon \
+
+USE_GNUSTEP_LOCAL_THEMES+=	\
+	WildMenus:x11-themes/etoile-wildmenus
+
+USE_GNUSTEP_SYSTEM_APPS+=	\
+	GShisen:games/gshisen \
+	ProjectCenter:devel/projectcenter.app \
+	Preferences:deskutils/preferences.app \
+	GWorkspace:deskutils/gworkspace \
+	TextEdit:editors/textedit.app \
+	TimeMon:sysutils/timemon \
+	Terminal:x11/terminal.app \
+	Emacs:editors/emacs.app \
+	GSPdf:print/gspdf \
+	SystemPreferences:deskutils/systempreferences \
+	WrapperFactory:deskutils/gnustep-wrapper \
+	GRubik:games/grubik \
 
 USE_GNUSTEP_LOCAL_APPS+=	\
 	Gomoku:games/gomoku.app \
diff --git a/x11/gnustep-app/pkg-descr b/x11/gnustep-app/pkg-descr
index a7151f153901..a8d073b0a15d 100644
--- a/x11/gnustep-app/pkg-descr
+++ b/x11/gnustep-app/pkg-descr
@@ -1,17 +1,18 @@
 Collection of GNUstep software
 
 System libs:	Gorm, ScriptKit, gnustep-db2, Renaissance, PreferencePanes,
-TrackerKit, PreferencesKit, BookmarkKit, ServicesBarKit, IconKit
+Camaelon, TrackerKit, PreferencesKit, BookmarkKit, ServicesBarKit, IconKit,
+EtoileMenus
+
+Local libs:	Pantomime, GToolKit, rigs, Addresses, SlideShow, netclasses,
+WizardKit, HighlighterKit, Performance, SQLClient, WebServer, StepTalk,
+MathArray, ObjcUnit, WildMenus, GSKrab, Cddb, UnitKit, XWindowServerKit,
+RSSKit, EtoileExtensions
 
 System apps:	GShisen, ProjectCenter, Preferences, GWorkspace, guile-gui,
 gui, TextEdit, TimeMon, Terminal, Emacs, GSPdf, SystemPreferences,
 WrapperFactory, GRubik
 
-Local libs:	Pantomime, GToolKit, rigs, Addresses, SlideShow, netclasses,
-WizardKit, HighlighterKit, Performance, SQLClient, WebServer, StepTalk,
-MathArray, ObjcUnit, Camaelon, WildMenus, GSKrab, Cddb, UnitKit,
-XWindowServerKit, RSSKit, EtoileExtensions
-
 Local apps:	Gomoku, GNUMail, EasyDiff, Calculator, CurrencyConverter,
 Finger, GFractal, GSTest, HostAddress, Ink, NSBrowserTest, NSImageTest,
 NSPanelTest, NSScreenTest, md5Digest, GSCommander, ImageViewer, SlideShow,