* Update to 1.0.1 [1]

* Revert maintainer to ports@ (previous maintainer no longer uses GNOME)

PR:		56306
Submitted by:	Jens Rehsack <rehsack@liwing.de> [1]

16 files changed, 234 insertions, 152 deletions

diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index d04b36d1d736..f0c2035f0244 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -6,33 +6,36 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	0.9.7
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	http://freesoftware.fsf.org/download/gcmd/gcmd.pkg/0.9.7/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
+MASTER_SITES=	http://savannah.nongnu.org/download/gcmd/gcmd.pkg/${PORTVERSION}/
 
-MAINTAINER=	edybsd@yahoo.com.ar
+MAINTAINER=	ports@freebsd.org
 COMMENT=	File manager for Gnome
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 .if defined(WITH_FAM)
 LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
+.else
+CONFIGURE_ARGS=	--without-fam
 .endif
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomevfs gnomelibs gdkpixbuf
-USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomevfs gnomelibs gdkpixbuf gtk12
 GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+USE_AUTOMAKE=	yes
 WANT_AUTOMAKE_VER=	14
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
 
-post-patch:
-.for AM in config.sub config.guess install-sh missing mkinstalldirs
-	${LN} -fs ${AUTOMAKE_DIR}/${AM} ${WRKSRC}/${AM}
-.endfor
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/gnome-cmd-data.c
+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-commander/distinfo b/x11-fm/gnome-commander/distinfo
index da357026ea7c..702f2d334b0a 100644
--- a/x11-fm/gnome-commander/distinfo
+++ b/x11-fm/gnome-commander/distinfo
@@ -1 +1 @@
-MD5 (gnome-commander-0.9.7-2.tar.gz) = ffd06b0d2d0168787eed8b6f34a12dce
+MD5 (gnome-commander-1.0.1.tar.bz2) = 8cd05cbed01290c1af66122c8b27b7dc
diff --git a/x11-fm/gnome-commander/files/patch-configure b/x11-fm/gnome-commander/files/patch-configure
deleted file mode 100644
index 6af54855514c..000000000000
--- a/x11-fm/gnome-commander/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--  PACKAGE_PIXMAPS_DIR="${prefix}/share/pixmaps/${PACKAGE}"
-+  PACKAGE_PIXMAPS_DIR="${datadir}/pixmaps/${PACKAGE}"
- fi
- 
- PIXMAPS_DIR="-DPIXMAPS_DIR=\\\"$PACKAGE_PIXMAPS_DIR\\\""
diff --git a/x11-fm/gnome-commander/files/patch-configure.in b/x11-fm/gnome-commander/files/patch-configure.in
new file mode 100644
index 000000000000..d54e713f048b
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-configure.in
@@ -0,0 +1,14 @@
+--- configure.in.orig	Tue Aug 19 16:49:03 2003
++++ configure.in	Tue Aug 19 16:49:37 2003
+@@ -117,9 +117,9 @@
+ 		
+ dnl Set PIXMAPS_DIR in config.h.
+ if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/share/pixmaps/${PACKAGE}", [pixmaps location])
++  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/share/gnome/pixmaps/${PACKAGE}", [pixmaps location])
+ else
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/share/pixmaps/${PACKAGE}", [pixmaps location])
++  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/share/gnome/pixmaps/${PACKAGE}", [pixmaps location])
+ fi
+ 
+ 		
diff --git a/x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c b/x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c
new file mode 100644
index 000000000000..dea0efea2b2e
--- /dev/null
+++ b/x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c
@@ -0,0 +1,10 @@
+--- 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-commander/files/patch-src_gnome-cmd-data.c b/x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c
deleted file mode 100644
index 972e8891eee2..000000000000
--- a/x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-commander/pkg-descr b/x11-fm/gnome-commander/pkg-descr
index 7f79980a0865..1e9e56c7c19b 100644
--- a/x11-fm/gnome-commander/pkg-descr
+++ b/x11-fm/gnome-commander/pkg-descr
@@ -5,4 +5,4 @@ detect changes to files caused by other programs and update the views without
 the need for the user to manually reload. The program also supports 
 Copy & Paste as well as Drag & Drop.
 
-WWW: http://gnome-commander.sourceforge.net/
+WWW: http://www.nongnu.org/gcmd/
diff --git a/x11-fm/gnome-commander/pkg-plist b/x11-fm/gnome-commander/pkg-plist
index 97df13573c9a..7014bc0ccfd4 100644
--- a/x11-fm/gnome-commander/pkg-plist
+++ b/x11-fm/gnome-commander/pkg-plist
@@ -1,55 +1,91 @@
 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
