From owner-freebsd-gnome@FreeBSD.ORG Mon Jun 7 13:21:05 2004 Return-Path: Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5911716A4E5; Mon, 7 Jun 2004 13:21:05 +0000 (GMT) Received: from helo.liwing.de (helo.liwing.de [213.70.188.163]) by mx1.FreeBSD.org (Postfix) with ESMTP id ECBBB43D1D; Mon, 7 Jun 2004 13:21:03 +0000 (GMT) (envelope-from root@helo.liwing.de) Received: from helo.liwing.de (localhost.liwing.de [127.0.0.1]) by helo.liwing.de (8.12.9p2/8.12.9) with ESMTP id i57DKxx5030812; Mon, 7 Jun 2004 13:21:00 GMT (envelope-from root@helo.liwing.de) Received: (from root@localhost) by helo.liwing.de (8.12.9p2/8.12.9/Submit) id i57DKwJK030811; Mon, 7 Jun 2004 13:20:58 GMT (envelope-from root) Date: Mon, 7 Jun 2004 13:20:58 GMT Message-Id: <200406071320.i57DKwJK030811@helo.liwing.de> To: FreeBSD-gnats-submit@freebsd.org From: Jens Rehsack X-send-pr-version: 3.113 X-GNATS-Notify: cc: gnome@freebsd.org cc: Jens Rehsack Subject: [new port] x11-fm/gnome-commander2 as diff to x11-fm/gnome-commander (requires repo-copy) X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jens Rehsack List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2004 13:21:05 -0000 >Submitter-Id: current-users >Originator: Jens Rehsack >Organization: LiWing IT-Services >Confidential: no >Synopsis: [new port] x11-fm/gnome-commander2 as diff to x11-fm/gnome-commander (requires repo-copy) >Severity: non-critical >Priority: low >Category: ports >Class: maintainer-update >Release: FreeBSD 5.2-CURRENT i386 >Environment: System: FreeBSD statler 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon May 17 08:44:19 GMT 2004 root@statler:/usr/obj/usr/src/sys/STATLER i386 >Description: This is an update of the filemanager x11-fm/gnome-commander to it's current development branch 1.1.6 which supports gnome2 instead of gnome1. I try it for a long time before submitting this PR but I think the time has come, the version 1.1.6 is very stable and didn't make any problems over 2 month for me. Please create a repo-copy of the current x11-fm/gnome-commander to x11-fm/gnome-commander2 and apply the patch for it. Removed file (no need to copy maybe): - x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c >How-To-Repeat: >Fix: --- patch-repoNew-gnomecommander2 begins here --- Index: x11-fm/gnome-commander2/Makefile =================================================================== diff -u x11-fm/gnome-commander2/Makefile.orig x11-fm/gnome-commander2/Makefile --- x11-fm/gnome-commander2/Makefile.orig Mon Jun 7 10:36:19 2004 +++ x11-fm/gnome-commander2/Makefile Mon Jun 7 13:12:46 2004 @@ -6,34 +6,25 @@ # PORTNAME= gnome-commander -PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTVERSION= 1.1.6 CATEGORIES= x11-fm gnome -MASTER_SITES= http://savannah.nongnu.org/download/gcmd/gcmd.pkg/${PORTVERSION}/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/gnome-commander/1.1 +PKGNAMESUFFIX= 2 +DIST_SUBDIR= gnome2 MAINTAINER= rehsack@liwing.de COMMENT= File manager for Gnome -.if defined(WITH_FAM) -LIB_DEPENDS= fam.0:${PORTSDIR}/devel/fam -.else -CONFIGURE_ARGS= --without-fam -.endif +CONFLICTS= gnome-commander-1.0* USE_X_PREFIX= yes USE_GMAKE= yes USE_BZIP2= yes -USE_GNOME= gnomeprefix gnomehack gnometarget gnomevfs gnomelibs gdkpixbuf +USE_GNOME= gnomeprefix gnomehack gnometarget gnomevfs2 libgnome \ + libgnomeui glib20 gtk20 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 Index: x11-fm/gnome-commander2/distinfo =================================================================== diff -u x11-fm/gnome-commander2/distinfo.orig x11-fm/gnome-commander2/distinfo --- x11-fm/gnome-commander2/distinfo.orig Mon Jun 7 10:36:19 2004 +++ x11-fm/gnome-commander2/distinfo Mon Jun 7 10:40:07 2004 @@ -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 Index: x11-fm/gnome-commander2/pkg-plist =================================================================== diff -u x11-fm/gnome-commander2/pkg-plist.orig x11-fm/gnome-commander2/pkg-plist --- x11-fm/gnome-commander2/pkg-plist.orig Mon Jun 7 10:36:19 2004 +++ x11-fm/gnome-commander2/pkg-plist Mon Jun 7 13:04:59 2004 @@ -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.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/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 Index: x11-fm/gnome-commander2/files/patch-configure =================================================================== diff -u x11-fm/gnome-commander2/files.orig/patch-configure x11-fm/gnome-commander2/files/patch-configure --- x11-fm/gnome-commander2/files/patch-configure Mon Jun 7 10:36:19 2004 +++ x11-fm/gnome-commander2/files/patch-configure Mon Jun 7 11:00:31 2004 @@ -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 Mon Jun 7 10:59:02 2004 ++++ configure Mon Jun 7 10:59:49 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 + Index: x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c =================================================================== diff -uN x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c --- x11-fm/gnome-commander2/files/patch-src::gnome-cmd-connection.c Mon Jun 7 10:36:19 2004 +++ /dev/null Mon Jun 7 13:11:00 2004 @@ -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 --#include - #include "gnome-cmd-includes.h" - #include "gnome-cmd-connection-funcs.h" - #include "gnome-cmd-dir-funcs.h" --- patch-repoNew-gnomecommander2 ends here ---