2 files changed, 35 insertions, 34 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 034619c6d723..43275c0bdbf9 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gftp
 PORTVERSION=	2.0.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	ftp
 MASTER_SITES=	http://gftp.seul.org/ \
 		ftp://gftp.seul.org/pub/gftp/
@@ -67,10 +67,10 @@ PLIST_SUB+=	NLS="@comment "
 .if ${HAVE_GNOME:Mgnomelibs}!="" && !defined(WITH_GTK2)
 USE_GNOME+=	gnomeprefix gnomelibs
 PKGNAMESUFFIX+=	-gnome
-PLIST_SUB+=	DATADIR="share/gnome" MYGNOME=""
+PLIST_SUB+=	MYGNOME=""
 MAKE_ENV=	HAVE_GNOME=1
 .else
-PLIST_SUB+=	DATADIR="share" MYGNOME="@comment "
+PLIST_SUB+=	MYGNOME="@comment "
 .endif
 
 post-patch:
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index f22034846c97..855fb7959c0a 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -1,36 +1,35 @@
 bin/gftp
 %%NOX11:%%bin/gftp-gtk
 bin/gftp-text
-%%NOX11:%%%%MYGNOME%%share/gnome/applications/gftp.desktop
-%%NOX11:%%%%DATADIR%%/gftp/COPYING
-%%NOX11:%%%%DATADIR%%/gftp/bookmarks
-%%NOX11:%%%%DATADIR%%/gftp/connect.xpm
-%%NOX11:%%%%DATADIR%%/gftp/deb.xpm
-%%NOX11:%%%%DATADIR%%/gftp/down.xpm
-%%NOX11:%%%%DATADIR%%/gftp/diff.xpm
-%%NOX11:%%%%DATADIR%%/gftp/dir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/doc.xpm
-%%NOX11:%%%%DATADIR%%/gftp/dotdot.xpm
-%%NOX11:%%%%DATADIR%%/gftp/exe.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp-logo.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftp-mini-logo.xpm
-%%NOX11:%%%%DATADIR%%/gftp/gftprc
-%%NOX11:%%%%DATADIR%%/gftp/img.xpm
-%%NOX11:%%%%DATADIR%%/gftp/left.xpm
-%%NOX11:%%%%DATADIR%%/gftp/linkdir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/linkfile.xpm
-%%NOX11:%%%%DATADIR%%/gftp/man.xpm
-%%NOX11:%%%%DATADIR%%/gftp/open_dir.xpm
-%%NOX11:%%%%DATADIR%%/gftp/right.xpm
-%%NOX11:%%%%DATADIR%%/gftp/rpm.xpm
-%%NOX11:%%%%DATADIR%%/gftp/sound.xpm
-%%NOX11:%%%%DATADIR%%/gftp/stop.xpm
-%%NOX11:%%%%DATADIR%%/gftp/tar.xpm
-%%NOX11:%%%%DATADIR%%/gftp/txt.xpm
-%%NOX11:%%%%DATADIR%%/gftp/up.xpm
-%%NOX11:%%%%DATADIR%%/gftp/world.xpm
-%%NOX11:%%%%MYGNOME%%share/gnome/pixmaps/gftp.png
+%%NOX11:%%%%MYGNOME%%share/applications/gftp.desktop
+%%NOX11:%%%%DATADIR%%/COPYING
+%%NOX11:%%%%DATADIR%%/bookmarks
+%%NOX11:%%%%DATADIR%%/connect.xpm
+%%NOX11:%%%%DATADIR%%/deb.xpm
+%%NOX11:%%%%DATADIR%%/diff.xpm
+%%NOX11:%%%%DATADIR%%/dir.xpm
+%%NOX11:%%%%DATADIR%%/doc.xpm
+%%NOX11:%%%%DATADIR%%/dotdot.xpm
+%%NOX11:%%%%DATADIR%%/down.xpm
+%%NOX11:%%%%DATADIR%%/exe.xpm
+%%NOX11:%%%%DATADIR%%/gftp-logo.xpm
+%%NOX11:%%%%DATADIR%%/gftp-mini-logo.xpm
+%%NOX11:%%%%DATADIR%%/gftp.xpm
+%%NOX11:%%%%DATADIR%%/gftprc
+%%NOX11:%%%%DATADIR%%/img.xpm
+%%NOX11:%%%%DATADIR%%/left.xpm
+%%NOX11:%%%%DATADIR%%/linkdir.xpm
+%%NOX11:%%%%DATADIR%%/linkfile.xpm
+%%NOX11:%%%%DATADIR%%/man.xpm
+%%NOX11:%%%%DATADIR%%/open_dir.xpm
+%%NOX11:%%%%DATADIR%%/right.xpm
+%%NOX11:%%%%DATADIR%%/rpm.xpm
+%%NOX11:%%%%DATADIR%%/sound.xpm
+%%NOX11:%%%%DATADIR%%/stop.xpm
+%%NOX11:%%%%DATADIR%%/tar.xpm
+%%NOX11:%%%%DATADIR%%/txt.xpm
+%%NOX11:%%%%DATADIR%%/up.xpm
+%%NOX11:%%%%DATADIR%%/world.xpm
 %%NLS%%share/locale/am/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/az/LC_MESSAGES/gftp.mo
@@ -75,4 +74,6 @@ bin/gftp-text
 %%NLS%%share/locale/uk/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gftp.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/gftp.mo
-%%NOX11:%%@dirrm %%DATADIR%%/gftp
+%%NOX11:%%%%MYGNOME%%share/pixmaps/gftp.png
+%%NOX11:%%@dirrm %%DATADIR%%
+@dirrmtry share/applications