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

UPDATE: misc/mc



Hi. The attached diff unbreaks and updates
(to version 4.6.1pre1) the misc/mc port.
Please test it & comment it.

Regards
-- 
Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
http://thuglife.frontember.hu
Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/mc/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- Makefile	2003/02/25 20:32:49	1.16
+++ Makefile	2004/04/04 20:25:02
@@ -1,22 +1,35 @@
 # $OpenBSD: Makefile,v 1.16 2003/02/25 20:32:49 pvalchev Exp $
 
-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.1-pre1
+PKGNAME=		${DISTNAME:S,-pre1,pre1,}
 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 gettext
+LIB_DEPENDS+=		glib-2.0.0.0,glib-2.0.0.0::devel/glib2
+
 CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=        --with-vfs --without-mcfs --enable-charset
 
-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>
Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/mc/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	2002/03/21 20:13:13	1.1
+++ distinfo	2004/04/04 20:25:02
@@ -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.1-pre1.tar.gz) = 8c66f5eeb623b20791b3a13bbe6f8c1b
+RMD160 (mc-4.6.1-pre1.tar.gz) = cb574f3460fe6a2d559ffab1dce9b8f46f64edf5
+SHA1 (mc-4.6.1-pre1.tar.gz) = 01a45ff102c5f204108e20e968567b78ef9ab6a2
Index: patches/patch-configure
===================================================================
RCS file: patch-configure
diff -N patch-configure
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-configure	Sun Apr  4 20:25:02 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="${LOCALBASE}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="${LOCALBASE}bin/unzip"
+   ;;
+ esac
+ fi
Index: patches/patch-lib_mc_lib
===================================================================
RCS file: patch-lib_mc_lib
diff -N patch-lib_mc_lib
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-lib_mc_lib	Sun Apr  4 20:25:02 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
Index: patches/patch-slang_slsignal_c
===================================================================
RCS file: patch-slang_slsignal_c
diff -N patch-slang_slsignal_c
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-slang_slsignal_c	Sun Apr  4 20:25:02 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
Index: patches/patch-src_cons_handler_c
===================================================================
RCS file: patch-src_cons_handler_c
diff -N patch-src_cons_handler_c
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-src_cons_handler_c	Sun Apr  4 20:25:02 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;
Index: patches/patch-src_subshell_c
===================================================================
RCS file: patch-src_subshell_c
diff -N patch-src_subshell_c
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-src_subshell_c	Sun Apr  4 20:25:02 2004
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- src/subshell.c.orig	Sun Oct 26 07:46:02 2003
++++ src/subshell.c	Sun Apr  4 11:44:30 2004
+@@ -265,17 +265,17 @@
+     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);
++	    execl (shell, "tcsh", (char *)NULL);
+ 	    break;
+ 
+         case ZSH:
+ 	    /* Use -g to exclude cmds beginning with space from history
+ 	     * and -Z to use the line editor on non-interactive term */
+-	    execl (shell, "zsh", "-Z", "-g", NULL);
++	    execl (shell, "zsh", "-Z", "-g", (char *)NULL);
+ 
+ 	    break;
+     }
Index: patches/patch-src_utilunix_c
===================================================================
RCS file: patch-src_utilunix_c
diff -N patch-src_utilunix_c
--- /dev/null	Mon Nov  3 01:42:15 1997
+++ patches/patch-src_utilunix_c	Sun Apr  4 20:25:02 2004
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- src/utilunix.c.orig	Fri Nov 28 16:23:19 2003
++++ src/utilunix.c	Sun Apr  4 11:46:35 2004
+@@ -234,9 +234,9 @@
+ 	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 {
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/misc/mc/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- pkg/DESCR	2003/12/15 21:42:43	1.3
+++ pkg/DESCR	2004/04/04 20:25:02
@@ -1,18 +1,17 @@
-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.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/misc/mc/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST	2002/04/07 01:54:51	1.2
+++ pkg/PLIST	2004/04/04 20:25:02
@@ -2,43 +2,184 @@
 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
+man/man1/mcview.1
+share/locale/az/LC_MESSAGES/mc.mo
+share/locale/be/LC_MESSAGES/mc.mo
+share/locale/bg/LC_MESSAGES/mc.mo
+share/locale/ca/LC_MESSAGES/mc.mo
+share/locale/cs/LC_MESSAGES/mc.mo
+share/locale/da/LC_MESSAGES/mc.mo
+share/locale/de/LC_MESSAGES/mc.mo
+share/locale/el/LC_MESSAGES/mc.mo
 share/locale/es/LC_MESSAGES/mc.mo
+share/locale/eu/LC_MESSAGES/mc.mo
+share/locale/fi/LC_MESSAGES/mc.mo
 share/locale/fr/LC_MESSAGES/mc.mo
+share/locale/hu/LC_MESSAGES/mc.mo
+share/locale/it/LC_MESSAGES/mc.mo
+share/locale/ja/LC_MESSAGES/mc.mo
+share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/lv/LC_MESSAGES/mc.mo
+share/locale/nl/LC_MESSAGES/mc.mo
+share/locale/no/LC_MESSAGES/mc.mo
+share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/pt/LC_MESSAGES/mc.mo
+share/locale/pt_BR/LC_MESSAGES/mc.mo
+share/locale/ro/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
+share/locale/sk/LC_MESSAGES/mc.mo
+share/locale/sl/LC_MESSAGES/mc.mo
+share/locale/sv/LC_MESSAGES/mc.mo
+share/locale/ta/LC_MESSAGES/mc.mo
+share/locale/tr/LC_MESSAGES/mc.mo
+share/locale/uk/LC_MESSAGES/mc.mo
+share/locale/wa/LC_MESSAGES/mc.mo
+share/locale/zh_CN/LC_MESSAGES/mc.mo
+share/locale/zh_TW/LC_MESSAGES/mc.mo
+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.charsets
+share/mc/mc.ext
+share/mc/mc.hint
+share/mc/mc.hlp
+share/mc/mc.hlp.es
+share/mc/mc.hlp.hu
+share/mc/mc.hlp.it
+share/mc/mc.hlp.pl
+share/mc/mc.hlp.ru
+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
+_(_at_)_dirrm share/locale/zh_TW/LC_MESSAGES
+_(_at_)_dirrm share/locale/zh_TW
+_(_at_)_dirrm share/locale/zh_CN/LC_MESSAGES
+_(_at_)_dirrm share/locale/zh_CN
+_(_at_)_dirrm share/locale/wa/LC_MESSAGES
+_(_at_)_dirrm share/locale/wa
+_(_at_)_dirrm share/locale/uk/LC_MESSAGES
+_(_at_)_dirrm share/locale/uk
+_(_at_)_dirrm share/locale/tr/LC_MESSAGES
+_(_at_)_dirrm share/locale/tr
+_(_at_)_dirrm share/locale/ta/LC_MESSAGES
+_(_at_)_dirrm share/locale/ta
+_(_at_)_dirrm share/locale/sv/LC_MESSAGES
+_(_at_)_dirrm share/locale/sv
+_(_at_)_dirrm share/locale/sl/LC_MESSAGES
+_(_at_)_dirrm share/locale/sl
+_(_at_)_dirrm share/locale/sk/LC_MESSAGES
+_(_at_)_dirrm share/locale/sk
+_(_at_)_dirrm share/locale/ru/LC_MESSAGES
+_(_at_)_dirrm share/locale/ru/
+_(_at_)_dirrm share/locale/ro/LC_MESSAGES
+_(_at_)_dirrm share/locale/ro
+_(_at_)_dirrm share/locale/pt_BR/LC_MESSAGES
+_(_at_)_dirrm share/locale/pt_BR
+_(_at_)_dirrm share/locale/pt/LC_MESSAGES
+_(_at_)_dirrm share/locale/pt
+_(_at_)_dirrm share/locale/pl/LC_MESSAGES
+_(_at_)_dirrm share/locale/pl
+_(_at_)_dirrm share/locale/no/LC_MESSAGES
+_(_at_)_dirrm share/locale/no
+_(_at_)_dirrm share/locale/nl/LC_MESSAGES
+_(_at_)_dirrm share/locale/nl
+_(_at_)_dirrm share/locale/lv/LC_MESSAGES
+_(_at_)_dirrm share/locale/lv
+_(_at_)_dirrm share/locale/ko/LC_MESSAGES
+_(_at_)_dirrm share/locale/ko
+_(_at_)_dirrm share/locale/ja/LC_MESSAGES
+_(_at_)_dirrm share/locale/ja
+_(_at_)_dirrm share/locale/it/LC_MESSAGES
+_(_at_)_dirrm share/locale/it
+_(_at_)_dirrm share/locale/hu/LC_MESSAGES
+_(_at_)_dirrm share/locale/hu
+_(_at_)_dirrm share/locale/fr/LC_MESSAGES
+_(_at_)_dirrm share/locale/fr
+_(_at_)_dirrm share/locale/fi/LC_MESSAGES
+_(_at_)_dirrm share/locale/fi
+_(_at_)_dirrm share/locale/eu/LC_MESSAGES
+_(_at_)_dirrm share/locale/eu
+_(_at_)_dirrm share/locale/es/LC_MESSAGES
+_(_at_)_dirrm share/locale/es
+_(_at_)_dirrm share/locale/el/LC_MESSAGES
+_(_at_)_dirrm share/locale/el
+_(_at_)_dirrm share/locale/de/LC_MESSAGES
+_(_at_)_dirrm share/locale/de
+_(_at_)_dirrm share/locale/da/LC_MESSAGES
+_(_at_)_dirrm share/locale/da
+_(_at_)_dirrm share/locale/cs/LC_MESSAGES
+_(_at_)_dirrm share/locale/cs
+_(_at_)_dirrm share/locale/ca/LC_MESSAGES
+_(_at_)_dirrm share/locale/ca
+_(_at_)_dirrm share/locale/bg/LC_MESSAGES
+_(_at_)_dirrm share/locale/bg
+_(_at_)_dirrm share/locale/be/LC_MESSAGES
+_(_at_)_dirrm share/locale/be
+_(_at_)_dirrm share/locale/az/LC_MESSAGES
+_(_at_)_dirrm share/locale/az
+_(_at_)_dirrm share/locale