+share/gnome/apps/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/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_block_device_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_char_device_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file_type_dir_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_exe_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file_type_fifo_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file_type_regular_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file_type_socket_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_dir.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_regular.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_socket.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
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
 share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/gnome-cmd.png
-share/gnome/pixmaps/gnome-commander/gnome-cmd.xpm
+share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
+share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/gnome/pixmaps/gnome-commander/gcmd-icon1.png
+share/gnome/pixmaps/gnome-commander/gcmd-icon1.xpm
+share/gnome/pixmaps/gnome-commander/gcmd-icon2.png
+share/gnome/pixmaps/gnome-commander/gcmd-icon3.xpm
 share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
 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/home.xpm
 share/gnome/pixmaps/gnome-commander/key.xpm
 share/gnome/pixmaps/gnome-commander/lock.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
-share/gnome/pixmaps/gnome-commander/menu_cvs_commit_all.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_diff.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_import.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_log.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_login.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_logout.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_remove.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_update.xpm
+share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
 share/gnome/pixmaps/gnome-commander/menu_ftp_connect.xpm
 share/gnome/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+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.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
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
 share/gnome/pixmaps/gnome-commander/mkdir.xpm
+share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
+share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
+share/gnome/pixmaps/gnome-commander/parent_dir.xpm
+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/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/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/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
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index d04b36d1d736..f0c2035f0244 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -6,33 +6,36 @@
 #
 
 PORTNAME=	gnome-commander
-PORTVERSION=	0.9.7
+PORTVERSION=	1.0.1
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	http://freesoftware.fsf.org/download/gcmd/gcmd.pkg/0.9.7/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
+MASTER_SITES=	http://savannah.nongnu.org/download/gcmd/gcmd.pkg/${PORTVERSION}/
 
-MAINTAINER=	edybsd@yahoo.com.ar
+MAINTAINER=	ports@freebsd.org
 COMMENT=	File manager for Gnome
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 .if defined(WITH_FAM)
 LIB_DEPENDS=	fam.0:${PORTSDIR}/devel/fam
+.else
+CONFIGURE_ARGS=	--without-fam
 .endif
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomevfs gnomelibs gdkpixbuf
-USE_REINPLACE=	yes
+USE_BZIP2=	yes
+USE_GNOME=	gnomeprefix gnomehack gnomevfs gnomelibs gdkpixbuf gtk12
 GNU_CONFIGURE=	yes
+WANT_AUTOCONF_VER=	253
+USE_AUTOMAKE=	yes
 WANT_AUTOMAKE_VER=	14
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lintl"
 
-post-patch:
-.for AM in config.sub config.guess install-sh missing mkinstalldirs
-	${LN} -fs ${AUTOMAKE_DIR}/${AM} ${WRKSRC}/${AM}
-.endfor
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/gnome-cmd-data.c
+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 da357026ea7c..702f2d334b0a 100644
--- a/x11-fm/gnome-commander2/distinfo
+++ b/x11-fm/gnome-commander2/distinfo
@@ -1 +1 @@
-MD5 (gnome-commander-0.9.7-2.tar.gz) = ffd06b0d2d0168787eed8b6f34a12dce
+MD5 (gnome-commander-1.0.1.tar.bz2) = 8cd05cbed01290c1af66122c8b27b7dc
diff --git a/x11-fm/gnome-commander2/files/patch-configure b/x11-fm/gnome-commander2/files/patch-configure
deleted file mode 100644
index 6af54855514c..000000000000
--- a/x11-fm/gnome-commander2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
--  PACKAGE_PIXMAPS_DIR="${prefix}/share/pixmaps/${PACKAGE}"
-+  PACKAGE_PIXMAPS_DIR="${datadir}/pixmaps/${PACKAGE}"
- fi
- 
- PIXMAPS_DIR="-DPIXMAPS_DIR=\\\"$PACKAGE_PIXMAPS_DIR\\\""
diff --git a/x11-fm/gnome-commander2/files/patch-configure.in b/x11-fm/gnome-commander2/files/patch-configure.in
new file mode 100644
index 000000000000..d54e713f048b
--- /dev/null
+++ b/x11-fm/gnome-commander2/files/patch-configure.in
@@ -0,0 +1,14 @@
+--- configure.in.orig	Tue Aug 19 16:49:03 2003
++++ configure.in	Tue Aug 19 16:49:37 2003
+@@ -117,9 +117,9 @@
+ 		
+ dnl Set PIXMAPS_DIR in config.h.
+ if test "x${prefix}" = "xNONE"; then
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/share/pixmaps/${PACKAGE}", [pixmaps location])
++  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${ac_default_prefix}/share/gnome/pixmaps/${PACKAGE}", [pixmaps location])
+ else
+-  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/share/pixmaps/${PACKAGE}", [pixmaps location])
++  AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${prefix}/share/gnome/pixmaps/${PACKAGE}", [pixmaps location])
+ 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
new file mode 100644
index 000000000000..dea0efea2b2e
--- /dev/null
+++ b/x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c
@@ -0,0 +1,10 @@
+--- 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/files/patch-src_gnome-cmd-data.c b/x11-fm/gnome-commander2/files/patch-src_gnome-cmd-data.c
deleted file mode 100644
index 972e8891eee2..000000000000
--- a/x11-fm/gnome-commander2/files/patch-src_gnome-cmd-data.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-descr b/x11-fm/gnome-commander2/pkg-descr
index 7f79980a0865..1e9e56c7c19b 100644
--- a/x11-fm/gnome-commander2/pkg-descr
+++ b/x11-fm/gnome-commander2/pkg-descr
@@ -5,4 +5,4 @@ detect changes to files caused by other programs and update the views without
 the need for the user to manually reload. The program also supports 
 Copy & Paste as well as Drag & Drop.
 
