3 files changed, 35 insertions, 33 deletions

diff --git a/net/blam/Makefile b/net/blam/Makefile
index 6b59821f9981..d34d9f399cda 100644
--- a/net/blam/Makefile
+++ b/net/blam/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	blam
 PORTVERSION=	1.8.4
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	http://www.cmartin.tk/blam/
 
@@ -32,9 +33,9 @@ MAN1=	blam.1
 GCONF_SCHEMAS=	blam.schemas
 
 post-patch:
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/blam/|g' \
+	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/blam/|g' \
 		${WRKSRC}/themes/blam/theme.html
-	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/gnome/blam/themes/pimped/|g' \
+	@${REINPLACE_CMD} 's|img src="|img src="file://${PREFIX}/share/blam/themes/pimped/|g' \
 		${WRKSRC}/themes/pimped/theme.html
 
 
diff --git a/net/blam/files/extra-libblam_blam-gecko-utils.cpp b/net/blam/files/extra-libblam_blam-gecko-utils.cpp
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/net/blam/files/extra-libblam_blam-gecko-utils.cpp
+++ /dev/null
diff --git a/net/blam/pkg-plist b/net/blam/pkg-plist
index ecfd7bf0326f..9cbf238201c8 100644
--- a/net/blam/pkg-plist
+++ b/net/blam/pkg-plist
@@ -7,31 +7,31 @@ lib/blam/libblam.a
 lib/blam/libblam.la
 lib/blam/libblam.so
 lib/blam/libblam.so.0
-share/gnome/applications/blam.desktop
-share/gnome/blam/themes/planet/theme.html
-share/gnome/blam/themes/planet/planet.css
-share/gnome/blam/themes/planet/bubble-top.png
-share/gnome/blam/themes/planet/bubble-top-right.png
-share/gnome/blam/themes/planet/bubble-top-left.png
-share/gnome/blam/themes/planet/bubble-right.png
-share/gnome/blam/themes/planet/bubble-nipple.png
-share/gnome/blam/themes/planet/bubble-left.png
-share/gnome/blam/themes/planet/bubble-bottom.png
-share/gnome/blam/themes/planet/bubble-bottom-right.png
-share/gnome/blam/themes/planet/bubble-bottom-left.png
-share/gnome/blam/themes/pimped/theme.html
-share/gnome/blam/themes/pimped/pimped.css
-share/gnome/blam/themes/pimped/news.png
-share/gnome/blam/themes/pimped/blam.png
-share/gnome/blam/themes/blam/theme.html
-share/gnome/blam/themes/blam/blam-box-top-right.png
-share/gnome/blam/themes/blam/blam-box-top-left.png
-share/gnome/blam/themes/blam/blam-box-pad.png
-share/gnome/blam/themes/blam/blam-box-bottom-right.png
-share/gnome/blam/themes/blam/blam-box-bottom-left.png
-share/gnome/blam/themes/akregator/theme.html
-share/gnome/blam/collection.xml
-share/gnome/pixmaps/blam.png
+share/applications/blam.desktop
+share/blam/themes/planet/theme.html
+share/blam/themes/planet/planet.css
+share/blam/themes/planet/bubble-top.png
+share/blam/themes/planet/bubble-top-right.png
+share/blam/themes/planet/bubble-top-left.png
+share/blam/themes/planet/bubble-right.png
+share/blam/themes/planet/bubble-nipple.png
+share/blam/themes/planet/bubble-left.png
+share/blam/themes/planet/bubble-bottom.png
+share/blam/themes/planet/bubble-bottom-right.png
+share/blam/themes/planet/bubble-bottom-left.png
+share/blam/themes/pimped/theme.html
+share/blam/themes/pimped/pimped.css
+share/blam/themes/pimped/news.png
+share/blam/themes/pimped/blam.png
+share/blam/themes/blam/theme.html
+share/blam/themes/blam/blam-box-top-right.png
+share/blam/themes/blam/blam-box-top-left.png
+share/blam/themes/blam/blam-box-pad.png
+share/blam/themes/blam/blam-box-bottom-right.png
+share/blam/themes/blam/blam-box-bottom-left.png
+share/blam/themes/akregator/theme.html
+share/blam/collection.xml
+share/pixmaps/blam.png
 share/locale/bg/LC_MESSAGES/blam.mo
 share/locale/bs/LC_MESSAGES/blam.mo
 share/locale/ca/LC_MESSAGES/blam.mo
@@ -82,10 +82,11 @@ share/locale/zh_TW/LC_MESSAGES/blam.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
-@dirrm share/gnome/blam/themes/planet
-@dirrm share/gnome/blam/themes/pimped
-@dirrm share/gnome/blam/themes/blam
-@dirrm share/gnome/blam/themes/akregator
-@dirrm share/gnome/blam/themes
-@dirrm share/gnome/blam
+@dirrm share/blam/themes/planet
+@dirrm share/blam/themes/pimped
+@dirrm share/blam/themes/blam
+@dirrm share/blam/themes/akregator
+@dirrm share/blam/themes
+@dirrm share/blam
 @dirrm lib/blam
+@dirrmtry share/applications