5 files changed, 37 insertions, 13 deletions

diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index a44c73e1224e..14a5c40566b1 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -6,25 +6,36 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	0.9.6
+PORTVERSION=	0.9.7
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnome-commander
+MASTER_SITES=	http://freesoftware.fsf.org/download/gcmd/gcmd.pkg/0.9.7/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	edybsd@yahoo.com.ar
 
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 .if defined(WITH_FAM)
-LIB_DEPENDS=	fam:${PORTSDIR}/devel/fam
+LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
 .endif
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 pre-patch:
-	@find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC} -name "Makefile.in*" | xargs ${REINPLACE_CMD} -e \
+		's|[(]datadir[)]/gnome/|(datadir)/|g ; \
+		 s|[(]datadir[)]/locale|(prefix)/share/locale|g'
+.for AM in config.sub config.guess install-sh missing mkinstalldirs
+	${LN} -fs ${LOCALBASE}/share/automake14/automake/${AM} ${WRKSRC}/${AM}
+.endfor
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|[%][%]X11BASE[%][%]|${X11BASE}|g' \
+		${WRKSRC}/src/gnome-cmd-data.c
 
 .include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/distinfo b/x11-fm/gnome-commander2/distinfo
index 4f323b5464c4..da357026ea7c 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1 +1 @@
-MD5 (gnome-commander-0.9.6.tar.gz) = 350f0fdb6f17521d9b917dd879fdc1e7
+MD5 (gnome-commander-0.9.7-2.tar.gz) = ffd06b0d2d0168787eed8b6f34a12dce
diff --git a/x11-fm/gnome-commander2/files/patch-configure b/x11-fm/gnome-commander2/files/patch-configure
index 7bdfc044ab45..6af54855514c 100644
--- a/x11-fm/gnome-commander2/files/patch-configure
+++ b/x11-fm/gnome-commander2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Fri Apr 26 20:09:18 2002
-+++ configure	Fri Apr 26 20:09:42 2002
-@@ -4265,7 +4265,7 @@
+--- configure.old	Wed Jun 12 08:28:53 2002
++++ configure	Wed Jun 12 08:29:15 2002
+@@ -4627,7 +4627,7 @@
  if test "x${prefix}" = "xNONE"; then
    PACKAGE_PIXMAPS_DIR="${ac_default_prefix}/share/pixmaps/${PACKAGE}"
  else
diff --git a/x11-fm/gnome-commander2/files/patch-src_gnome-cmd-data.c b/x11-fm/gnome-commander2/files/patch-src_gnome-cmd-data.c
new file mode 100644
index 000000000000..972e8891eee2
--- /dev/null
+++ b/x11-fm/gnome-commander2/files/patch-src_gnome-cmd-data.c
@@ -0,0 +1,11 @@
+--- src/gnome-cmd-data.c.orig	Wed Jun  5 14:25:15 2002
++++ src/gnome-cmd-data.c	Mon Jun 17 17:36:33 2002
+@@ -520,7 +520,7 @@
+ 	data->priv->mime_scale_quality = get_int (
+ 		"/gnome-commander/options/mime_scale_quality", 3);
+ 	data->priv->mime_icon_dir = get_string (
+-		"/gnome-commander/options/mime_icon_dir", "/usr/share/pixmaps/nautilus/");
++		"/gnome-commander/options/mime_icon_dir", "%%X11BASE%%/share/gnome/pixmaps/nautilus/");
+ 	data->priv->cmdline_history_length = get_int (
+ 		"/gnome-commander/options/cmdline_history_length", 16);
+ 	
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index 8697a022aa65..97df13573c9a 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -1,4 +1,4 @@
-bin/gnome_commander
+bin/gnome-commander
 share/gnome/pixmaps/gnome-commander/32_gnome-cmd.png
 share/gnome/pixmaps/gnome-commander/cvs_fish.xpm
 share/gnome/pixmaps/gnome-commander/cvs_fish_small.xpm
@@ -30,7 +30,8 @@ share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_down.xpm
 share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_up.xpm
 share/gnome/pixmaps/gnome-commander/key.xpm
 share/gnome/pixmaps/gnome-commander/lock.xpm
-share/gnome/pixmaps/gnome-commander/logo.xpm
+share/gnome/pixmaps/gnome-commander/logo.png
+share/gnome/pixmaps/gnome-commander/logo.xcf
 share/gnome/pixmaps/gnome-commander/menu_cvs_add.xpm
 share/gnome/pixmaps/gnome-commander/menu_cvs_checkout.xpm
 share/gnome/pixmaps/gnome-commander/menu_cvs_commit.xpm
@@ -48,6 +49,7 @@ share/gnome/pixmaps/gnome-commander/mkdir.xpm
 share/gnome/pixmaps/gnome-commander/server.xpm
 share/locale/de/LC_MESSAGES/gnome-commander.mo
 share/locale/pl/LC_MESSAGES/gnome-commander.mo
+share/locale/ru/LC_MESSAGES/gnome-commander.mo
 share/locale/sk/LC_MESSAGES/gnome-commander.mo
 share/locale/sv/LC_MESSAGES/gnome-commander.mo
 @dirrm share/gnome/pixmaps/gnome-commander