-WWW: http://gnome-commander.sourceforge.net/
+WWW: http://www.nongnu.org/gcmd/
diff --git a/x11-fm/gnome-commander2/pkg-plist b/x11-fm/gnome-commander2/pkg-plist
index 97df13573c9a..7014bc0ccfd4 100644
--- a/x11-fm/gnome-commander2/pkg-plist
+++ b/x11-fm/gnome-commander2/pkg-plist
@@ -1,55 +1,91 @@
 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
+share/gnome/apps/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/file_type_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_block_device_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_char_device_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_dir.xpm
-share/gnome/pixmaps/gnome-commander/file_type_dir_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_exe_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file_type_fifo_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_regular.xpm
-share/gnome/pixmaps/gnome-commander/file_type_regular_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_socket.xpm
-share/gnome/pixmaps/gnome-commander/file_type_socket_big.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_block_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_char_device.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_dir.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_fifo.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_regular.xpm
-share/gnome/pixmaps/gnome-commander/file_type_sym_socket.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
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_fifo.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_regular.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_socket.xpm
+share/gnome/pixmaps/gnome-commander/file-type-icons/file_type_symlink.xpm
 share/gnome/pixmaps/gnome-commander/ftp.xpm
-share/gnome/pixmaps/gnome-commander/gnome-cmd.png
-share/gnome/pixmaps/gnome-commander/gnome-cmd.xpm
+share/gnome/pixmaps/gnome-commander/ftp_connect.xpm
+share/gnome/pixmaps/gnome-commander/ftp_disconnect.xpm
+share/gnome/pixmaps/gnome-commander/gcmd-icon1.png
+share/gnome/pixmaps/gnome-commander/gcmd-icon1.xpm
+share/gnome/pixmaps/gnome-commander/gcmd-icon2.png
+share/gnome/pixmaps/gnome-commander/gcmd-icon3.xpm
 share/gnome/pixmaps/gnome-commander/gnome_cmd_arrow_blank.xpm
 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/home.xpm
 share/gnome/pixmaps/gnome-commander/key.xpm
 share/gnome/pixmaps/gnome-commander/lock.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
-share/gnome/pixmaps/gnome-commander/menu_cvs_commit_all.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_diff.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_import.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_log.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_login.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_logout.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_remove.xpm
-share/gnome/pixmaps/gnome-commander/menu_cvs_update.xpm
+share/gnome/pixmaps/gnome-commander/menu_bookmark.xpm
 share/gnome/pixmaps/gnome-commander/menu_ftp_connect.xpm
 share/gnome/pixmaps/gnome-commander/menu_ftp_disconnect.xpm
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-msword.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-pdf.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-postscript.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-excel.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.ms-powerpoint.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.calc.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.draw.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.impress.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-vnd.sun.xml.writer.math.png
+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.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
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-glade.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gnumeric.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-gzip.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-mrproject.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-ogg.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-x-rpm.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-application-zip.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-audio-x-mp3.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-compressed.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-image-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-html.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c-header.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-c.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-text-x-sh.png
+share/gnome/pixmaps/gnome-commander/mime-icons/gnome-video-plain.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-blockdev.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-chardev.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-directory.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-fifo.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-music.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-regular.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-socket.png
+share/gnome/pixmaps/gnome-commander/mime-icons/i-symlink.png
 share/gnome/pixmaps/gnome-commander/mkdir.xpm
+share/gnome/pixmaps/gnome-commander/overlay_symlink.xpm
+share/gnome/pixmaps/gnome-commander/overlay_umount.xpm
+share/gnome/pixmaps/gnome-commander/parent_dir.xpm
+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/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/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/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