3 files changed, 47 insertions, 62 deletions

diff --git a/deskutils/mcatalog/Makefile b/deskutils/mcatalog/Makefile
index 53a4ccdd625f..9bb9c6896c1f 100644
--- a/deskutils/mcatalog/Makefile
+++ b/deskutils/mcatalog/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mcatalog
 PORTVERSION=	0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	http://www.mcatalog.net/releases/
 
@@ -35,8 +35,6 @@ GCONF_SCHEMAS=	mcatalog.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|/pixmaps/mcatalog|/pixmaps|g' \
 		${WRKSRC}/images/Makefile.in
-	@${REINPLACE_CMD} -e 's|@prefix@/share|${PREFIX}/share/gnome|g' \
-		${WRKSRC}/mcatalog.desktop.in
 	@${REINPLACE_CMD} -e 's|%%MOZILLA%%|${LOCALBASE}/lib/${GECKO}|g' \
 		${WRKSRC}/src/mcatalog.in
 
diff --git a/deskutils/mcatalog/files/patch-src::Defines.cs.in b/deskutils/mcatalog/files/patch-src::Defines.cs.in
deleted file mode 100644
index ce9beac641fa..000000000000
--- a/deskutils/mcatalog/files/patch-src::Defines.cs.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Defines.cs.in.orig	Sun Aug  7 13:40:06 2005
-+++ src/Defines.cs.in	Sun Aug  7 13:40:44 2005
-@@ -9,9 +9,9 @@
- 
- public class Defines {
- 	public static string VERSION = "@version@";
--	public static string DATADIR = "@prefix@/share";
-+	public static string DATADIR = "@prefix@/share/gnome";
- 	public static string APP_DATADIR = DATADIR + "/mcatalog";
- 	public static string IMAGE_DATADIR = APP_DATADIR + "/pixmaps";
- 	public static string TEMPLATES_DATADIR = APP_DATADIR + "/templates";
--	public static string GNOME_LOCALE_DIR = DATADIR + "/locale";
-+	public static string GNOME_LOCALE_DIR = "@prefix@/share/locale";
- }
diff --git a/deskutils/mcatalog/pkg-plist b/deskutils/mcatalog/pkg-plist
index 7c15a2b84c46..5611a63e6560 100644
--- a/deskutils/mcatalog/pkg-plist
+++ b/deskutils/mcatalog/pkg-plist
@@ -6,43 +6,43 @@ lib/mcatalog/mcatalog.exe
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/application-registry/mcatalog.applications
-share/gnome/applications/mcatalog.desktop
-share/gnome/mcatalog/pixmaps/bigstar.png
-share/gnome/mcatalog/pixmaps/borrowed.png
-share/gnome/mcatalog/pixmaps/default/background.jpg
-share/gnome/mcatalog/pixmaps/default/shelf.png
-share/gnome/mcatalog/pixmaps/grass/background.jpg
-share/gnome/mcatalog/pixmaps/grass/shelf.png
-share/gnome/mcatalog/pixmaps/leather/background.jpg
-share/gnome/mcatalog/pixmaps/leather/shelf.png
-share/gnome/mcatalog/pixmaps/littlestar.png
-share/gnome/mcatalog/pixmaps/logo.png
-share/gnome/mcatalog/pixmaps/mcatalog.png
-share/gnome/mcatalog/pixmaps/metal/background.jpg
-share/gnome/mcatalog/pixmaps/metal/shelf.png
-share/gnome/mcatalog/pixmaps/shelfbg.png
-share/gnome/mcatalog/pixmaps/shelfbgnp.png
-share/gnome/mcatalog/pixmaps/wood/background.jpg
-share/gnome/mcatalog/pixmaps/wood/shelf.png
-share/gnome/mcatalog/templates/albums_printable.html
-share/gnome/mcatalog/templates/albums_printable.png
-share/gnome/mcatalog/templates/albums_printable.rc
-share/gnome/mcatalog/templates/albums_simple.html
-share/gnome/mcatalog/templates/albums_simple.png
-share/gnome/mcatalog/templates/albums_simple.rc
-share/gnome/mcatalog/templates/books_printable.html
-share/gnome/mcatalog/templates/books_printable.png
-share/gnome/mcatalog/templates/books_printable.rc
-share/gnome/mcatalog/templates/books_simple.html
-share/gnome/mcatalog/templates/books_simple.png
-share/gnome/mcatalog/templates/books_simple.rc
-share/gnome/mcatalog/templates/films_printable.html
-share/gnome/mcatalog/templates/films_printable.png
-share/gnome/mcatalog/templates/films_printable.rc
-share/gnome/mcatalog/templates/films_simple.html
-share/gnome/mcatalog/templates/films_simple.png
-share/gnome/mcatalog/templates/films_simple.rc
+share/application-registry/mcatalog.applications
+share/applications/mcatalog.desktop
+share/mcatalog/pixmaps/bigstar.png
+share/mcatalog/pixmaps/borrowed.png
+share/mcatalog/pixmaps/default/background.jpg
+share/mcatalog/pixmaps/default/shelf.png
+share/mcatalog/pixmaps/grass/background.jpg
+share/mcatalog/pixmaps/grass/shelf.png
+share/mcatalog/pixmaps/leather/background.jpg
+share/mcatalog/pixmaps/leather/shelf.png
+share/mcatalog/pixmaps/littlestar.png
+share/mcatalog/pixmaps/logo.png
+share/mcatalog/pixmaps/mcatalog.png
+share/mcatalog/pixmaps/metal/background.jpg
+share/mcatalog/pixmaps/metal/shelf.png
+share/mcatalog/pixmaps/shelfbg.png
+share/mcatalog/pixmaps/shelfbgnp.png
+share/mcatalog/pixmaps/wood/background.jpg
+share/mcatalog/pixmaps/wood/shelf.png
+share/mcatalog/templates/albums_printable.html
+share/mcatalog/templates/albums_printable.png
+share/mcatalog/templates/albums_printable.rc
+share/mcatalog/templates/albums_simple.html
+share/mcatalog/templates/albums_simple.png
+share/mcatalog/templates/albums_simple.rc
+share/mcatalog/templates/books_printable.html
+share/mcatalog/templates/books_printable.png
+share/mcatalog/templates/books_printable.rc
+share/mcatalog/templates/books_simple.html
+share/mcatalog/templates/books_simple.png
+share/mcatalog/templates/books_simple.rc
+share/mcatalog/templates/films_printable.html
+share/mcatalog/templates/films_printable.png
+share/mcatalog/templates/films_printable.rc
+share/mcatalog/templates/films_simple.html
+share/mcatalog/templates/films_simple.png
+share/mcatalog/templates/films_simple.rc
 share/locale/cs/LC_MESSAGES/mcatalog.mo
 share/locale/de/LC_MESSAGES/mcatalog.mo
 share/locale/en_CA/LC_MESSAGES/mcatalog.mo
@@ -58,13 +58,14 @@ share/locale/sv/LC_MESSAGES/mcatalog.mo
 share/locale/zh_CN/LC_MESSAGES/mcatalog.mo
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
-@dirrm share/gnome/mcatalog/templates
-@dirrm share/gnome/mcatalog/pixmaps/wood
-@dirrm share/gnome/mcatalog/pixmaps/metal
-@dirrm share/gnome/mcatalog/pixmaps/leather
-@dirrm share/gnome/mcatalog/pixmaps/grass
-@dirrm share/gnome/mcatalog/pixmaps/default
-@dirrm share/gnome/mcatalog/pixmaps
-@dirrm share/gnome/mcatalog
+@dirrm share/mcatalog/templates
+@dirrm share/mcatalog/pixmaps/wood
+@dirrm share/mcatalog/pixmaps/metal
+@dirrm share/mcatalog/pixmaps/leather
+@dirrm share/mcatalog/pixmaps/grass
+@dirrm share/mcatalog/pixmaps/default
+@dirrm share/mcatalog/pixmaps
+@dirrm share/mcatalog
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/mcatalog
+@dirrmtry share/applications