From owner-freebsd-gnome@FreeBSD.ORG Mon Sep 15 09:56:36 2003 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 3856816A4BF; Mon, 15 Sep 2003 09:56:36 -0700 (PDT) Received: from demian.dhis.org (OL127-66.fibertel.com.ar [24.232.66.127]) by mx1.FreeBSD.org (Postfix) with ESMTP id 104E243FD7; Mon, 15 Sep 2003 09:56:34 -0700 (PDT) (envelope-from edy@demian.dhis.org) Received: from edy by demian.dhis.org with local (Exim 4.20) id 19yweC-0003vo-SA; Mon, 15 Sep 2003 13:56:20 -0300 Date: Mon, 15 Sep 2003 13:56:20 -0300 From: Edgardo Garcia Hoeffler To: Jens Rehsack Message-ID: <20030915165620.GA15093@demian.trantor.org> References: <200309021110.h82BAOQH020790@helo.liwing.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200309021110.h82BAOQH020790@helo.liwing.de> User-Agent: Mutt/1.4.1i Sender: Edgardo Garcia Hoeffler X-Spam-Score: -5.0 (-----) X-Scanner: exiscan for exim4 (http://duncanthrax.net/exiscan/) *19yweC-0003vo-SA*t6O9b9/IaEg* cc: gnome@freebsd.org cc: Stefan Weisswange cc: FreeBSD-gnats-submit@freebsd.org Subject: Re: [PATCH] update of x11-fm/gnome-commander to 1.0.1 X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Sep 2003 16:56:36 -0000 I don't use Gnome 1,x anymore so I'm no qualified to give an opinion about your patch. On Tue, Sep 02, 2003 at 11:10:24AM +0000, Jens Rehsack wrote: > > >Submitter-Id: current-users > >Originator: Jens Rehsack > >Organization: LiWing IT-Services > >Confidential: no > >Synopsis: [PATCH] update of x11-fm/gnome-commander to 1.0.1 > >Severity: non-critical > >Priority: medium > >Category: ports > >Class: update > >Release: FreeBSD 5.1-CURRENT i386 > >Environment: > System: FreeBSD statler 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Mon Sep 1 15:48:35 GMT 2003 root@statler:/usr/obj/usr/src/sys/STATLER i386 > > > > >Description: > > >How-To-Repeat: > > >Fix: > > > > --- patch-update begins here --- > Index: x11-fm/gnome-commander/distinfo > =================================================================== > diff -u x11-fm/gnome-commander/distinfo.orig x11-fm/gnome-commander/distinfo > --- x11-fm/gnome-commander/distinfo.orig Wed Jun 19 17:35:15 2002 > +++ x11-fm/gnome-commander/distinfo Tue Sep 2 10:21:09 2003 > @@ -1 +1 @@ > -MD5 (gnome-commander-0.9.7-2.tar.gz) = ffd06b0d2d0168787eed8b6f34a12dce > +MD5 (gnome-commander-1.0.1.tar.bz2) = 8cd05cbed01290c1af66122c8b27b7dc > Index: x11-fm/gnome-commander/Makefile > =================================================================== > diff -u x11-fm/gnome-commander/Makefile.orig x11-fm/gnome-commander/Makefile > --- x11-fm/gnome-commander/Makefile.orig Sun Apr 20 19:51:48 2003 > +++ x11-fm/gnome-commander/Makefile Tue Sep 2 11:01:54 2003 > @@ -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 > 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-fetch:: > +.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-commander/pkg-plist > =================================================================== > diff -u x11-fm/gnome-commander/pkg-plist.orig x11-fm/gnome-commander/pkg-plist > --- x11-fm/gnome-commander/pkg-plist.orig Wed Jun 19 17:35:15 2002 > +++ x11-fm/gnome-commander/pkg-plist Tue Sep 2 10:21:05 2003 > @@ -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 > Index: x11-fm/gnome-commander/pkg-descr > =================================================================== > diff -u x11-fm/gnome-commander/pkg-descr.orig x11-fm/gnome-commander/pkg-descr > --- x11-fm/gnome-commander/pkg-descr.orig Mon Apr 29 18:17:08 2002 > +++ x11-fm/gnome-commander/pkg-descr Tue Sep 2 10:21:05 2003 > @@ -5,4 +5,4 @@ > 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/ > Index: x11-fm/gnome-commander/files/patch-configure > =================================================================== > diff -uN x11-fm/gnome-commander/files/patch-configure > --- x11-fm/gnome-commander/files/patch-configure Tue Sep 2 10:22:01 2003 > +++ /dev/null Tue Sep 2 11:04:19 2003 > @@ -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\\\"" > Index: x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c > =================================================================== > diff -uN x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c > --- x11-fm/gnome-commander/files/patch-src_gnome-cmd-data.c Tue Sep 2 10:22:01 2003 > +++ /dev/null Tue Sep 2 11:04:19 2003 > @@ -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); > - > Index: x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c > =================================================================== > diff -uN x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c > --- /dev/null Tue Sep 2 11:04:19 2003 > +++ x11-fm/gnome-commander/files/patch-src::gnome-cmd-connection.c Tue Sep 2 10:21:55 2003 > @@ -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 > +-#include > + #include "gnome-cmd-includes.h" > + #include "gnome-cmd-connection-funcs.h" > + #include "gnome-cmd-dir-funcs.h" > Index: x11-fm/gnome-commander/files/patch-configure.in > =================================================================== > diff -uN x11-fm/gnome-commander/files/patch-configure.in > --- /dev/null Tue Sep 2 11:04:19 2003 > +++ x11-fm/gnome-commander/files/patch-configure.in Tue Sep 2 10:21:55 2003 > @@ -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 > + > + > --- patch-update ends here --- >