5 files changed, 47 insertions, 47 deletions

diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index c2e1c72c480d..05ad52ca30ff 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -6,37 +6,24 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1.6
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-commander/1.0/
+MASTER_SITE_SUBDIR=	sources/gnome-commander/1.1
+PKGNAMESUFFIX=	2
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	rehsack@liwing.de
-COMMENT=	File manager for Gnome
+COMMENT=	File manager for Gnome2
 
-.if defined(WITH_FAM)
-LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
-.else
-CONFIGURE_ARGS=	--without-fam
-.endif
-
-CONFLICTS=	gnome-commander2-*
+CONFLICTS=	gnome-commander-*
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf
+USE_GNOME=	gnomeprefix gnomehack gnometarget libgnomeui lthack
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
 
-pre-everything::
-.if !defined(WITH_FAM)
-	@${ECHO} ""
-	@${ECHO} "	Define WITH_FAM to add support for the"
-	@${ECHO} "	'file alteration monitor' fam"
-	@${ECHO} ""
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-fm/gnome-commander2/distinfo b/x11-fm/gnome-commander2/distinfo
index dd01b28aed61..1569d0b3aa0e 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-commander-1.0.1.tar.bz2) = 8cd05cbed01290c1af66122c8b27b7dc
-SIZE (gnome-commander-1.0.1.tar.bz2) = 423714
+MD5 (gnome2/gnome-commander-1.1.6.tar.bz2) = 972e976ea01663f5b60e8a16721a5348
+SIZE (gnome2/gnome-commander-1.1.6.tar.bz2) = 600318
diff --git a/x11-fm/gnome-commander2/files/patch-configure b/x11-fm/gnome-commander2/files/patch-configure
index 7921d595f0c7..d2b59243a68d 100644
--- a/x11-fm/gnome-commander2/files/patch-configure
+++ b/x11-fm/gnome-commander2/files/patch-configure
@@ -1,18 +1,11 @@
---- configure.orig	Fri Oct 24 00:59:12 2003
-+++ configure	Fri Oct 24 00:59:25 2003
-@@ -9397,13 +9397,13 @@
- if test "x${prefix}" = "xNONE"; then
+--- configure.orig	Wed Jun 16 02:32:23 2004
++++ configure	Wed Jun 16 02:33:14 2004
+@@ -9609,7 +9609,7 @@
  
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${ac_default_prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${ac_default_prefix}/share/gnome/pixmaps/${PACKAGE}"
- _ACEOF
- 
- else
  
  cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${prefix}/share/pixmaps/${PACKAGE}"
-+#define PIXMAPS_DIR "${prefix}/share/gnome/pixmaps/${PACKAGE}"
+-#define PIXMAPS_DIR "${PREFIX}/share/pixmaps/${PACKAGE}"
++#define PIXMAPS_DIR "${PREFIX}/share/gnome/pixmaps/${PACKAGE}"
  _ACEOF
  
- fi
+ 
diff --git a/x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c b/x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c
deleted file mode 100644
index dea0efea2b2e..000000000000
--- a/x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gnome-cmd-connection.c.orig	Tue Aug 19 16:07:51 2003
-+++ src/gnome-cmd-connection.c	Tue Aug 19 16:08:00 2003
-@@ -17,7 +17,6 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */ 
- #include <config.h>
--#include <mntent.h>
- #include "gnome-cmd-includes.h"
- #include "gnome-cmd-connection-funcs.h"
- #include "gnome-cmd-dir-funcs.h"
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index 7014bc0ccfd4..09070b29b1cb 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -1,11 +1,29 @@
+bin/gcmd-block
 bin/gnome-commander
-share/gnome/apps/Applications/gnome-commander.desktop
+lib/gnome-commander/libgcmd.a
+lib/gnome-commander/libgcmd.la
+lib/gnome-commander/libgcmd.so
+lib/gnome-commander/libgcmd.so.0
+lib/gnome-commander/plugins/libcvs.a
+lib/gnome-commander/plugins/libcvs.la
+lib/gnome-commander/plugins/libcvs.so
+lib/gnome-commander/plugins/libcvs.so.0
+lib/gnome-commander/plugins/libfileroller.a
+lib/gnome-commander/plugins/libfileroller.la
+lib/gnome-commander/plugins/libfileroller.so
+lib/gnome-commander/plugins/libfileroller.so.0
+lib/gnome-commander/plugins/libtest.a
+lib/gnome-commander/plugins/libtest.la
+lib/gnome-commander/plugins/libtest.so
+lib/gnome-commander/plugins/libtest.so.0
+share/gnome/applications/gnome-commander.desktop
 share/gnome/pixmaps/gnome-commander/device-icons/burner.xpm
 share/gnome/pixmaps/gnome-commander/device-icons/camera.xpm
 share/gnome/pixmaps/gnome-commander/device-icons/cdrom.xpm
 share/gnome/pixmaps/gnome-commander/device-icons/floppy.xpm
 share/gnome/pixmaps/gnome-commander/device-icons/zip.xpm
 share/gnome/pixmaps/gnome-commander/exec.xpm
+share/gnome/pixmaps/gnome-commander/exec_wheel.xpm
 share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_block_device.xpm
 share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_char_device.xpm
 share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_dir.xpm
@@ -41,7 +59,9 @@ share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.wri
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-anjuta-project.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-arj.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip-compressed-tar.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-bzip.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed-tar.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-compressed.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-dia-diagram.png
 share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-executable-binary.png
@@ -78,14 +98,24 @@ share/gnome/pixmaps/gnome-commander/root_dir.xpm
 share/gnome/pixmaps/gnome-commander/server.xpm
 share/gnome/pixmaps/gnome-commander/smb-computer.xpm
 share/gnome/pixmaps/gnome-commander/smb-network.xpm
+share/gnome/pixmaps/gnome-commander/toggle_horizontal.xpm
+share/gnome/pixmaps/gnome-commander/toggle_vertical.xpm
+share/locale/ca/LC_MESSAGES/gnome-commander.mo
+share/locale/cs/LC_MESSAGES/gnome-commander.mo
 share/locale/de/LC_MESSAGES/gnome-commander.mo
 share/locale/es/LC_MESSAGES/gnome-commander.mo
 share/locale/fr/LC_MESSAGES/gnome-commander.mo
+share/locale/nl/LC_MESSAGES/gnome-commander.mo
 share/locale/pl/LC_MESSAGES/gnome-commander.mo
+share/locale/pt/LC_MESSAGES/gnome-commander.mo
 share/locale/ru/LC_MESSAGES/gnome-commander.mo
 share/locale/sk/LC_MESSAGES/gnome-commander.mo
+share/locale/sr/LC_MESSAGES/gnome-commander.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-commander.mo
 share/locale/sv/LC_MESSAGES/gnome-commander.mo
+@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
 @dirrm share/gnome/pixmaps/gnome-commander/file-type-icons
 @dirrm share/gnome/pixmaps/gnome-commander/device-icons
-@dirrm share/gnome/pixmaps/gnome-commander/mime-icons
 @dirrm share/gnome/pixmaps/gnome-commander
+@dirrm lib/gnome-commander/plugins
+@dirrm lib/gnome-commander