[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

mc-4.6.0



Hi. Here is a fixed patch for mc with new patches
from Andrey Smagin. Seems to work on i386 and sparc64 too.
Please test it.


Regards
-- 
Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
http://thuglife.frontember.hu
diff mc.orig/Makefile mc/Makefile
--- mc.orig/Makefile	Tue Feb 25 21:32:49 2003
+++ mc/Makefile	Sun Feb  1 02:26:00 2004
@@ -1,22 +1,34 @@
-# $OpenBSD: Makefile,v 1.16 2003/02/25 20:32:49 pvalchev Exp $
+# $OpenBSD$
 
-COMMENT=	"free Norton Commander Clone with many useful features"
+COMMENT=		"free Norton Commander clone with many useful features"
 
-DISTNAME=		mc-4.5.51
+DISTNAME=		mc-4.6.0
 CATEGORIES=		misc
-MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/mc/}
 
-HOMEPAGE=		http://www.gnome.org/mc/
+HOMEPAGE=		http://www.ibiblio.org/mc/
+MASTER_SITES=           http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/
+MAINTAINER=		Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
 
-LIB_DEPENDS=		glib.1.2::devel/glib
-
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+FLAVORS=		no_x11
+FLAVOR?=
+
+MODULES=		iconv
+LIB_DEPENDS+=		glib-2.0.0.0,glib-2.0.0.0::devel/glib2
+
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=        --disable-nls --with-vfs --without-mcfs
 
-BROKEN=			"final auditing on the way"
+.if ${FLAVOR:L:Mno_x11}
+CONFIGURE_ARGS+=	--without-x
+.else
+USE_X11=		Yes
+CONFIGURE_ARGS+=	--with-x
+.endif
 
 .include <bsd.port.mk>
