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

Midnight Commander (mc) Update



Hi. The misc/mc (mc-4.5.51) port is marked as BROKEN from 2003/02/25.
The current release (mc-4.6.0) is more better and have clener code than
the old releases. Maybe you does not know that A'rpi (The main developer
of MPlayer, audited the code of mc). And the 4.6.0 port have got support
for ws, vt terminals so the key sequences are fixed now. I think you
should give it a try. The stuff is attached. Tested/used on i386. Works
fine so far.

P.S.: Feel free to delete the MAINTAINER line from the Makefile if the
takeover of the port is forbidden.

Regards
-- 
Robert Nagy <thuglife_(_at_)_bsd_(_dot_)_hu>
http://thuglife.frontember.hu
diff mc.original/Makefile mc/Makefile
--- mc.original/Makefile	Tue Feb 25 21:32:49 2003
+++ mc/Makefile	Sun Jan  4 00:00:25 2004
@@ -1,22 +1,33 @@
-# $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?=
+
+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.original/distinfo mc/distinfo
--- mc.original/distinfo	Thu Mar 21 21:13:13 2002
+++ mc/distinfo	Sat Jan  3 23:20:41 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.original/patches/patch-configure mc/patches/patch-configure
--- mc.original/patches/patch-configure	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-configure	Sat Jan  3 23:51:55 2004
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- configure.orig	Sat Jan  3 23:50:06 2004
++++ configure	Sat Jan  3 23:51:34 2004
+@@ -14385,7 +14385,7 @@
+ 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 @@
+ 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.original/patches/patch-lib_Makefile_in mc/patches/patch-lib_Makefile_in
--- mc.original/patches/patch-lib_Makefile_in	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-lib_Makefile_in	Tue Jan 20 19:43:13 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.original/patches/patch-lib_mc_lib mc/patches/patch-lib_mc_lib
--- mc.original/patches/patch-lib_mc_lib	Thu Jan  1 01:00:00 1970
+++ mc/patches/patch-lib_mc_lib	Tue Jan 20 19:43:16 2004
@@ -0,0 +1,98 @@
+$OpenBSD$
+$MirBSD: patch-lib_mc_lib,v 1.4 2003/07/07 18:10:53 tg Exp $
+--- lib/mc.lib.orig	Sat Aug 17 03:16:03 2002
++++ lib/mc.lib	Sat Jan  3 23:29:46 2004
+@@ -155,3 +155,93 @@
+ 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.original/pkg/DESCR mc/pkg/DESCR
--- mc.original/pkg/DESCR	Thu Dec 18 15:45:25 2003
+++ mc/pkg/DESCR	Tue Jan 20 19:37:18 2004
@@ -11,8 +11,3 @@
         file system, enabling you to do complex tasks.
 
         o Mouse support on the Linux console and under X11's xterms. 
-
-        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
diff mc.original/pkg/PLIST mc/pkg/PLIST
--- mc.original/pkg/PLIST	Sun Apr  7 03:54:51 2002
+++ mc/pkg/PLIST	Sat Jan  3 23:24:04 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