11 files changed, 22 insertions, 10 deletions

diff --git a/irc/bitchx/Makefile b/irc/bitchx/Makefile
index f74895dd4348..6128374d4988 100644
--- a/irc/bitchx/Makefile
+++ b/irc/bitchx/Makefile
@@ -26,6 +26,8 @@ CONFIGURE_ARGS=	--exec-prefix="${PREFIX}/share" \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L{LOCALBASE}/lib"
 
+MAN1=		BitchX.1
+
 .include <bsd.port.pre.mk>
 
 .if defined(HAVE_GNOME)
diff --git a/korean/ami/pkg-plist b/korean/ami/pkg-plist
index 1079c421b0dc..f2e755d2724e 100644
--- a/korean/ami/pkg-plist
+++ b/korean/ami/pkg-plist
@@ -32,8 +32,9 @@ share/doc/ami/XLC_LOCALE
 %%DATADIR%%/ami/pix/nam/ami-h.xpm
 %%GNOME:%%share/gnome/applets/Utility/ami.desktop
 @comment copy new locale definition(no harm, so need not be uninstalled)
-@exec cp %D/share/doc/ami/XLC_LOCALE %D/lib/X11/locale/ko/
 @exec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE %D/lib/X11/locale/ko/XLC_LOCALE.orig; fi
+@exec cp %D/share/doc/ami/XLC_LOCALE %D/lib/X11/locale/ko/
+@unexec rm -f %D/lib/X11/locale/ko/XLC_LOCALE
 @unexec if [ -f %D/lib/X11/locale/ko/XLC_LOCALE.orig ]; then mv -f %D/lib/X11/locale/ko/XLC_LOCALE.orig %D/lib/X11/locale/ko/XLC_LOCALE; fi
 @dirrm share/doc/ami
 @dirrm %%DATADIR%%/ami/pix/nam
diff --git a/net-im/gicq/pkg-plist b/net-im/gicq/pkg-plist
index 67b051623192..48da86262567 100644
--- a/net-im/gicq/pkg-plist
+++ b/net-im/gicq/pkg-plist
@@ -4,3 +4,4 @@ bin/gicq
 %%DATADIR%%/help/gicq/C/topic.dat
 @dirrm %%DATADIR%%/help/gicq/C
 @dirrm %%DATADIR%%/help/gicq
+%%NOGNOME:%%@dirrm %%DATADIR%%/help
diff --git a/net/gicq/pkg-plist b/net/gicq/pkg-plist
index 67b051623192..48da86262567 100644
--- a/net/gicq/pkg-plist
+++ b/net/gicq/pkg-plist
@@ -4,3 +4,4 @@ bin/gicq
 %%DATADIR%%/help/gicq/C/topic.dat
 @dirrm %%DATADIR%%/help/gicq/C
 @dirrm %%DATADIR%%/help/gicq
+%%NOGNOME:%%@dirrm %%DATADIR%%/help
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index f300bb1cd53a..2dd7c07a6243 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,9 +1,9 @@
 bin/seahorse
-share/gnome/gnome/apps/Applications/seahorse.desktop
-share/gnome/gnome/help/seahorse/C/seahorse.html
-share/gnome/gnome/help/seahorse/C/topic.dat
-share/gnome/gnome/help/seahorse/ja/seahorse.html
-share/gnome/gnome/help/seahorse/ja/topic.dat
+share/gnome/apps/Applications/seahorse.desktop
+share/gnome/help/seahorse/C/seahorse.html
+share/gnome/help/seahorse/C/topic.dat
+share/gnome/help/seahorse/ja/seahorse.html
+share/gnome/help/seahorse/ja/topic.dat
 share/gnome/pixmaps/seahorse/seahorse.png
 share/locale/cs/LC_MESSAGES/seahorse.mo
 share/locale/da/LC_MESSAGES/seahorse.mo
@@ -13,6 +13,6 @@ share/locale/fr/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
 @dirrm share/gnome/pixmaps/seahorse
-@dirrm share/gnome/gnome/help/seahorse/ja
-@dirrm share/gnome/gnome/help/seahorse/C
-@dirrm share/gnome/gnome/help/seahorse
+@dirrm share/gnome/help/seahorse/ja
+@dirrm share/gnome/help/seahorse/C
+@dirrm share/gnome/help/seahorse
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 28ca859841ff..c0efe9c75239 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -23,6 +23,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-install-location="${X11BASE}/lib/bluefish" \
 		--disable-nls
 
+MANCOMPRESSED=	yes
 MAN1=		bluefish.1
 
 post-install:
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 649ba55285de..56d8a08f4cf1 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -3,5 +3,7 @@ share/bluefish/php3_functions
 share/bluefish/ssi_functions
 share/bluefish/rxml_functions
 share/doc/bluefish/README
+share/pixmaps/bluefish_icon.xpm
+@dirrm share/pixmaps
 @dirrm share/bluefish
 @dirrm share/doc/bluefish
diff --git a/www/screem-devel/pkg-plist b/www/screem-devel/pkg-plist
index ab002c4b8e49..7751ad0b1b29 100644
--- a/www/screem-devel/pkg-plist
+++ b/www/screem-devel/pkg-plist
@@ -269,3 +269,4 @@ share/locale/tr/LC_MESSAGES/screem.mo
 @dirrm share/gnome/help/screem/C
 @dirrm share/gnome/help/screem
 @dirrm lib/screem/plugins
+@dirrm lib/screem
diff --git a/www/screem/pkg-plist b/www/screem/pkg-plist
index ab002c4b8e49..7751ad0b1b29 100644
--- a/www/screem/pkg-plist
+++ b/www/screem/pkg-plist
@@ -269,3 +269,4 @@ share/locale/tr/LC_MESSAGES/screem.mo
 @dirrm share/gnome/help/screem/C
 @dirrm share/gnome/help/screem
 @dirrm lib/screem/plugins
+@dirrm lib/screem
diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist
index 8ca1c1e0f70c..efefcb3ab0a2 100644
--- a/x11-toolkits/vdkbuilder/pkg-plist
+++ b/x11-toolkits/vdkbuilder/pkg-plist
@@ -126,7 +126,7 @@ lib/libvdkcalendar.so.1
 lib/libvdkdclock.a
 lib/libvdkdclock.so
 lib/libvdkdclock.so.1
-share/gnome/pixmaps/vdkb.png
+%%GNOME:%%share/gnome/pixmaps/vdkb.png
 %%DATADIR%%/vdkb/res/AUTHORS
 %%DATADIR%%/vdkb/res/COPYING
 %%DATADIR%%/vdkb/res/ChangeLog
diff --git a/x11-wm/scwm/pkg-plist b/x11-wm/scwm/pkg-plist
index f021e21137e4..36b701e595b9 100644
--- a/x11-wm/scwm/pkg-plist
+++ b/x11-wm/scwm/pkg-plist
@@ -243,6 +243,8 @@ share/scwm/themes/mwm.tar.gz
 share/scwm/themes/twm.tar.gz
 share/scwm/themes/win95.tar.gz
 share/scwm/themes/woven.tar.gz
+@exec install-info %D/info/scwm.info %D/info/dir
+@unexec install-info --delete %D/info/scwm.info %D/info/dir
 @dirrm lib/scwm/modules/app/scwm
 @dirrm lib/scwm/modules/app
 @dirrm lib/scwm/modules