diff mc.orig/distinfo mc/distinfo
--- mc.orig/distinfo	Thu Mar 21 21:13:13 2002
+++ mc/distinfo	Sun Feb  1 02:20:46 2004
@@ -1,3 +1,3 @@
-MD5 (mc-4.5.51.tar.gz) = c604292554887e9e6baba0828081b963
-RMD160 (mc-4.5.51.tar.gz) = aaa8bf057b00e7a3401a14aa7b786fc45825b73b
-SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406
+MD5 (mc-4.6.0.tar.gz) = 70804dc9e2049e24f294ff7090a82a12
+RMD160 (mc-4.6.0.tar.gz) = e98843d8f3eda8ab691b3b0abe165d6d80010fe0
+SHA1 (mc-4.6.0.tar.gz) = 815668f4f1e7a0b1a7d55d307f44f90a18f3160f
diff mc.orig/patches/patch-configure mc/patches/patch-configure
--- mc.orig/patches/patch-configure	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-configure	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- configure.orig	2003-02-05 12:09:04.000000000 -0600
++++ configure	2004-01-25 18:33:54.000000000 -0600
+@@ -14385,7 +14385,7 @@ do
+ done
+ done
+ 
+-  test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="/usr/bin/zip"
++  test -z "$ac_cv_path_ZIP" && ac_cv_path_ZIP="/usr/local/bin/zip"
+   ;;
+ esac
+ fi
+@@ -14425,7 +14425,7 @@ do
+ done
+ done
+ 
+-  test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="/usr/bin/unzip"
++  test -z "$ac_cv_path_UNZIP" && ac_cv_path_UNZIP="/usr/local/bin/unzip"
+   ;;
+ esac
+ fi
diff mc.orig/patches/patch-lib_Makefile_in mc/patches/patch-lib_Makefile_in
--- mc.orig/patches/patch-lib_Makefile_in	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-lib_Makefile_in	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- lib/Makefile.in.orig	Thu Dec 26 21:37:56 2002
++++ lib/Makefile.in	Tue Jan 21 18:40:15 2003
+@@ -190,8 +190,7 @@ tidir = $(pkgdatadir)/term
+ @CHARSET_TRUE_(_at_)_LIBFILES_ADD = mc.charsets
+ 
+ LIBFILES_OUT = mc.ext
+-LIBFILES_CONST = mc.hint mc.hint.cs mc.hint.es mc.hint.hu mc.hint.it \
+-	mc.hint.nl mc.hint.pl mc.hint.ru mc.hint.uk mc.hint.zh mc.lib \
++LIBFILES_CONST = mc.hint mc.lib \
+ 	mc.menu cedit.menu edit.indent.rc edit.spell.rc
+ 
+ 
+@@ -205,8 +204,8 @@ noinst_SCRIPTS = tdiff
+ SCRIPTS_IN = mc.csh.in mc.sh.in mc-wrapper.csh.in mc-wrapper.sh.in
+ SCRIPTS_OUT = mc.csh mc.sh mc-wrapper.csh mc-wrapper.sh
+ 
+-suppbin_SCRIPTS = $(SCRIPTS_OUT)
+-ti_DATA = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap
++suppbin_SCRIPTS = 
++ti_DATA = 
+ 
+ pkgdata_DATA = $(LIBFILES_CONST) $(LIBFILES_ADD) $(LIBFILES_OUT)
+ 
diff mc.orig/patches/patch-lib_mc_lib mc/patches/patch-lib_mc_lib
--- mc.orig/patches/patch-lib_mc_lib	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-lib_mc_lib	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,97 @@
+$OpenBSD$
+--- lib/mc.lib.orig	2002-08-16 20:16:03.000000000 -0500
++++ lib/mc.lib	2004-01-25 18:33:54.000000000 -0600
+@@ -155,3 +155,93 @@ end=\e[F
+ kpplus=\e[+
+ kpminus=\e[-
+ kpasterix=\e[*
++
++# Sequences below are used in OpenBSD wscons, also via remote login
++
++[terminal:vt220]
++bs=
++end=\e[8~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++home=\e[7~
++
++[terminal:wsvt25]
++bs=
++end=\e[8~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++home=\e[7~
++
++[terminal:wsvtg]
++bs=
++end=\e[8~
++f10=\e[21~
++f11=\e[23~
++f12=\e[24~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++f6=\e[17~
++f7=\e[18~
++f8=\e[19~
++f9=\e[20~
++home=\e[7~
++
++# GNU screen
++[terminal:screen]
++bs=
++delete=\e[3~
++end=\e[8~
++f10=\e[20~
++f11=\e[23~
++f12=\e[24~
++f1=\e[11~
++f2=\e[12~
++f3=\e[13~
++f4=\e[14~
++f5=\e[15~
++# GNU screen says F6 is F5, but still...
++# maybe the bug will be fixed some time
++f6=\e[16~
++f7=\e[17~
++f8=\e[18~
++f9=\e[19~
++home=\e[7~
++insert=\e[2~
++pgdn=\e[6~
++pgup=\e[5~
++up=\eOA
++
++# PuTTY
++[terminal:ansi]
++bs=^h
++down=\eOB
++f1=\eOP
++f2=\eOQ
++f3=\eOR
++f4=\eOS
++left=\eOD
++right=\eOC
++up=\eOA
diff mc.orig/patches/patch-slang_slsignal_c mc/patches/patch-slang_slsignal_c
--- mc.orig/patches/patch-slang_slsignal_c	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-slang_slsignal_c	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- slang/slsignal.c.orig	2004-01-25 18:44:10.000000000 -0600
++++ slang/slsignal.c	2004-01-25 18:44:36.000000000 -0600
+@@ -226,7 +226,7 @@ int SLsystem (char *cmd)
+ 	(void) sigprocmask (SIG_SETMASK, &save_mask, NULL);
+ # endif
+ 
+-	execl ("/bin/sh", "sh", "-c", cmd, NULL);
++	execl ("/bin/sh", "sh", "-c", cmd, (char *)NULL);
+ 	_exit (127);
+      }
+    else
diff mc.orig/patches/patch-src_cons_handler_c mc/patches/patch-src_cons_handler_c
--- mc.orig/patches/patch-src_cons_handler_c	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-src_cons_handler_c	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/cons.handler.c.orig	2004-01-25 18:46:14.000000000 -0600
++++ src/cons.handler.c	2004-01-25 18:46:30.000000000 -0600
+@@ -144,7 +144,7 @@ void handle_console (unsigned char actio
+ 	    if (tty_name) {
+ 		/* Exec the console save/restore handler */
+ 		mc_conssaver = concat_dir_and_file (LIBDIR, "cons.saver");
+-		execl (mc_conssaver, "cons.saver", tty_name, NULL);
++		execl (mc_conssaver, "cons.saver", tty_name, (char *)NULL);
+ 	    }
+ 	    /* Console is not a tty or execl() failed */
+ 	    console_flag = 0;
diff mc.orig/patches/patch-src_subshell_c mc/patches/patch-src_subshell_c
--- mc.orig/patches/patch-src_subshell_c	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-src_subshell_c	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,26 @@
+$OpenBSD$
+--- src/subshell.c.orig	2004-01-25 18:38:48.000000000 -0600
++++ src/subshell.c	2004-01-25 18:39:24.000000000 -0600
+@@ -295,11 +295,11 @@ static void init_subshell_child (const c
+     switch (subshell_type)
+     {
+         case BASH:
+-	    execl (shell, "bash", "-rcfile", init_file, NULL);
++	    execl (shell, "bash", "-rcfile", init_file, (char *)NULL);
+ 	    break;
+ 
+         case TCSH:
+-	    execl (shell, "tcsh", NULL);  /* What's the -rcfile equivalent? */
++	    execl (shell, "tcsh", (char *)NULL);  /* What's the -rcfile equivalent? */
+ 	    break;
+ 
+         case ZSH:
+@@ -307,7 +307,7 @@ static void init_subshell_child (const c
+ 	     * (Debian-mc-maintainer) <grisu_(_at_)_debian_(_dot_)_org> from a patch from
+ 	     * Radovan Garabik <garabik_(_at_)_center_(_dot_)_fmph_(_dot_)_uniba_(_dot_)_sk>
+ 	     */
+-	    execl (shell, "zsh", "-Z", NULL);
++	    execl (shell, "zsh", "-Z", (char *)NULL);
+ 
+ 	    break;
+     }
diff mc.orig/patches/patch-src_utilunix_c mc/patches/patch-src_utilunix_c
--- mc.orig/patches/patch-src_utilunix_c	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-src_utilunix_c	Sun Feb  1 02:20:46 2004
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/utilunix.c.orig	2004-01-25 18:35:39.000000000 -0600
++++ src/utilunix.c	2004-01-25 18:38:18.000000000 -0600
+@@ -235,9 +235,9 @@ int my_system (int flags, const char *sh
+ 	signal (SIGCHLD, SIG_DFL);
+ 
+ 	if (flags & EXECUTE_AS_SHELL)
+-	    execl (shell, shell, "-c", command, NULL);
++	    execl (shell, shell, "-c", command, (char *)NULL);
+ 	else
+-	    execlp (shell, shell, command, NULL);
++	    execlp (shell, shell, command, (char *)NULL);
+ 
+ 	_exit (127);		/* Exec error */
+     } else {
+@@ -534,7 +534,7 @@ int mc_doublepopen (int inhandle, int in
+ 		     argno = 0;
+ 		     while ((args[argno++] = va_arg(ap, char *)) != NULL)
+ 		         if (argno == (MAXARGS - 1)) {
+-			     args[argno] = NULL;
++			     args[argno] = (char *)NULL;
+ 			     break;
+ 		         }
+ 		     va_end (ap);
diff mc.orig/pkg/DESCR mc/pkg/DESCR
--- mc.orig/pkg/DESCR	Thu Dec 18 15:45:25 2003
+++ mc/pkg/DESCR	Sun Feb  1 02:20:46 2004
@@ -1,18 +1,18 @@
-The Midnight Commander is a directory browsing tool which bears a
-certain remote resemblance to John Socha's Norton Commander for DOS.
-It is feature packed:
+Midnight Commander is a file manager for UNIX-like operating systems.
+It bears a certain resemblance to John Socha's Norton Commander for DOS.
 
-        o Built in Virtual File System: manipulate remote files
-        systems through the ftp protocol or Midnight Commander's own
-        mcfs protocol.  Browse tar, compressed tar files, rpm, zip,
-        cpio, lha and rar files with a single click.  
+Some of the features are:
 
-        o All of the Midnight Commander operations work with the virtual
-        file system, enabling you to do complex tasks.
+* Built-in Virtual File System: manipulate remote file systems through
+  the ftp or ssh protocol or Midnight Commander's own mcfs protocol.
+  Browse the content of the tar, compressed tar, rpm, zip, cpio, lha and
+  rar archives.
 
-        o Mouse support on the Linux console and under X11's xterms. 
+* All of the Midnight Commander operations work with the virtual file
+  system, enabling you to do complex tasks.
 
-        o Note that the key binding to use the menu and to exit from
-	Midnight Commander are F9 and F10 respectively.  Since OpenBSD
-	uses these keys to swap VT's, you must hit 'Esc' + 9 and 
-	'Esc' + 0 to use the menu's and to exit
+* Mouse support under X11's xterms. 
+
+Flavors:
+  no_x11 - Disable X11 features.
+
diff mc.orig/pkg/PLIST mc/pkg/PLIST
--- mc.orig/pkg/PLIST	Sun Apr  7 03:54:51 2002
+++ mc/pkg/PLIST	Sun Feb  1 02:20:46 2004
@@ -1,44 +1,79 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:51 naddy Exp $
+_(_at_)_comment $OpenBSD$
 bin/mc
 bin/mcedit
 bin/mcmfmt
-bin/mcserv
-lib/mc/FAQ
-lib/mc/bin/mcfn_install
-lib/mc/extfs/README
-lib/mc/extfs/a
-lib/mc/extfs/arfs
-lib/mc/extfs/cpio
-lib/mc/extfs/deb
-lib/mc/extfs/extfs.ini
-lib/mc/extfs/ftplist
-lib/mc/extfs/hp48
-lib/mc/extfs/lha
-lib/mc/extfs/lslR
-lib/mc/extfs/rar
-lib/mc/extfs/rpm
-lib/mc/extfs/zip
-lib/mc/extfs/zoo
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/term/README.xterm
-lib/mc/term/ansi.ti
-lib/mc/term/linux.ti
-lib/mc/term/vt100.ti
-lib/mc/term/xterm.ad
-lib/mc/term/xterm.tcap
-lib/mc/term/xterm.ti
+bin/mcview
 man/man1/mc.1
 man/man1/mcedit.1
-man/man8/mcserv.8
-share/locale/es/LC_MESSAGES/mc.mo
-share/locale/fr/LC_MESSAGES/mc.mo
-share/locale/ru/LC_MESSAGES/mc.mo
-_(_at_)_dirrm share/icons/mc
-_(_at_)_dirrm share/icons
-_(_at_)_dirrm lib/mc/term
-_(_at_)_dirrm lib/mc/extfs
-_(_at_)_dirrm lib/mc/bin
+man/man1/mcview.1
+share/mc/cedit.menu
+share/mc/edit.indent.rc
+share/mc/edit.spell.rc
+share/mc/extfs/README
+share/mc/extfs/a
+share/mc/extfs/apt
+share/mc/extfs/audio
+share/mc/extfs/bpp
+share/mc/extfs/deb
+share/mc/extfs/deba
+share/mc/extfs/debd
+share/mc/extfs/dpkg
+share/mc/extfs/extfs.ini
+share/mc/extfs/hp48
+share/mc/extfs/lslR
+share/mc/extfs/mailfs
+share/mc/extfs/patchfs
+share/mc/extfs/rpm
+share/mc/extfs/rpms
+share/mc/extfs/sfs.ini
+share/mc/extfs/trpm
+share/mc/extfs/uar
+share/mc/extfs/uarj
+share/mc/extfs/uha
+share/mc/extfs/ulha
+share/mc/extfs/urar
+share/mc/extfs/uzip
+share/mc/extfs/uzoo
+share/mc/mc.ext
+share/mc/mc.hint
+share/mc/mc.hlp
+share/mc/mc.lib
+share/mc/mc.menu
+share/mc/syntax/Syntax
+share/mc/syntax/ada95.syntax
+share/mc/syntax/c.syntax
+share/mc/syntax/changelog.syntax
+share/mc/syntax/diff.syntax
+share/mc/syntax/dos.syntax
+share/mc/syntax/fortran.syntax
+share/mc/syntax/html.syntax
+share/mc/syntax/java.syntax
+share/mc/syntax/js.syntax
+share/mc/syntax/latex.syntax
+share/mc/syntax/lisp.syntax
+share/mc/syntax/lsm.syntax
+share/mc/syntax/m4.syntax
+share/mc/syntax/mail.syntax
+share/mc/syntax/makefile.syntax
+share/mc/syntax/ml.syntax
+share/mc/syntax/nroff.syntax
+share/mc/syntax/octave.syntax
+share/mc/syntax/pascal.syntax
+share/mc/syntax/perl.syntax
+share/mc/syntax/php.syntax
+share/mc/syntax/po.syntax
+share/mc/syntax/python.syntax
+share/mc/syntax/sh.syntax
+share/mc/syntax/slang.syntax
+share/mc/syntax/smalltalk.syntax
+share/mc/syntax/spec.syntax
+share/mc/syntax/sql.syntax
+share/mc/syntax/swig.syntax
+share/mc/syntax/syntax.syntax
+share/mc/syntax/tcl.syntax
+share/mc/syntax/texinfo.syntax
+share/mc/syntax/unknown.syntax
+share/mc/syntax/xml.syntax
+_(_at_)_dirrm share/mc/syntax
+_(_at_)_dirrm share/mc/extfs
+_(_at_)_dirrm share/mc

Visit your host, monkey.org