8 files changed, 27 insertions, 25 deletions

diff --git a/irc/gdesklets-irc/Makefile b/irc/gdesklets-irc/Makefile
index a1e7d25fd503..a5ca098b5a25 100644
--- a/irc/gdesklets-irc/Makefile
+++ b/irc/gdesklets-irc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	irc
 PORTVERSION=	1.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	irc gnome deskutils
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -22,7 +22,7 @@ USE_PYTHON=	yes
 USE_XLIB=	yes
 
 NAME=		irc
-DATADIR=	${PREFIX}/share/gnome/gdesklets
+DATADIR=	${PREFIX}/share/gdesklets
 LANG=		ko
 PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/${NAME}
diff --git a/irc/gdesklets-irc/pkg-message b/irc/gdesklets-irc/pkg-message
index 11381c1167cd..b629d1ef3ea7 100644
--- a/irc/gdesklets-irc/pkg-message
+++ b/irc/gdesklets-irc/pkg-message
@@ -1,11 +1,11 @@
 ##
 To view the installed applets:
 
-	ls %%PREFIX%%/share/gnome/gdesklets/Displays
+	ls %%PREFIX%%/share/gdesklets/Displays
 
 To use this applet:
 
-	gdesklets open %%PREFIX%%/share/gnome/gdesklets/Displays/%%NAME%%/%%NAME%%.display
+	gdesklets open %%PREFIX%%/share/gdesklets/Displays/%%NAME%%/%%NAME%%.display
 
 NOTE: Be sure to login as your user when you use the gdesklets command,
       as the configuration will be stored in the ~/.gdesklets/ directory
diff --git a/irc/lostirc/Makefile b/irc/lostirc/Makefile
index 52533097cf36..bfde407c8386 100644
--- a/irc/lostirc/Makefile
+++ b/irc/lostirc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lostirc
 PORTVERSION=	0.4.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	irc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://demian.dyndns.org/src/
diff --git a/irc/lostirc/pkg-plist b/irc/lostirc/pkg-plist
index 91c83b2a892b..495ef7bf7799 100644
--- a/irc/lostirc/pkg-plist
+++ b/irc/lostirc/pkg-plist
@@ -4,8 +4,9 @@ bin/lostirc
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/lostirc.desktop
-share/gnome/pixmaps/lostirc.png
+share/applications/lostirc.desktop
+share/pixmaps/lostirc.png
 share/locale/da/LC_MESSAGES/lostirc.mo
 share/locale/fr/LC_MESSAGES/lostirc.mo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile
index a741c7741ddc..cc10cfa9423d 100644
--- a/irc/xchat-gnome/Makefile
+++ b/irc/xchat-gnome/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xchat
 PORTVERSION=	0.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc gnome ipv6
 MASTER_SITES=	http://releases.navi.cx/xchat-gnome/
 PKGNAMESUFFIX=	-gnome
diff --git a/irc/xchat-gnome/pkg-plist b/irc/xchat-gnome/pkg-plist
index 581d9256fb0a..c6969c452844 100644
--- a/irc/xchat-gnome/pkg-plist
+++ b/irc/xchat-gnome/pkg-plist
@@ -27,21 +27,21 @@ lib/xchat-gnome/plugins/urlscraper.a
 lib/xchat-gnome/plugins/urlscraper.la
 lib/xchat-gnome/plugins/urlscraper.so
 %%DBUS%%share/dbus-1/services/org.gnome.Xchat.service
-share/gnome/applications/xchat-gnome.desktop
+share/applications/xchat-gnome.desktop
 share/gnome/help/xchat-gnome/C/figures/xchat-gnome_main_window.png
 share/gnome/help/xchat-gnome/C/legal.xml
 share/gnome/help/xchat-gnome/C/xchat-gnome.xml
-share/gnome/omf/xchat-gnome/xchat-gnome-C.omf
-share/gnome/xchat-gnome/channel-list.glade
-share/gnome/xchat-gnome/connect-dialog.glade
-share/gnome/xchat-gnome/dcc-window.glade
-share/gnome/xchat-gnome/irc-network-editor.glade
-share/gnome/xchat-gnome/message.wav
-share/gnome/xchat-gnome/preferences-dialog.glade
-share/gnome/xchat-gnome/setup-dialog.glade
-share/gnome/xchat-gnome/topic-change.glade
-share/gnome/xchat-gnome/xchat-gnome-ui.xml
-share/gnome/xchat-gnome/xchat-gnome.glade
+share/omf/xchat-gnome/xchat-gnome-C.omf
+share/xchat-gnome/channel-list.glade
+share/xchat-gnome/connect-dialog.glade
+share/xchat-gnome/dcc-window.glade
+share/xchat-gnome/irc-network-editor.glade
+share/xchat-gnome/message.wav
+share/xchat-gnome/preferences-dialog.glade
+share/xchat-gnome/setup-dialog.glade
+share/xchat-gnome/topic-change.glade
+share/xchat-gnome/xchat-gnome-ui.xml
+share/xchat-gnome/xchat-gnome.glade
 share/icons/hicolor/128x128/apps/xchat-gnome.png
 share/icons/hicolor/16x16/apps/xchat-gnome-dcc.png
 share/icons/hicolor/16x16/apps/xchat-gnome-message-data.png
@@ -112,8 +112,8 @@ share/locale/wa/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_CN/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_HK/LC_MESSAGES/xchat-gnome.mo
 share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
-@dirrm share/gnome/xchat-gnome
-@dirrm share/gnome/omf/xchat-gnome
+@dirrm share/xchat-gnome
+@dirrm share/omf/xchat-gnome
 @dirrm share/gnome/help/xchat-gnome/C/figures
 @dirrm share/gnome/help/xchat-gnome/C
 @dirrm share/gnome/help/xchat-gnome
@@ -129,3 +129,4 @@ share/locale/zh_TW/LC_MESSAGES/xchat-gnome.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/jbo/LC_MESSAGES
 @dirrmtry share/locale/jbo
+@dirrmtry share/applications
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 40d4eddec4f1..05597b5cc929 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		xchat
 PORTVERSION=		1.8.11
-PORTREVISION=		8
+PORTREVISION=		9
 CATEGORIES+=		irc gnome ipv6
 MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 			http://xchat.linuxpower.org/files/source/1.8/
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+=	--enable-gdk-pixbuf
 USE_GNOME=		imlib
 CONFIGURE_ARGS+=	--enable-gnome --enable-panel --enable-gdk-pixbuf \
 			--enable-zvt
-MAKE_ARGS=		icondir="${PREFIX}/share/gnome/pixmaps" \
+MAKE_ARGS=		icondir="${PREFIX}/share/pixmaps" \
 			utildir="${PREFIX}/share/gnome/apps/Internet"
 .else
 CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
diff --git a/irc/xchat1/pkg-plist b/irc/xchat1/pkg-plist
index feeacf15b1e9..54af6d2ffe03 100644
--- a/irc/xchat1/pkg-plist
+++ b/irc/xchat1/pkg-plist
@@ -16,7 +16,7 @@ bin/xchat-text
 %%PORTDOCS%%share/doc/xchat/xchat.html
 %%PORTDOCS%%share/doc/xchat/xchat.sgml
 %%GNOME:%%share/gnome/apps/Internet/xchat.desktop
-%%GNOME:%%share/gnome/pixmaps/xchat.png
+%%GNOME:%%share/pixmaps/xchat.png
 %%PORTDOCS%%@dirrm share/doc/xchat
 share/locale/ca/LC_MESSAGES/xchat.mo
 share/locale/cs/LC_MESSAGES/xchat.mo