Date: Sun, 7 Mar 1999 02:35:29 +0200 (SAT) From: reg@shale.csir.co.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10448: Port update: x11-fm/gnomemc Message-ID: <199903070035.CAA43873@shale.csir.co.za>
next in thread | raw e-mail | index | archive | help
>Number: 10448
>Category: ports
>Synopsis: Port update: x11-fm/gnomemc
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Mar 6 16:40:00 PST 1999
>Closed-Date:
>Last-Modified:
>Originator: Jeremy Lea
>Release: FreeBSD 4.0-CURRENT i386
>Organization:
Arb's Inc.
>Environment:
FreeBSD Ports Collection.
>Description:
Upgrade to mc-4.5.23.
>How-To-Repeat:
Only the usual... updated bsd.port.mk.
>Fix:
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/Makefile ./Makefile
--- /usr/ports.ref/x11-fm/gnomemc/Makefile Fri Feb 12 10:49:25 1999
+++ ./Makefile Sun Mar 7 02:15:55 1999
@@ -1,16 +1,16 @@
# New ports collection makefile for: gnomemc
-# Version required: 4.5.10
+# Version required: 4.5.23
# Date created: 26 Jnuary 1999
# Whom: Jeremy Lea <reg@shale.csir.co.za>
#
# $Id: Makefile,v 1.2 1999/02/12 02:33:17 asami Exp $
#
-DISTNAME= mc-4.5.10
-PKGNAME= gnomemc-4.5.10
+DISTNAME= mc-4.5.23
+PKGNAME= gnomemc-4.5.23
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= mc
+MASTER_SITE_SUBDIR= gnome-1.0/sources
MAINTAINER= reg@shale.csir.co.za
@@ -18,7 +18,7 @@
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore
# implicit dependencies:
-# gettext, glib11-devel, xpm, gnomelibs
+# gettext, glib12, xpm, gnomelibs
USE_X_PREFIX= yes
USE_GMAKE= yes
@@ -28,7 +28,7 @@
--without-edit -with-ncurses
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
MAKE="gmake" \
- GLIB_CONFIG="${LOCALBASE}/bin/glib11d-config" \
+ GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lxpg4"
.include <bsd.port.mk>
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/files/md5 ./files/md5
--- /usr/ports.ref/x11-fm/gnomemc/files/md5 Fri Feb 12 10:49:25 1999
+++ ./files/md5 Mon Mar 1 14:40:57 1999
@@ -1 +1 @@
-MD5 (mc-4.5.10.tar.gz) = 13d941d11913d18b05a71df45d5d86ed
+MD5 (mc-4.5.23.tar.gz) = 9953d8a88957e814a25e8ee364739318
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/patches/patch-aa ./patches/patch-aa
--- /usr/ports.ref/x11-fm/gnomemc/patches/patch-aa Sun Jan 31 22:57:11 1999
+++ ./patches/patch-aa Tue Feb 23 00:59:17 1999
@@ -1,6 +1,6 @@
---- configure.orig Wed Jan 27 00:01:05 1999
-+++ configure Wed Jan 27 00:01:25 1999
-@@ -3188,15 +3188,15 @@
+--- configure.orig Tue Feb 16 05:58:53 1999
++++ configure Tue Feb 23 00:58:48 1999
+@@ -3269,15 +3269,15 @@
fi
@@ -22,7 +22,7 @@
fi
if test "$XGETTEXT" != ":"; then
-@@ -10362,7 +10362,7 @@
+@@ -10553,7 +10553,7 @@
if test -f /usr/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
@@ -31,12 +31,12 @@
CURSES_INCLUDEDIR=""
search_ncurses=false
screen_manager="ncurses on /usr/include"
-@@ -10676,6 +10676,8 @@
- fi
- done
+@@ -10681,6 +10681,8 @@
+ fi
+ fi
+CFLAGS="$CFLAGS $CURSES_INCLUDEDIR"
+LIBS="$LIBS $CURSES_LIBS"
- if test "x$screen_manager" = "xunknown"; then
- cat >> confdefs.h <<\EOF
+ if $search_ncurses
+ then
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/patches/patch-ac ./patches/patch-ac
--- /usr/ports.ref/x11-fm/gnomemc/patches/patch-ac Sun Jan 31 22:57:11 1999
+++ ./patches/patch-ac Thu Feb 25 18:29:49 1999
@@ -1,22 +1,24 @@
---- Make.common.in.orig Tue Jan 26 22:36:55 1999
-+++ Make.common.in Tue Jan 26 22:40:12 1999
-@@ -19,15 +19,15 @@
+--- Make.common.in.orig Thu Feb 25 08:53:30 1999
++++ Make.common.in Thu Feb 25 18:29:33 1999
+@@ -19,17 +19,17 @@
bindir = @bindir@
sysconfdir = @sysconfdir@
corbadir = $(sysconfdir)/CORBA/servers
-libdir = $(exec_prefix)/lib/mc
-+libdir = @localstatedir@/mc
-idldir = $(prefix)/share/idl
++libdir = @localstatedir@/mc
+idldir = @localstatedir@/idl
suppbindir = $(libdir)/bin
-gnewdir = $(prefix)/share/mc/templates
+gnewdir = $(libdir)/templates
tidir = $(libdir)/term
extfsdir = $(libdir)/extfs
+ confdir = $(prefix)/etc
datadir = @datadir@
icondir = $(datadir)/pixmaps/mc
+ gnomeicondir = @gnomeicondir@
-localedir = $(datadir)/locale
+localedir = $(prefix)/share/locale
- basemandir = @mandir@
- mandir = $(basemandir)/man1
+ mandir = @mandir@
+ man1dir = $(mandir)/man1
manext = 1
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/patches/patch-ad ./patches/patch-ad
--- /usr/ports.ref/x11-fm/gnomemc/patches/patch-ad Fri Feb 12 20:18:01 1999
+++ ./patches/patch-ad Fri Feb 19 01:44:20 1999
@@ -1,11 +1,11 @@
---- gnome/gtools.c.orig Tue Feb 2 16:10:31 1999
-+++ gnome/gtools.c Tue Feb 2 16:10:41 1999
-@@ -4,7 +4,7 @@
- * Written by Miguel de Icaza
- */
- #include <config.h>
+--- gnome/gtools.c.orig Tue Feb 16 01:29:19 1999
++++ gnome/gtools.c Fri Feb 19 01:43:53 1999
+@@ -13,7 +13,7 @@
+ #undef HAVE_LIBGPM
+ #include "mouse.h"
+ #include "key.h"
-#include "myslang.h"
+#include "tty.h"
- #include <gnome.h>
- #include <gdk/gdkkeysyms.h>
- #include <string.h>
+ #include "widget.h"
+ #include "wtools.h"
+ #include "dialog.h"
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/patches/patch-af ./patches/patch-af
--- /usr/ports.ref/x11-fm/gnomemc/patches/patch-af Sun Jan 31 22:57:11 1999
+++ ./patches/patch-af Mon Mar 1 14:44:39 1999
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Jan 26 19:51:29 1999
-+++ Makefile.in Tue Jan 26 19:54:31 1999
+--- Makefile.in.orig Tue Feb 16 01:29:07 1999
++++ Makefile.in Fri Feb 19 01:45:58 1999
@@ -5,7 +5,7 @@
@MCFGR@@MCF@
@@ -10,7 +10,7 @@
alldirs=$(unixdirs) $(foreigndirs)
subdirs=$(alldirs)
@@ -46,8 +46,6 @@
- install: installdirs @vcs@
+ install: installdirs
@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
@@ -20,21 +20,21 @@
@@ -58,12 +56,9 @@
installdirs:
- $(mcsrcdir)/xmkdir $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
- $(mcsrcdir)/xmkdir $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
-- $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-- $(mcsrcdir)/xmkdir $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
-+ $(mcsrcdir)/xmkdir $(DESTDIR)$(icondir)
-+ $(mcsrcdir)/xmkdir $(DESTDIR)$(extfsdir)
- $(mcsrcdir)/xmkdir $(DESTDIR)$(idldir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
+- $(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(icondir)
++ $(MKINSTALLDIRS) $(DESTDIR)$(extfsdir)
+ $(MKINSTALLDIRS) $(DESTDIR)$(idldir)
-
-mcfninstall:
- -/bin/sh ./mcfn_install
uninstall:
@for I in $(unixdirs); do cd $$I; $(MAKE) $@ || exit 1; cd ..; done
---- lib/Makefile.in.orig Tue Jan 19 00:44:08 1999
-+++ lib/Makefile.in Thu Jan 28 15:45:04 1999
+--- lib/Makefile.in.orig Mon Mar 1 03:38:13 1999
++++ lib/Makefile.in Mon Mar 1 14:43:56 1999
@@ -15,7 +15,6 @@
LIBFILES_IN = mc.ext.in mc-gnome.ext.in
LIBFILES_OUT = mc.ext mc-gnome.ext
@@ -42,13 +42,13 @@
-TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \
Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \
- mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.menu.qnx.diff
-@@ -42,8 +41,6 @@
+ mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.global
+@@ -45,8 +44,6 @@
do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(libdir)/$$I; done
for I in $(LIBFILES_OUT); \
do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(libdir)/$$I; done
- for I in $(TIFILES); \
- do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
+ $(MKINSTALLDIRS) $(DESTDIR)$(confdir)
+ $(INSTALL_DATA) $(srcdir)/mc.global $(DESTDIR)$(confdir)
- uninstall:
- for I in $(LIBFILES_OUT) $(LIBFILES_CONST); \
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/patches/patch-ag ./patches/patch-ag
--- /usr/ports.ref/x11-fm/gnomemc/patches/patch-ag Sun Jan 31 22:57:11 1999
+++ ./patches/patch-ag Fri Feb 19 01:48:12 1999
@@ -164,14 +164,14 @@
# Sound files
shell/.mod
---- gnome/mc.keys.in.in.orig Tue Jan 19 00:44:12 1999
-+++ gnome/mc.keys.in.in Thu Jan 28 11:54:32 1999
-@@ -86,7 +86,7 @@
+--- gnome/mc.keys.in.in.orig Tue Feb 16 01:29:18 1999
++++ gnome/mc.keys.in.in Fri Feb 19 01:47:31 1999
+@@ -96,7 +96,7 @@
icon-filename=@icondir@/tex.xpm
application/postscript:
- open=gv %f
+ open=ggv %f
- icon-filename=@icondir@/postscript.xpm
+ icon-filename=@icondir@/gnome-application-postscript.png
application/x-object-file:
diff -urN -x CVS /usr/ports.ref/x11-fm/gnomemc/pkg/PLIST ./pkg/PLIST
--- /usr/ports.ref/x11-fm/gnomemc/pkg/PLIST Fri Feb 12 10:49:26 1999
+++ ./pkg/PLIST Sat Feb 27 21:11:19 1999
@@ -1,6 +1,7 @@
bin/gmc
bin/plain-gmc
etc/CORBA/servers/gmc.gnorba
+etc/mc.global
share/gnome/idl/FileManager.idl
share/gnome/idl/Makefile.in
share/gnome/mc/FAQ
@@ -29,16 +30,16 @@
share/gnome/mc/mc.hint
share/gnome/mc/mc.lib
share/gnome/mc/mc.menu
-share/gnome/mc/templates/GIMP.desktop
share/gnome/mime-info/mc.keys
-share/gnome/pixmaps/mc/c.xpm
-share/gnome/pixmaps/mc/calendar.xpm
-share/gnome/pixmaps/mc/cc.xpm
-share/gnome/pixmaps/mc/compressed.xpm
share/gnome/pixmaps/mc/directory.xpm
+share/gnome/pixmaps/mc/gnome-application-encapsulated_postscript.png
+share/gnome/pixmaps/mc/gnome-application-postscript.png
share/gnome/pixmaps/mc/gnome-application-x-c-header.png
share/gnome/pixmaps/mc/gnome-application-x-c-source.png
share/gnome/pixmaps/mc/gnome-application-x-cc-source.png
+share/gnome/pixmaps/mc/gnome-audio.png
+share/gnome/pixmaps/mc/gnome-compressed.png
+share/gnome/pixmaps/mc/gnome-core.png
share/gnome/pixmaps/mc/gnome-http-url.png
share/gnome/pixmaps/mc/gnome-image-bmp.png
share/gnome/pixmaps/mc/gnome-image-generic.png
@@ -50,41 +51,45 @@
share/gnome/pixmaps/mc/gnome-image-png.png
share/gnome/pixmaps/mc/gnome-image-pnm.png
share/gnome/pixmaps/mc/gnome-image-ppm.png
+share/gnome/pixmaps/mc/gnome-image-psd.png
share/gnome/pixmaps/mc/gnome-image-ras.png
share/gnome/pixmaps/mc/gnome-image-rgb.png
share/gnome/pixmaps/mc/gnome-image-tga.png
share/gnome/pixmaps/mc/gnome-image-tiff.png
share/gnome/pixmaps/mc/gnome-image-xbm.png
+share/gnome/pixmaps/mc/gnome-image-xcf.png
share/gnome/pixmaps/mc/gnome-image-xpm.png
share/gnome/pixmaps/mc/gnome-image-xwd.png
+share/gnome/pixmaps/mc/gnome-manpage.png
+share/gnome/pixmaps/mc/gnome-objectfile.png
share/gnome/pixmaps/mc/gnome-pack-deb.png
share/gnome/pixmaps/mc/gnome-pack-rpm.png
+share/gnome/pixmaps/mc/gnome-package.png
+share/gnome/pixmaps/mc/gnome-tex.png
share/gnome/pixmaps/mc/gnome-text-html.png
+share/gnome/pixmaps/mc/gnome-textfile.png
share/gnome/pixmaps/mc/gnome-video-mpeg.png
share/gnome/pixmaps/mc/gnome-video-quicktime.png
share/gnome/pixmaps/mc/gnome-video-x-msvideo.png
-share/gnome/pixmaps/mc/h.xpm
-share/gnome/pixmaps/mc/html.xpm
share/gnome/pixmaps/mc/i-blockdev.png
+share/gnome/pixmaps/mc/i-cdrom.png
share/gnome/pixmaps/mc/i-chardev.png
share/gnome/pixmaps/mc/i-core.png
share/gnome/pixmaps/mc/i-dirclosed.png
share/gnome/pixmaps/mc/i-directory.png
share/gnome/pixmaps/mc/i-executable.png
+share/gnome/pixmaps/mc/i-fifo.png
+share/gnome/pixmaps/mc/i-floppy.png
+share/gnome/pixmaps/mc/i-printer.png
share/gnome/pixmaps/mc/i-regular.png
share/gnome/pixmaps/mc/i-sock.png
share/gnome/pixmaps/mc/i-stalled.png
share/gnome/pixmaps/mc/i-symlink.png
share/gnome/pixmaps/mc/makefile.xpm
-share/gnome/pixmaps/mc/man.xpm
-share/gnome/pixmaps/mc/o.xpm
-share/gnome/pixmaps/mc/postscript.xpm
share/gnome/pixmaps/mc/sound.xpm
-share/gnome/pixmaps/mc/tex.xpm
-share/gnome/pixmaps/mc/text.xpm
share/gnome/pixmaps/mc/trash.xpm
-share/gnome/pixmaps/mc/word.xpm
-share/gnome/pixmaps/mc/zip.xpm
+share/locale/cs/LC_MESSAGES/mc.mo
+share/locale/da/LC_MESSAGES/mc.mo
share/locale/de/LC_MESSAGES/mc.mo
share/locale/es/LC_MESSAGES/mc.mo
share/locale/fr/LC_MESSAGES/mc.mo
@@ -95,5 +100,3 @@
share/locale/ru/LC_MESSAGES/mc.mo
@dirrm share/gnome/pixmaps/mc
@dirrm share/gnome/mc/extfs
-@dirrm share/gnome/mc/templates
-@dirrm share/gnome/mc
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903070035.CAA43873>