- add some missing dependencies

 - fix plist

Bemoaning by:	pointyhat

2 files changed, 67 insertions, 63 deletions

diff --git a/x11-themes/gtk-ana-theme/Makefile b/x11-themes/gtk-ana-theme/Makefile
index 6fca868acd64..89ee5ee30ef9 100644
--- a/x11-themes/gtk-ana-theme/Makefile
+++ b/x11-themes/gtk-ana-theme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ana
 PORTVERSION=	0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-themes gnome
 MASTER_SITES=	http://ana.netart.eu.org/
 PKGNAMEPREFIX=	${TYPE}-
@@ -17,6 +17,9 @@ DISTNAME=	Ana
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Clean and white GTK engine
 
+LIB_DEPENDS=	rsvg-2:${PORTSDIR}/graphics/librsvg2
+RUN_DEPENDS=	${X11BASE}/share/themes/Gorilla/index.theme:${PORTSDIR}/x11-themes/gnome-themes-extras
+
 TYPE?=		gtk
 THEME_NAME=	Ana
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -29,11 +32,13 @@ THEME_DIR=	${PREFIX}/share/themes/${THEME_NAME}
 PLIST_SUB+=	GTK=""
 PLIST_SUB+=	GTK20=""
 PLIST_SUB+=	METACITY="@comment "
+USE_GNOME=	gtk20
 .else   # metacity
 THEME_DIR=	${PREFIX}/share/gnome/themes/${THEME_NAME}
 PLIST_SUB+=	GTK="@comment "
 PLIST_SUB+=	GTK20="@comment "
 PLIST_SUB+=	METACITY=""
+USE_GNOME=	gnomehier
 .endif
 
 PLIST_SUB+=	THEME_NAME="${THEME_NAME}"
diff --git a/x11-themes/gtk-ana-theme/pkg-plist b/x11-themes/gtk-ana-theme/pkg-plist
index c0e17fe344b1..4a64b225195c 100644
--- a/x11-themes/gtk-ana-theme/pkg-plist
+++ b/x11-themes/gtk-ana-theme/pkg-plist
@@ -70,72 +70,71 @@
 %%GTK20%%share/themes/%%THEME_NAME%%/gtk-2.0/toolbar.svg
 %%GTK20%%share/themes/%%THEME_NAME%%/gtk-2.0/trough-h.svg
 %%GTK20%%share/themes/%%THEME_NAME%%/gtk-2.0/trough-v.svg
