7 files changed, 72 insertions, 50 deletions

diff --git a/ftp/downloader/files/patch-fix_build_gtk-2.12 b/ftp/downloader/files/patch-fix_build_gtk-2.12
new file mode 100644
index 000000000000..c8db43c987fd
--- /dev/null
+++ b/ftp/downloader/files/patch-fix_build_gtk-2.12
@@ -0,0 +1,25 @@
+--- configure.orig	2007-10-10 14:56:20.000000000 -0500
++++ configure	2007-10-10 14:56:47.000000000 -0500
+@@ -18398,11 +18398,6 @@
+ 
+ 
+ cat >>confdefs.h <<\_ACEOF
+-#define GTK_DISABLE_DEPRECATED
+-_ACEOF
+-
+-
+-cat >>confdefs.h <<\_ACEOF
+ #define _FILE_OFFSET_BITS 64
+ _ACEOF
+ 
+--- main/face/list.cc.orig	2007-10-10 14:56:30.000000000 -0500
++++ main/face/list.cc	2007-10-10 14:56:51.000000000 -0500
+@@ -8,8 +8,6 @@
+  *	but WITHOUT ANY WARRANTY; without even the implied warranty of
+  *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  */
+-#define GTK_DISABLE_DEPRECATED
+-
+ #include <stdio.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdkkeysyms.h>
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
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index d55540e7c361..7ec56346ca2b 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	junglemonkey
 PORTVERSION=	0.1.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	ftp gnome
 MASTER_SITES=	http://www.gizmolabs.org/~dhelder/junglemonkey/src/
 DISTNAME=	jm-${PORTVERSION}
@@ -31,10 +31,6 @@ MAN1=		jm.1 jmlite.1 mtprendezvous.1
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|/gnome/help/|/help/|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
-		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
diff --git a/ftp/junglemonkey/pkg-plist b/ftp/junglemonkey/pkg-plist
index c465b7c1a8cd..0298828c11e8 100644
--- a/ftp/junglemonkey/pkg-plist
+++ b/ftp/junglemonkey/pkg-plist
@@ -19,16 +19,16 @@ share/gnome/help/jm/C/x534.html
 share/gnome/help/jm/C/x552.html
 share/gnome/help/jm/C/x557.html
 share/gnome/help/jm/C/x89.html
-share/gnome/jm/glade/jm-gnome.glade
-share/gnome/jm/glade/jm.glade
-share/gnome/jm/glade/master_popup.glade
-share/gnome/jm/glade/preferences_dialog.glade
-share/gnome/jm/glade/properties_dialog.glade
-share/gnome/pixmaps/jm-logo.png
+share/jm/glade/jm-gnome.glade
+share/jm/glade/jm.glade
+share/jm/glade/master_popup.glade
+share/jm/glade/preferences_dialog.glade
+share/jm/glade/properties_dialog.glade
+share/pixmaps/jm-logo.png
 share/locale/de/LC_MESSAGES/jm.mo
 share/locale/fr/LC_MESSAGES/jm.mo
 @dirrm share/gnome/help/jm/C/images
 @dirrm share/gnome/help/jm/C
 @dirrm share/gnome/help/jm
-@dirrm share/gnome/jm/glade
-@dirrm share/gnome/jm
+@dirrm share/jm/glade
+@dirrm share/jm
diff --git a/ftp/urlgfe/Makefile b/ftp/urlgfe/Makefile
index ece600a73b41..dcbc2a4d23ff 100644
--- a/ftp/urlgfe/Makefile
+++ b/ftp/urlgfe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	urlgfe
 PORTVERSION=	0.7.1
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	ftp www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	urlget
@@ -51,7 +51,7 @@ post-patch:
 .if defined(WITH_GNOME)
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${PREFIX}/share/gnome/apps/Internet/
-	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${PREFIX}/share/gnome/pixmaps/
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/${PORTNAME}-icon.png ${PREFIX}/share/pixmaps/
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/ftp/urlgfe/pkg-plist b/ftp/urlgfe/pkg-plist
index 212b3114719d..52c72837248d 100644
--- a/ftp/urlgfe/pkg-plist
+++ b/ftp/urlgfe/pkg-plist
@@ -8,6 +8,6 @@ bin/urlgfe
 %%DOCSDIR%%/README
 %%DOCSDIR%%/TODO
 %%GNOME:%%share/gnome/apps/Internet/urlgfe.desktop
-%%GNOME:%%share/gnome/pixmaps/urlgfe-icon.png
+%%GNOME:%%share/pixmaps/urlgfe-icon.png
 share/locale/zh_TW/LC_MESSAGES/urlgfe.mo
 @dirrm %%DOCSDIR%%