From da1ead3a88f1bce99ad7b166f8b595dd78d8e29f Mon Sep 17 00:00:00 2001 From: sibel Date: Tue, 16 Feb 2010 18:29:10 +0100 Subject: maj mc#4.7.0.2-1 --- extra/mc/.footprint | 187 +++++++++++++++++++++++++++++++ extra/mc/.md5sum | 3 +- extra/mc/Pkgfile | 48 +++++--- extra/mc/mc-4.7.0.2_hotlist_syntax.patch | 42 +++++++ 4 files changed, 262 insertions(+), 18 deletions(-) create mode 100644 extra/mc/.footprint create mode 100644 extra/mc/mc-4.7.0.2_hotlist_syntax.patch diff --git a/extra/mc/.footprint b/extra/mc/.footprint new file mode 100644 index 000000000..1df2cee02 --- /dev/null +++ b/extra/mc/.footprint @@ -0,0 +1,187 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/mc/ +-rw-r--r-- root/root etc/mc/Syntax +-rw-r--r-- root/root etc/mc/cedit.menu +-rw-r--r-- root/root etc/mc/edit.indent.rc +-rw-r--r-- root/root etc/mc/edit.spell.rc +drwxr-xr-x root/root etc/mc/extfs/ +-rw-r--r-- root/root etc/mc/extfs/extfs.ini +-rw-r--r-- root/root etc/mc/extfs/sfs.ini +-rw-r--r-- root/root etc/mc/filehighlight.ini +-rw-r--r-- root/root etc/mc/mc.charsets +-rw-r--r-- root/root etc/mc/mc.ext +-rw-r--r-- root/root etc/mc/mc.keymap +-rw-r--r-- root/root etc/mc/mc.keymap.default +-rw-r--r-- root/root etc/mc/mc.keymap.emacs +-rw-r--r-- root/root etc/mc/mc.lib +-rw-r--r-- root/root etc/mc/mc.menu +-rw-r--r-- root/root etc/mc/mc.menu.sr +drwxr-xr-x root/root usr/ +drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/mc +lrwxrwxrwx root/root usr/bin/mcedit -> mc +-rwxr-xr-x root/root usr/bin/mcmfmt +lrwxrwxrwx root/root usr/bin/mcview -> mc +drwxr-xr-x root/root usr/lib/ +drwxr-xr-x root/root usr/lib/mc/ +-rwxr-xr-x root/root usr/lib/mc/cons.saver +-rwxr-xr-x root/root usr/lib/mc/mc-wrapper.csh +-rwxr-xr-x root/root usr/lib/mc/mc-wrapper.sh +-rwxr-xr-x root/root usr/lib/mc/mc.csh +-rwxr-xr-x root/root usr/lib/mc/mc.sh +drwxr-xr-x root/root usr/sbin/ +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/locale/ +drwxr-xr-x root/root usr/share/locale/fr/ +drwxr-xr-x root/root usr/share/locale/fr/LC_MESSAGES/ +-rw-r--r-- root/root usr/share/locale/fr/LC_MESSAGES/mc.mo +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/es/ +drwxr-xr-x root/root usr/share/man/es/man1/ +-rw-r--r-- root/root usr/share/man/es/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/hu/ +drwxr-xr-x root/root usr/share/man/hu/man1/ +-rw-r--r-- root/root usr/share/man/hu/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/it/ +drwxr-xr-x root/root usr/share/man/it/man1/ +-rw-r--r-- root/root usr/share/man/it/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/mc.1.gz +-rw-r--r-- root/root usr/share/man/man1/mcedit.1.gz +-rw-r--r-- root/root usr/share/man/man1/mcview.1.gz +drwxr-xr-x root/root usr/share/man/man8/ +drwxr-xr-x root/root usr/share/man/pl/ +drwxr-xr-x root/root usr/share/man/pl/man1/ +-rw-r--r-- root/root usr/share/man/pl/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/ru/ +drwxr-xr-x root/root usr/share/man/ru/man1/ +-rw-r--r-- root/root usr/share/man/ru/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/sr/ +drwxr-xr-x root/root usr/share/man/sr/man1/ +-rw-r--r-- root/root usr/share/man/sr/man1/mc.1.gz +drwxr-xr-x root/root usr/share/man/sr/man8/ +drwxr-xr-x root/root usr/share/mc/ +drwxr-xr-x root/root usr/share/mc/extfs/ +-rw-r--r-- root/root usr/share/mc/extfs/README +-rwxr-xr-x root/root usr/share/mc/extfs/a +-rwxr-xr-x root/root usr/share/mc/extfs/apt +-rwxr-xr-x root/root usr/share/mc/extfs/audio +-rwxr-xr-x root/root usr/share/mc/extfs/bpp +-rwxr-xr-x root/root usr/share/mc/extfs/deb +-rwxr-xr-x root/root usr/share/mc/extfs/deba +-rwxr-xr-x root/root usr/share/mc/extfs/debd +-rwxr-xr-x root/root usr/share/mc/extfs/dpkg +-rwxr-xr-x root/root usr/share/mc/extfs/hp48 +-rwxr-xr-x root/root usr/share/mc/extfs/iso9660 +-rwxr-xr-x root/root usr/share/mc/extfs/lslR +-rwxr-xr-x root/root usr/share/mc/extfs/mailfs +-rwxr-xr-x root/root usr/share/mc/extfs/patchfs +-rwxr-xr-x root/root usr/share/mc/extfs/rpm +-rwxr-xr-x root/root usr/share/mc/extfs/rpms +-rwxr-xr-x root/root usr/share/mc/extfs/s3 +-rwxr-xr-x root/root usr/share/mc/extfs/trpm +-rwxr-xr-x root/root usr/share/mc/extfs/uace +-rwxr-xr-x root/root usr/share/mc/extfs/ualz +-rwxr-xr-x root/root usr/share/mc/extfs/uar +-rwxr-xr-x root/root usr/share/mc/extfs/uarc +-rwxr-xr-x root/root usr/share/mc/extfs/uarj +-rwxr-xr-x root/root usr/share/mc/extfs/uc1541 +-rwxr-xr-x root/root usr/share/mc/extfs/ucab +-rwxr-xr-x root/root usr/share/mc/extfs/uha +-rwxr-xr-x root/root usr/share/mc/extfs/ulha +-rwxr-xr-x root/root usr/share/mc/extfs/urar +-rwxr-xr-x root/root usr/share/mc/extfs/uzip +-rwxr-xr-x root/root usr/share/mc/extfs/uzoo +-rw-r--r-- root/root usr/share/mc/mc.hint +-rw-r--r-- root/root usr/share/mc/mc.hint.cs +-rw-r--r-- root/root usr/share/mc/mc.hint.es +-rw-r--r-- root/root usr/share/mc/mc.hint.hu +-rw-r--r-- root/root usr/share/mc/mc.hint.it +-rw-r--r-- root/root usr/share/mc/mc.hint.nl +-rw-r--r-- root/root usr/share/mc/mc.hint.pl +-rw-r--r-- root/root usr/share/mc/mc.hint.ru +-rw-r--r-- root/root usr/share/mc/mc.hint.sr +-rw-r--r-- root/root usr/share/mc/mc.hint.uk +-rw-r--r-- root/root usr/share/mc/mc.hint.zh +-rw-r--r-- root/root usr/share/mc/mc.hlp +-rw-r--r-- root/root usr/share/mc/mc.hlp.es +-rw-r--r-- root/root usr/share/mc/mc.hlp.hu +-rw-r--r-- root/root usr/share/mc/mc.hlp.it +-rw-r--r-- root/root usr/share/mc/mc.hlp.pl +-rw-r--r-- root/root usr/share/mc/mc.hlp.ru +-rw-r--r-- root/root usr/share/mc/mc.hlp.sr +drwxr-xr-x root/root usr/share/mc/skins/ +-rw-r--r-- root/root usr/share/mc/skins/darkfar.ini +-rw-r--r-- root/root usr/share/mc/skins/default.ini +-rw-r--r-- root/root usr/share/mc/skins/double-lines.ini +-rw-r--r-- root/root usr/share/mc/skins/featured.ini +-rw-r--r-- root/root usr/share/mc/skins/gotar.ini +drwxr-xr-x root/root usr/share/mc/syntax/ +-rw-r--r-- root/root usr/share/mc/syntax/PKGBUILD.syntax +-rw-r--r-- root/root usr/share/mc/syntax/ada95.syntax +-rw-r--r-- root/root usr/share/mc/syntax/aspx.syntax +-rw-r--r-- root/root usr/share/mc/syntax/assembler.syntax +-rw-r--r-- root/root usr/share/mc/syntax/awk.syntax +-rw-r--r-- root/root usr/share/mc/syntax/c.syntax +-rw-r--r-- root/root usr/share/mc/syntax/cabal.syntax +-rw-r--r-- root/root usr/share/mc/syntax/changelog.syntax +-rw-r--r-- root/root usr/share/mc/syntax/cs.syntax +-rw-r--r-- root/root usr/share/mc/syntax/css.syntax +-rw-r--r-- root/root usr/share/mc/syntax/cxx.syntax +-rw-r--r-- root/root usr/share/mc/syntax/d.syntax +-rw-r--r-- root/root usr/share/mc/syntax/debian-changelog.syntax +-rw-r--r-- root/root usr/share/mc/syntax/debian-control.syntax +-rw-r--r-- root/root usr/share/mc/syntax/debian-description.syntax +-rw-r--r-- root/root usr/share/mc/syntax/debian-sources-list.syntax +-rw-r--r-- root/root usr/share/mc/syntax/diff.syntax +-rw-r--r-- root/root usr/share/mc/syntax/dos.syntax +-rw-r--r-- root/root usr/share/mc/syntax/ebuild.syntax +-rw-r--r-- root/root usr/share/mc/syntax/eiffel.syntax +-rw-r--r-- root/root usr/share/mc/syntax/erlang.syntax +-rw-r--r-- root/root usr/share/mc/syntax/f90.syntax +-rw-r--r-- root/root usr/share/mc/syntax/filehighlight.syntax +-rw-r--r-- root/root usr/share/mc/syntax/fortran.syntax +-rw-r--r-- root/root usr/share/mc/syntax/haskell.syntax +-rw-r--r-- root/root usr/share/mc/syntax/html.syntax +-rw-r--r-- root/root usr/share/mc/syntax/idl.syntax +-rw-r--r-- root/root usr/share/mc/syntax/j.syntax +-rw-r--r-- root/root usr/share/mc/syntax/java.syntax +-rw-r--r-- root/root usr/share/mc/syntax/js.syntax +-rw-r--r-- root/root usr/share/mc/syntax/latex.syntax +-rw-r--r-- root/root usr/share/mc/syntax/lisp.syntax +-rw-r--r-- root/root usr/share/mc/syntax/lsm.syntax +-rw-r--r-- root/root usr/share/mc/syntax/lua.syntax +-rw-r--r-- root/root usr/share/mc/syntax/m4.syntax +-rw-r--r-- root/root usr/share/mc/syntax/mail.syntax +-rw-r--r-- root/root usr/share/mc/syntax/makefile.syntax +-rw-r--r-- root/root usr/share/mc/syntax/ml.syntax +-rw-r--r-- root/root usr/share/mc/syntax/named.syntax +-rw-r--r-- root/root usr/share/mc/syntax/nemerle.syntax +-rw-r--r-- root/root usr/share/mc/syntax/nroff.syntax +-rw-r--r-- root/root usr/share/mc/syntax/octave.syntax +-rw-r--r-- root/root usr/share/mc/syntax/pascal.syntax +-rw-r--r-- root/root usr/share/mc/syntax/perl.syntax +-rw-r--r-- root/root usr/share/mc/syntax/php.syntax +-rw-r--r-- root/root usr/share/mc/syntax/po.syntax +-rw-r--r-- root/root usr/share/mc/syntax/povray.syntax +-rw-r--r-- root/root usr/share/mc/syntax/procmail.syntax +-rw-r--r-- root/root usr/share/mc/syntax/properties.syntax +-rw-r--r-- root/root usr/share/mc/syntax/python.syntax +-rw-r--r-- root/root usr/share/mc/syntax/ruby.syntax +-rw-r--r-- root/root usr/share/mc/syntax/sh.syntax +-rw-r--r-- root/root usr/share/mc/syntax/slang.syntax +-rw-r--r-- root/root usr/share/mc/syntax/smalltalk.syntax +-rw-r--r-- root/root usr/share/mc/syntax/spec.syntax +-rw-r--r-- root/root usr/share/mc/syntax/sql.syntax +-rw-r--r-- root/root usr/share/mc/syntax/strace.syntax +-rw-r--r-- root/root usr/share/mc/syntax/swig.syntax +-rw-r--r-- root/root usr/share/mc/syntax/syntax.syntax +-rw-r--r-- root/root usr/share/mc/syntax/tcl.syntax +-rw-r--r-- root/root usr/share/mc/syntax/texinfo.syntax +-rw-r--r-- root/root usr/share/mc/syntax/tt.syntax +-rw-r--r-- root/root usr/share/mc/syntax/unknown.syntax +-rw-r--r-- root/root usr/share/mc/syntax/verilog.syntax +-rw-r--r-- root/root usr/share/mc/syntax/vhdl.syntax +-rw-r--r-- root/root usr/share/mc/syntax/xml.syntax +-rw-r--r-- root/root usr/share/mc/syntax/yum-repo.syntax +-rw-r--r-- root/root usr/share/mc/syntax/yxx.syntax diff --git a/extra/mc/.md5sum b/extra/mc/.md5sum index 3dfcf5bae..f1262a2b6 100644 --- a/extra/mc/.md5sum +++ b/extra/mc/.md5sum @@ -1 +1,2 @@ -f48b2c8dd140aeb36f59d16a662f0779 29 +4618626cacd3481e39719a4571c1b5be mc-4.7.0.2.tar.bz2 +e43b3c780de82c1a70a98fc31ec5fbf9 mc-4.7.0.2_hotlist_syntax.patch diff --git a/extra/mc/Pkgfile b/extra/mc/Pkgfile index 329d4333d..f5d71dad5 100755 --- a/extra/mc/Pkgfile +++ b/extra/mc/Pkgfile @@ -2,29 +2,43 @@ # URL: http://www.ibiblio.org/mc/ # Maintainer: NuTyX coreteam # Packager: thierryn1 at hispeed dot ch -# Depends on: gpm, slang +# Depends on: p7zip, e2fsprogs, glib2, pcre, gpm, slang name=mc version=4.7.0.2 release=1 -_name=29 -source=(http://www.midnight-commander.org/downloads/${_name}) -# (http://www.ibiblio.org/pub/Linux/utils/file/managers/$name/$name-$version.tar.gz) -# http://www.linuxfromscratch.org/patches/blfs/6.3/$name-$version-bash32-1.patch \ -# http://www.linuxfriomscratch.org/patches/blfs/6.3/$name-$version-debian_fixes-1.patch \ -# ) +source=(http://www.midnight-commander.org/downloads/$name-$version.tar.bz2 \ + mc-4.7.0.2_hotlist_syntax.patch) build() { - cd ${_name} -# patch -Np1 -i ../mc-4.6.1-bash32-1.patch -# patch -Np1 -i ../mc-4.6.1-debian_fixes-1.patch - ./configure --prefix=/usr \ + cd $name-$version + patch -p1 < ../mc-4.7.0.2_hotlist_syntax.patch + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --with-glib12 \ - --without-x \ - --sysconfdir=/etc + --enable-background \ + --enable-charset \ + --enable-largefile \ + --with-edit \ + --with-gpm-mouse \ + --with-mmap \ + --with-samba \ + --with-screen=slang \ + --with-subshell \ + --with-vfs \ + --with-x \ + --without-debug \ + --without-gnome \ + --without-included-gettext \ + --libexecdir=/usr/lib + make - make DESTDIR=$PKG install - chmod 1755 $PKG/usr/lib/mc/cons.saver + make DESTDIR=$PKG install + # Fix FS#15177 + sed -i 's|op_has_zipinfo = 0|op_has_zipinfo = 1|' \ + $PKG/usr/share/mc/extfs/uzip + + # Fix FS#18312 + rm $PKG/usr/share/mc/extfs/u7z } diff --git a/extra/mc/mc-4.7.0.2_hotlist_syntax.patch b/extra/mc/mc-4.7.0.2_hotlist_syntax.patch new file mode 100644 index 000000000..2dc115ec2 --- /dev/null +++ b/extra/mc/mc-4.7.0.2_hotlist_syntax.patch @@ -0,0 +1,42 @@ +--- /lib/tty/tty-internal.h ++++ /lib/tty/tty-internal.h +@@ -8,4 +8,15 @@ + + #include "lib/global.h" /* include */ ++ ++/* Taken from S-Lang's slutty.c */ ++#ifdef ultrix /* Ultrix gets _POSIX_VDISABLE wrong! */ ++# define NULL_VALUE -1 ++#else ++# ifdef _POSIX_VDISABLE ++# define NULL_VALUE _POSIX_VDISABLE ++# else ++# define NULL_VALUE 255 ++# endif ++#endif + + /* If true lines are shown by spaces */ +--- /lib/tty/tty-ncurses.c ++++ /lib/tty/tty-ncurses.c +@@ -63,4 +63,5 @@ + + /*** file scope macro definitions **************************************/ ++ + #if defined(_AIX) && !defined(CTRL) + # define CTRL(x) ((x) & 0x1f) +@@ -159,4 +160,6 @@ + /* use Ctrl-g to generate SIGINT */ + cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */ ++ /* disable SIGQUIT to allow use Ctrl-\ key */ ++ cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE; + tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb); + +--- /misc/syntax/Syntax ++++ /misc/syntax/Syntax +@@ -140,5 +140,5 @@ + include spec.syntax + +-file ..\*\\.repo$ YUM\sRepo File ++file ..\*\\.repo$ YUM\sRepo\sFile + include yum-repo.syntax + -- cgit v1.2.3-70-g09d2