-%%GTK20%%share/themes/%%THEME_NAME%%/index.theme
-%%GTK20%%share/themes/Ana/icons/iconrc
-%%GTK20%%share/themes/Ana/icons/stock_about.svg
-%%GTK20%%share/themes/Ana/icons/stock_add (kopia).svg
-%%GTK20%%share/themes/Ana/icons/stock_add.svg
-%%GTK20%%share/themes/Ana/icons/stock_apply.svg
-%%GTK20%%share/themes/Ana/icons/stock_cancel.svg
-%%GTK20%%share/themes/Ana/icons/stock_close.svg
-%%GTK20%%share/themes/Ana/icons/stock_convert.svg
-%%GTK20%%share/themes/Ana/icons/stock_copy.svg
-%%GTK20%%share/themes/Ana/icons/stock_cut.svg
-%%GTK20%%share/themes/Ana/icons/stock_delete.svg
-%%GTK20%%share/themes/Ana/icons/stock_dialog_error.svg
-%%GTK20%%share/themes/Ana/icons/stock_dialog_info.svg
-%%GTK20%%share/themes/Ana/icons/stock_dialog_question.svg
-%%GTK20%%share/themes/Ana/icons/stock_dialog_warning.svg
-%%GTK20%%share/themes/Ana/icons/stock_dnd (kopia).svg
-%%GTK20%%share/themes/Ana/icons/stock_dnd.svg
-%%GTK20%%share/themes/Ana/icons/stock_edit.svg
-%%GTK20%%share/themes/Ana/icons/stock_ep-history.svg
-%%GTK20%%share/themes/Ana/icons/stock_find-and-replace.svg
-%%GTK20%%share/themes/Ana/icons/stock_find.svg
-%%GTK20%%share/themes/Ana/icons/stock_floppy.svg
-%%GTK20%%share/themes/Ana/icons/stock_go-back.svg
-%%GTK20%%share/themes/Ana/icons/stock_go-down.svg
-%%GTK20%%share/themes/Ana/icons/stock_go-forward.svg
-%%GTK20%%share/themes/Ana/icons/stock_go-up.svg
-%%GTK20%%share/themes/Ana/icons/stock_goto-bottom.svg
-%%GTK20%%share/themes/Ana/icons/stock_goto-first.svg
-%%GTK20%%share/themes/Ana/icons/stock_goto-last.svg
-%%GTK20%%share/themes/Ana/icons/stock_goto-top.svg
-%%GTK20%%share/themes/Ana/icons/stock_help.svg
-%%GTK20%%share/themes/Ana/icons/stock_home (kopia).svg
-%%GTK20%%share/themes/Ana/icons/stock_home.svg
-%%GTK20%%share/themes/Ana/icons/stock_new-tab.svg
-%%GTK20%%share/themes/Ana/icons/stock_new-template.svg
-%%GTK20%%share/themes/Ana/icons/stock_new.svg
-%%GTK20%%share/themes/Ana/icons/stock_no.svg
-%%GTK20%%share/themes/Ana/icons/stock_ok.svg
-%%GTK20%%share/themes/Ana/icons/stock_open (kolejna kopia).svg
-%%GTK20%%share/themes/Ana/icons/stock_open.svg
-%%GTK20%%share/themes/Ana/icons/stock_paste.svg
-%%GTK20%%share/themes/Ana/icons/stock_preferences.svg
-%%GTK20%%share/themes/Ana/icons/stock_print-preview.svg
-%%GTK20%%share/themes/Ana/icons/stock_print.svg
-%%GTK20%%share/themes/Ana/icons/stock_quit.svg
-%%GTK20%%share/themes/Ana/icons/stock_redo.svg
-%%GTK20%%share/themes/Ana/icons/stock_refresh.svg
-%%GTK20%%share/themes/Ana/icons/stock_remove.svg
-%%GTK20%%share/themes/Ana/icons/stock_revert-to-saved.svg
-%%GTK20%%share/themes/Ana/icons/stock_save-as.svg
-%%GTK20%%share/themes/Ana/icons/stock_save.svg
-%%GTK20%%share/themes/Ana/icons/stock_select-color.svg
-%%GTK20%%share/themes/Ana/icons/stock_stop.svg
-%%GTK20%%share/themes/Ana/icons/stock_undo.svg
-%%GTK20%%share/themes/Ana/icons/stock_yes.svg
-%%GTK20%%share/themes/Ana/icons/stock_zoom-1.svg
-%%GTK20%%share/themes/Ana/icons/stock_zoom-fit.svg
-%%GTK20%%share/themes/Ana/icons/stock_zoom-in.svg
-%%GTK20%%share/themes/Ana/icons/stock_zoom-out.svg
-%%GTK20%%share/themes/Ana/icons/stock_zoom.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/iconrc
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_about.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_add (kopia).svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_add.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_apply.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_cancel.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_close.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_convert.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_copy.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_cut.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_delete.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dialog_error.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dialog_info.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dialog_question.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dialog_warning.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dnd (kopia).svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_dnd.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_edit.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_ep-history.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_find-and-replace.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_find.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_floppy.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_go-back.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_go-down.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_go-forward.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_go-up.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_goto-bottom.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_goto-first.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_goto-last.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_goto-top.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_help.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_home (kopia).svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_home.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_new-tab.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_new-template.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_new.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_no.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_ok.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_open (kolejna kopia).svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_open.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_paste.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_preferences.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_print-preview.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_print.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_quit.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_redo.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_refresh.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_remove.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_revert-to-saved.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_save-as.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_save.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_select-color.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_stop.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_undo.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_yes.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_zoom-1.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_zoom-fit.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_zoom-in.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_zoom-out.svg
+%%GTK20%%share/themes/%%THEME_NAME%%/icons/stock_zoom.svg
 %%GTK20%%share/themes/%%THEME_NAME%%/index.theme
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%/gtk-2.0
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%/gtk
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%/icons
 %%GTK20%%@dirrm share/themes/%%THEME_NAME%%
-%%METACITY%%share/gnome/themes/Ana/metacity-1/metacity-theme-1.xml
+%%METACITY%%share/gnome/themes/%%THEME_NAME%%/metacity-1/metacity-theme-1.xml
 %%METACITY%%@dirrm share/gnome/themes/%%THEME_NAME%%/metacity-1
 %%METACITY%%@dirrm share/gnome/themes/%%THEME_NAME%%