summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/mc/Makefile56
-rw-r--r--sysutils/mc/PLIST39
-rw-r--r--sysutils/mc/PLIST.charset4
-rw-r--r--sysutils/mc/PLIST.cons.saver4
-rw-r--r--sysutils/mc/PLIST.mcedit31
-rw-r--r--sysutils/mc/PLIST.vfs74
-rw-r--r--sysutils/mc/distinfo20
-rw-r--r--sysutils/mc/options.mk16
-rw-r--r--sysutils/mc/patches/patch-aa69
-rw-r--r--sysutils/mc/patches/patch-ab24
-rw-r--r--sysutils/mc/patches/patch-ac23
-rw-r--r--sysutils/mc/patches/patch-ad72
-rw-r--r--sysutils/mc/patches/patch-ae22
-rw-r--r--sysutils/mc/patches/patch-af14
-rw-r--r--sysutils/mc/patches/patch-su18
15 files changed, 277 insertions, 209 deletions
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 8e5e25607a5..20521cec950 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.77 2011/01/13 14:03:21 wiz Exp $
+# $NetBSD: Makefile,v 1.78 2011/01/23 14:36:10 wiz Exp $
-DISTNAME= mc-4.6.1
-PKGREVISION= 7
+DISTNAME= mc-4.7.0.10
+PKGREVISION= 1
CATEGORIES= sysutils
-MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
- ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
+MASTER_SITES= http://www.midnight-commander.org/downloads/
+EXTRACT_SUFX= .tar.bz2
-MAINTAINER= pavel.arnost@clnet.cz
-HOMEPAGE= http://www.ibiblio.org/mc/
+MAINTAINER= vle@gmx.net
+HOMEPAGE= http://www.midnight-commander.org/
COMMENT= User-friendly file manager and visual shell
+LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_TOOLS+= pkg-config unzip:run zip:run
+USE_TOOLS+= pkg-config unzip:run
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
@@ -29,28 +30,39 @@ CONFIGURE_ARGS+= --without-gpm-mouse
CONFIGURE_ARGS+= UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip}
PLIST_SRC+= ${PKGDIR}/PLIST
+
.include "options.mk"
-PKG_SYSCONFSUBDIR= mc
-SUBST_CLASSES+= conf
-SUBST_STAGE.conf= post-patch
-SUBST_FILES.conf= vfs/extfs.c vfs/sfs.c
-SUBST_VARS.conf= PKG_SYSCONFDIR
+EGDIR= ${PREFIX}/share/examples/mc
+
+CONFFILES= cedit.menu edit.indent.rc edit.spell.rc filehighlight.ini \
+ mc.ext mc.keymap mc.keymap.default mc.keymap.emacs mc.lib \
+ mc.menu mc.menu.sr
+
+.if !empty(PKG_OPTIONS:Medit)
+CONFFILES+= syntax/Syntax
+.endif
.if !empty(PKG_OPTIONS:Mvfs)
-EGDIR= ${PREFIX}/share/examples/mc
-CONF_FILES+= ${EGDIR}/extfs.ini ${PKG_SYSCONFDIR}/extfs.ini
-CONF_FILES+= ${EGDIR}/sfs.ini ${PKG_SYSCONFDIR}/sfs.ini
+CONFFILES+= sfs.ini
.endif
+.if !empty(PKG_OPTIONS:Mcharset)
+CONFFILES+= mc.charsets
+.endif
+
+OWN_DIRS+= ${PKG_SYSCONFDIR}/mc ${PKG_SYSCONFDIR}/mc/syntax
+
+.for i in ${CONFFILES}
+CONF_FILES+= ${EGDIR}/${i} ${PKG_SYSCONFDIR}/mc/${i}
+.endfor
+
+INSTALLATION_DIRS+= ${EGDIR} ${EGDIR}/syntax
+
post-install:
# remove dir if no extensions were installed there
- rmdir ${DESTDIR}${PREFIX:Q}/lib/mc 2>/dev/null || ${TRUE}
-.if !empty(PKG_OPTIONS:Mvfs)
- ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/extfs.ini ${DESTDIR}${EGDIR}
- ${INSTALL_DATA} ${WRKSRC}/vfs/extfs/sfs.ini ${DESTDIR}${EGDIR}
-.endif
+ rmdir ${DESTDIR}${PREFIX}/lib/mc 2>/dev/null || ${TRUE}
.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST
index 7efa301b9d2..b0e11b5830b 100644
--- a/sysutils/mc/PLIST
+++ b/sysutils/mc/PLIST
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 21:28:47 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/01/23 14:36:10 wiz Exp $
bin/mc
bin/mcmfmt
bin/mcview
+libexec/mc/mc-wrapper.csh
+libexec/mc/mc-wrapper.sh
+libexec/mc/mc.csh
+libexec/mc/mc.sh
man/es/man1/mc.1
man/hu/man1/mc.1
man/it/man1/mc.1
@@ -11,8 +15,20 @@ man/man1/mcview.1
man/pl/man1/mc.1
man/ru/man1/mc.1
man/sr/man1/mc.1
+share/examples/mc/cedit.menu
+share/examples/mc/edit.indent.rc
+share/examples/mc/edit.spell.rc
+share/examples/mc/filehighlight.ini
+share/examples/mc/mc.ext
+share/examples/mc/mc.keymap
+share/examples/mc/mc.keymap.default
+share/examples/mc/mc.keymap.emacs
+share/examples/mc/mc.lib
+share/examples/mc/mc.menu
+share/examples/mc/mc.menu.sr
share/locale/az/LC_MESSAGES/mc.mo
share/locale/be/LC_MESSAGES/mc.mo
+share/locale/be@tarask/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
@@ -23,15 +39,17 @@ 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/gl/LC_MESSAGES/mc.mo
share/locale/hu/LC_MESSAGES/mc.mo
+share/locale/id/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/lt/LC_MESSAGES/mc.mo
share/locale/lv/LC_MESSAGES/mc.mo
share/locale/mn/LC_MESSAGES/mc.mo
+share/locale/nb/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
@@ -44,17 +62,10 @@ 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/vi/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/bin/mc-wrapper.csh
-share/mc/bin/mc-wrapper.sh
-share/mc/bin/mc.csh
-share/mc/bin/mc.sh
-share/mc/cedit.menu
-share/mc/edit.indent.rc
-share/mc/edit.spell.rc
-share/mc/mc.ext
share/mc/mc.hint
share/mc/mc.hint.cs
share/mc/mc.hint.es
@@ -73,6 +84,8 @@ share/mc/mc.hlp.it
share/mc/mc.hlp.pl
share/mc/mc.hlp.ru
share/mc/mc.hlp.sr
-share/mc/mc.lib
-share/mc/mc.menu
-share/mc/mc.menu.sr
+share/mc/skins/darkfar.ini
+share/mc/skins/default.ini
+share/mc/skins/double-lines.ini
+share/mc/skins/featured.ini
+share/mc/skins/gotar.ini
diff --git a/sysutils/mc/PLIST.charset b/sysutils/mc/PLIST.charset
index 1f6b2e66f55..f5fa3e1ff2c 100644
--- a/sysutils/mc/PLIST.charset
+++ b/sysutils/mc/PLIST.charset
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.charset,v 1.1 2005/01/15 21:15:26 wiz Exp $
-share/mc/mc.charsets
+@comment $NetBSD: PLIST.charset,v 1.2 2011/01/23 14:36:10 wiz Exp $
+share/examples/mc/mc.charsets
diff --git a/sysutils/mc/PLIST.cons.saver b/sysutils/mc/PLIST.cons.saver
index 127f9a9a4f4..5cdc45dbb86 100644
--- a/sysutils/mc/PLIST.cons.saver
+++ b/sysutils/mc/PLIST.cons.saver
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST.cons.saver,v 1.2 2009/06/14 18:16:09 joerg Exp $
-lib/mc/cons.saver
+@comment $NetBSD: PLIST.cons.saver,v 1.3 2011/01/23 14:36:10 wiz Exp $
+libexec/mc/cons.saver
diff --git a/sysutils/mc/PLIST.mcedit b/sysutils/mc/PLIST.mcedit
index 75769678c31..f67c0e900d9 100644
--- a/sysutils/mc/PLIST.mcedit
+++ b/sysutils/mc/PLIST.mcedit
@@ -1,18 +1,35 @@
-@comment $NetBSD: PLIST.mcedit,v 1.5 2009/06/14 18:16:09 joerg Exp $
+@comment $NetBSD: PLIST.mcedit,v 1.6 2011/01/23 14:36:10 wiz Exp $
bin/mcedit
-share/mc/syntax/Syntax
+share/examples/mc/syntax/Syntax
+share/mc/syntax/PKGBUILD.syntax
share/mc/syntax/ada95.syntax
share/mc/syntax/aspx.syntax
share/mc/syntax/assembler.syntax
+share/mc/syntax/awk.syntax
share/mc/syntax/c.syntax
+share/mc/syntax/cabal.syntax
share/mc/syntax/changelog.syntax
share/mc/syntax/cs.syntax
+share/mc/syntax/css.syntax
+share/mc/syntax/cxx.syntax
+share/mc/syntax/d.syntax
+share/mc/syntax/debian-changelog.syntax
+share/mc/syntax/debian-control.syntax
+share/mc/syntax/debian-description.syntax
+share/mc/syntax/debian-sources-list.syntax
share/mc/syntax/diff.syntax
share/mc/syntax/dos.syntax
+share/mc/syntax/ebuild.syntax
share/mc/syntax/eiffel.syntax
+share/mc/syntax/erlang.syntax
+share/mc/syntax/f90.syntax
+share/mc/syntax/filehighlight.syntax
share/mc/syntax/fortran.syntax
+share/mc/syntax/haskell.syntax
share/mc/syntax/html.syntax
share/mc/syntax/idl.syntax
+share/mc/syntax/ini.syntax
+share/mc/syntax/j.syntax
share/mc/syntax/java.syntax
share/mc/syntax/js.syntax
share/mc/syntax/latex.syntax
@@ -23,6 +40,8 @@ share/mc/syntax/m4.syntax
share/mc/syntax/mail.syntax
share/mc/syntax/makefile.syntax
share/mc/syntax/ml.syntax
+share/mc/syntax/named.syntax
+share/mc/syntax/nemerle.syntax
share/mc/syntax/nroff.syntax
share/mc/syntax/octave.syntax
share/mc/syntax/pascal.syntax
@@ -30,6 +49,8 @@ share/mc/syntax/perl.syntax
share/mc/syntax/php.syntax
share/mc/syntax/po.syntax
share/mc/syntax/povray.syntax
+share/mc/syntax/procmail.syntax
+share/mc/syntax/properties.syntax
share/mc/syntax/python.syntax
share/mc/syntax/ruby.syntax
share/mc/syntax/sh.syntax
@@ -37,9 +58,15 @@ share/mc/syntax/slang.syntax
share/mc/syntax/smalltalk.syntax
share/mc/syntax/spec.syntax
share/mc/syntax/sql.syntax
+share/mc/syntax/strace.syntax
share/mc/syntax/swig.syntax
share/mc/syntax/syntax.syntax
share/mc/syntax/tcl.syntax
share/mc/syntax/texinfo.syntax
+share/mc/syntax/tt.syntax
share/mc/syntax/unknown.syntax
+share/mc/syntax/verilog.syntax
+share/mc/syntax/vhdl.syntax
share/mc/syntax/xml.syntax
+share/mc/syntax/yum-repo.syntax
+share/mc/syntax/yxx.syntax
diff --git a/sysutils/mc/PLIST.vfs b/sysutils/mc/PLIST.vfs
index b0f7dcf5157..0b28f3bbe9a 100644
--- a/sysutils/mc/PLIST.vfs
+++ b/sysutils/mc/PLIST.vfs
@@ -1,27 +1,49 @@
-@comment $NetBSD: PLIST.vfs,v 1.3 2009/06/14 18:16:09 joerg Exp $
-share/examples/mc/extfs.ini
+@comment $NetBSD: PLIST.vfs,v 1.4 2011/01/23 14:36:10 wiz Exp $
+libexec/mc/extfs.d/README
+libexec/mc/extfs.d/README.extfs
+libexec/mc/extfs.d/a+
+libexec/mc/extfs.d/apt+
+libexec/mc/extfs.d/audio
+libexec/mc/extfs.d/bpp
+libexec/mc/extfs.d/deb
+libexec/mc/extfs.d/deba
+libexec/mc/extfs.d/debd
+libexec/mc/extfs.d/dpkg+
+libexec/mc/extfs.d/hp48+
+libexec/mc/extfs.d/iso9660
+libexec/mc/extfs.d/lslR
+libexec/mc/extfs.d/mailfs
+libexec/mc/extfs.d/patchfs
+libexec/mc/extfs.d/rpm
+libexec/mc/extfs.d/rpms+
+libexec/mc/extfs.d/s3+
+libexec/mc/extfs.d/trpm
+libexec/mc/extfs.d/u7z
+libexec/mc/extfs.d/uace
+libexec/mc/extfs.d/ualz
+libexec/mc/extfs.d/uar
+libexec/mc/extfs.d/uarc
+libexec/mc/extfs.d/uarj
+libexec/mc/extfs.d/uc1541
+libexec/mc/extfs.d/ucab
+libexec/mc/extfs.d/uha
+libexec/mc/extfs.d/ulha
+libexec/mc/extfs.d/urar
+libexec/mc/extfs.d/uzip
+libexec/mc/extfs.d/uzoo
+libexec/mc/fish/README.fish
+libexec/mc/fish/append
+libexec/mc/fish/chmod
+libexec/mc/fish/chown
+libexec/mc/fish/fexists
+libexec/mc/fish/get
+libexec/mc/fish/hardlink
+libexec/mc/fish/info
+libexec/mc/fish/ln
+libexec/mc/fish/ls
+libexec/mc/fish/mkdir
+libexec/mc/fish/mv
+libexec/mc/fish/rmdir
+libexec/mc/fish/send
+libexec/mc/fish/unlink
share/examples/mc/sfs.ini
-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/hp48
-share/mc/extfs/iso9660
-share/mc/extfs/lslR
-share/mc/extfs/mailfs
-share/mc/extfs/patchfs
-share/mc/extfs/rpm
-share/mc/extfs/rpms
-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
diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo
index 19d10d87691..0054d12d4b7 100644
--- a/sysutils/mc/distinfo
+++ b/sysutils/mc/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.19 2010/02/24 17:56:20 drochner Exp $
+$NetBSD: distinfo,v 1.20 2011/01/23 14:36:10 wiz Exp $
-SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
-RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
-Size (mc-4.6.1.tar.gz) = 3928370 bytes
-SHA1 (patch-aa) = 7168617908acb8aead0109308845513316ff3f18
-SHA1 (patch-ab) = 11677a3029ee2669d8a74a47188cff728052f408
-SHA1 (patch-ac) = 9d35fbfb73a3c5b9bc7dff604599d63069fc62ab
-SHA1 (patch-ad) = 78e0c111ca92f55701a0963b049b1dfef9f06cf1
-SHA1 (patch-ae) = d7e097b4b07b7d31475ae7424686365534f20a17
-SHA1 (patch-su) = adad37f777fd2db905108fbd8d1b1a139cf1352a
+SHA1 (mc-4.7.0.10.tar.bz2) = 2bc13f963780eaddac2f675b9145656d759f974e
+RMD160 (mc-4.7.0.10.tar.bz2) = 83a527a94a81f886eb7f80b8965554bf927cad65
+Size (mc-4.7.0.10.tar.bz2) = 2862849 bytes
+SHA1 (patch-aa) = bf11aa2e9c6bd4b057b3af33c7d831e3e1e7fe02
+SHA1 (patch-ab) = 570977e37c54084d946d5871822e5ea24b0ed253
+SHA1 (patch-ac) = 04ee1f389ef7015d4976544404d8b9245839bf7b
+SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95
+SHA1 (patch-ae) = b25734f82e46a92eb2a6d6590b0f7524f63040b3
+SHA1 (patch-af) = cff069eb20a5df7095805e800a141f8bb1d94c7d
diff --git a/sysutils/mc/options.mk b/sysutils/mc/options.mk
index 3b308fd1bf6..d351e989249 100644
--- a/sysutils/mc/options.mk
+++ b/sysutils/mc/options.mk
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.11 2011/01/23 14:28:58 wiz Exp $
+# $NetBSD: options.mk,v 1.12 2011/01/23 14:36:10 wiz Exp $
#
PKG_OPTIONS_VAR= PKG_OPTIONS.mc
PKG_OPTIONS_REQUIRED_GROUPS= screen
PKG_OPTIONS_GROUP.screen= ncurses slang
-PKG_SUPPORTED_OPTIONS= glib12 mc-charset mc-edit mc-samba mc-subshell mc-vfs x11
+PKG_SUPPORTED_OPTIONS= mc-charset mc-edit mc-samba mc-subshell mc-vfs x11
PKG_SUGGESTED_OPTIONS= mc-charset mc-edit mc-subshell mc-vfs slang
# remove after pkgsrc-2010Q1
@@ -34,15 +34,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.mcedit
CONFIGURE_ARGS+= --without-edit
.endif
-### On some systems where glib-2.0 does not build, glib-1.2 can be used
-### instead.
-.if !empty(PKG_OPTIONS:Mglib12)
-CONFIGURE_ARGS+= --with-glib12
-.include "../../devel/glib/buildlink3.mk"
-.else
-.include "../../devel/glib2/buildlink3.mk"
-.endif
-
### Enable the Samba virtual file system. You can connect to Windows
### file servers or Samba servers in your network.
.if !empty(PKG_OPTIONS:Mmc-samba)
@@ -62,11 +53,10 @@ CONFIGURE_ARGS+= --without-subshell
### VFS you can access files via FTP, SSH, in various archive formats
### like if they were on your local disk.
.if !empty(PKG_OPTIONS:Mmc-vfs)
-CONFIGURE_ARGS+= --with-vfs
PLIST_SRC+= ${PKGDIR}/PLIST.vfs
USE_TOOLS+= perl:run
.else
-CONFIGURE_ARGS+= --without-vfs
+CONFIGURE_ARGS+= --disable-vfs
.endif
### X11 support allows better key handling (detection of the Alt, Ctrl,
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
index 8ae6a136eac..dc29c4b8020 100644
--- a/sysutils/mc/patches/patch-aa
+++ b/sysutils/mc/patches/patch-aa
@@ -1,13 +1,62 @@
-$NetBSD: patch-aa,v 1.14 2008/02/14 12:26:56 drochner Exp $
+$NetBSD: patch-aa,v 1.15 2011/01/23 14:36:10 wiz Exp $
---- vfs/extfs.c.orig 2008-02-14 12:26:28.000000000 +0100
-+++ vfs/extfs.c
-@@ -1278,7 +1278,7 @@ static int extfs_init (struct vfs_class
- char *mc_extfsini;
- char key[256];
+https://midnight-commander.org/ticket/2425
+Fixes segmentation fault on NetBSD
+--- src/mountlist.c.orig 2010-11-08 11:46:14.000000000 +0000
++++ src/mountlist.c
+@@ -54,6 +54,7 @@
-- mc_extfsini = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR "extfs.ini");
-+ mc_extfsini = concat_dir_and_file ("@PKG_SYSCONFDIR@", "extfs.ini");
- cfg = fopen (mc_extfsini, "r");
+ #ifdef MOUNTED_GETMNTINFO2 /* NetBSD 3.0. */
+ #include <sys/statvfs.h>
++#define statfs statvfs
+ #endif
- /* We may not use vfs_die() message or message or similar,
+ #ifdef MOUNTED_GETMNT /* Ultrix. */
+@@ -364,7 +365,8 @@ read_filesystem_list (int need_fs_type,
+ #endif /* MOUNTED */
+ #endif /* MOUNTED_GETMNTENT1 */
+
+-#ifdef MOUNTED_GETMNTINFO /* 4.4BSD. */
++#if defined(MOUNTED_GETMNTINFO) || defined(MOUNTED_GETMNTINFO2)
++/* 4.4BSD and NetBSD>=3 */
+ {
+ struct statfs *fsp;
+ int entries;
+@@ -376,7 +378,7 @@ read_filesystem_list (int need_fs_type,
+ me = (struct mount_entry *) malloc (sizeof (struct mount_entry));
+ me->me_devname = strdup (fsp->f_mntfromname);
+ me->me_mountdir = strdup (fsp->f_mntonname);
+-#ifdef HAVE_STRUCT_STATFS_F_FSTYPENAME
++#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME) || defined(MOUNTED_GETMNTINFO2)
+ me->me_type = strdup (fsp->f_fstypename);
+ #else
+ me->me_type = fstype_to_string (fsp->f_type);
+@@ -392,28 +394,6 @@ read_filesystem_list (int need_fs_type,
+ }
+ #endif /* MOUNTED_GETMNTINFO */
+
+-#ifdef MOUNTED_GETMNTINFO2 /* NetBSD 3.0. */
+- {
+- struct statvfs *fsp;
+- int entries;
+-
+- entries = getmntinfo (&fsp, MNT_NOWAIT);
+- if (entries < 0)
+- return NULL;
+- for (; entries-- > 0; fsp++) {
+- me = (struct mount_entry *) malloc (sizeof (struct mount_entry));
+- me->me_devname = strdup (fsp->f_mntfromname);
+- me->me_mountdir = strdup (fsp->f_mntonname);
+- me->me_type = strdup (fsp->f_fstypename);
+- me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
+-
+- /* Add to the linked list. */
+- mtail->me_next = me;
+- mtail = me;
+- }
+- }
+-#endif /* MOUNTED_GETMNTINFO2 */
+-
+ #ifdef MOUNTED_GETMNT /* Ultrix. */
+ {
+ int offset = 0;
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index 58c236aa24a..5fc613be2e7 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -1,13 +1,17 @@
-$NetBSD: patch-ab,v 1.13 2008/02/14 12:26:56 drochner Exp $
+$NetBSD: patch-ab,v 1.14 2011/01/23 14:36:10 wiz Exp $
---- vfs/sfs.c.orig 2008-02-14 12:27:01.000000000 +0100
-+++ vfs/sfs.c
-@@ -314,7 +314,7 @@ static int sfs_init (struct vfs_class *m
- FILE *cfg;
- char key[256];
+http://midnight-commander.org/ticket/2476
+--- lib/vfs/mc-vfs/ftpfs.c.orig 2010-11-08 11:46:13.000000000 +0000
++++ lib/vfs/mc-vfs/ftpfs.c
+@@ -115,9 +115,9 @@ What to do with this?
+ #define INADDR_NONE 0xffffffff
+ #endif
-- mc_sfsini = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR "sfs.ini");
-+ mc_sfsini = concat_dir_and_file ("@PKG_SYSCONFDIR@", "sfs.ini");
- cfg = fopen (mc_sfsini, "r");
+-/* for uclibc < 0.9.29 */
++/* for systems that doesn't provide AI_ADDRCONFIG */
+ #ifndef AI_ADDRCONFIG
+-#define AI_ADDRCONFIG 0x0020
++#define AI_ADDRCONFIG 0
+ #endif
- if (!cfg){
+ #define RFC_AUTODETECT 0
diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac
index 71b38877ad2..e6fc92e8b7d 100644
--- a/sysutils/mc/patches/patch-ac
+++ b/sysutils/mc/patches/patch-ac
@@ -1,13 +1,14 @@
-$NetBSD: patch-ac,v 1.9 2008/02/14 12:26:56 drochner Exp $
+$NetBSD: patch-ac,v 1.10 2011/01/23 14:36:10 wiz Exp $
---- vfs/extfs/Makefile.in.orig 2008-02-14 12:56:12.000000000 +0100
-+++ vfs/extfs/Makefile.in
-@@ -226,7 +226,7 @@ target_alias = @target_alias@
- extfsdir = $(pkgdatadir)/extfs
+for installing configs to share/examples/mc
+--- misc/Makefile.in.orig 2010-07-05 19:13:19.000000000 +0000
++++ misc/Makefile.in
+@@ -369,7 +369,7 @@ LIBFILES_CONST = \
+ mc.menu.sr
- # Files to install and distribute other than extfs scripts
--EXTFS_MISC = README extfs.ini sfs.ini
-+EXTFS_MISC = README
-
- # Scripts hat don't need adaptation to the local system
- EXTFS_CONST = bpp rpm trpm
+ CLEANFILES = $(SCRIPTS_OUT)
+-cfgdir = $(sysconfdir)/@PACKAGE@
++cfgdir = @datadir@/examples/@PACKAGE@
+ cfg_DATA = \
+ $(LIBFILES_CONST) \
+ $(LIBFILES_OUT) \
diff --git a/sysutils/mc/patches/patch-ad b/sysutils/mc/patches/patch-ad
index 7ae6cd8adbb..098e1f45dbf 100644
--- a/sysutils/mc/patches/patch-ad
+++ b/sysutils/mc/patches/patch-ad
@@ -1,62 +1,14 @@
-$NetBSD: patch-ad,v 1.9 2009/12/16 15:29:48 joerg Exp $
+$NetBSD: patch-ad,v 1.10 2011/01/23 14:36:10 wiz Exp $
---- src/find.c.orig 2005-05-27 14:19:18.000000000 +0000
-+++ src/find.c
-@@ -606,18 +606,7 @@ do_search (struct Dlg_head *h)
- stop_idle (h);
- return 0;
- }
-- if (find_ignore_dirs){
-- int found;
-- char *temp_dir = g_strconcat (":", tmp, ":", (char *) NULL);
--
-- found = strstr (find_ignore_dirs, temp_dir) != 0;
-- g_free (temp_dir);
-- if (found)
-- g_free (tmp);
-- else
-- break;
-- } else
-- break;
-+ break;
- }
+for installing configs to share/examples/mc
+--- contrib/Makefile.in.orig 2010-07-05 19:13:15.000000000 +0000
++++ contrib/Makefile.in
+@@ -356,7 +356,7 @@ noinst_DATA = README.xterm mcserv.init m
+ 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
+ pkglibexec_SCRIPTS = $(SCRIPTS_OUT)
+-cfgdir = $(sysconfdir)/@PACKAGE@
++cfgdir = @datadir@/examples/@PACKAGE@
+ cfg_DATA = \
+ $(LIBFILES_ADD)
- g_free (directory);
-@@ -652,14 +641,30 @@ do_search (struct Dlg_head *h)
- return 1;
- }
-
-- if (subdirs_left && directory) { /* Can directory be NULL ? */
-- char *tmp_name = concat_dir_and_file (directory, dp->d_name);
-- if (!mc_lstat (tmp_name, &tmp_stat)
-- && S_ISDIR (tmp_stat.st_mode)) {
-- push_directory (tmp_name);
-- subdirs_left--;
-+ if (directory) { /* Can directory be NULL ? */
-+ char *tmp_name;
-+ if (find_ignore_dirs){
-+ int found;
-+
-+ tmp_name = g_strconcat (":", dp->d_name, ":", (char *) NULL);
-+
-+ found = strstr (find_ignore_dirs, tmp_name) != 0;
-+ g_free (tmp_name);
-+ if (found) {
-+ dp = mc_readdir (dirp);
-+ return 1;
-+ }
-+ }
-+
-+ if (subdirs_left) {
-+ tmp_name = concat_dir_and_file (directory, dp->d_name);
-+ if (!mc_lstat (tmp_name, &tmp_stat)
-+ && S_ISDIR (tmp_stat.st_mode)) {
-+ push_directory (tmp_name);
-+ subdirs_left--;
-+ }
-+ g_free (tmp_name);
- }
-- g_free (tmp_name);
- }
-
- if (regexp_match (find_pattern, dp->d_name, match_file)){
diff --git a/sysutils/mc/patches/patch-ae b/sysutils/mc/patches/patch-ae
index dfb5a684873..dd64650fe6d 100644
--- a/sysutils/mc/patches/patch-ae
+++ b/sysutils/mc/patches/patch-ae
@@ -1,12 +1,14 @@
-$NetBSD: patch-ae,v 1.9 2010/02/24 17:56:20 drochner Exp $
+$NetBSD: patch-ae,v 1.10 2011/01/23 14:36:10 wiz Exp $
---- src/slint.c.orig 2005-05-27 14:19:18.000000000 +0000
-+++ src/slint.c
-@@ -179,6 +179,7 @@ slang_init (void)
- {
- struct sigaction act, oact;
-
-+ SLutf8_enable (-1);
- SLtt_get_terminfo ();
+for installing configs to share/examples/mc
+--- misc/syntax/Makefile.in.orig 2010-07-05 19:13:19.000000000 +0000
++++ misc/syntax/Makefile.in
+@@ -386,7 +386,7 @@ SYNTAXCONFFILES = \
- /*
+ @USE_EDIT_TRUE@syntaxdir = $(pkgdatadir)/syntax
+ @USE_EDIT_TRUE@syntax_DATA = $(SYNTAXFILES)
+-@USE_EDIT_TRUE@syntaxconfdir = $(sysconfdir)/@PACKAGE@
++@USE_EDIT_TRUE@syntaxconfdir = @datadir@/examples/@PACKAGE@/syntax
+ @USE_EDIT_TRUE@syntaxconf_DATA = $(SYNTAXCONFFILES)
+ EXTRA_DIST = $(SYNTAXFILES) $(SYNTAXCONFFILES)
+ all: all-am
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
new file mode 100644
index 00000000000..ef14d477f2b
--- /dev/null
+++ b/sysutils/mc/patches/patch-af
@@ -0,0 +1,14 @@
+$NetBSD: patch-af,v 1.13 2011/01/23 14:36:10 wiz Exp $
+
+for installing configs to share/examples/mc
+--- lib/vfs/mc-vfs/extfs/Makefile.in.orig 2010-07-05 19:13:19.000000000 +0000
++++ lib/vfs/mc-vfs/extfs/Makefile.in
+@@ -391,7 +391,7 @@ EXTFS_OUT = \
+
+ @ENABLE_VFS_TRUE@extfs_DATA = $(EXTFS_MISC)
+ @ENABLE_VFS_TRUE@extfs_SCRIPTS = $(EXTFS_CONST) $(EXTFS_OUT)
+-@ENABLE_VFS_TRUE@extfsconfdir = $(sysconfdir)/@PACKAGE@
++@ENABLE_VFS_TRUE@extfsconfdir = @datadir@/examples/@PACKAGE@
+ @ENABLE_VFS_TRUE@extfsconf_DATA = $(EXTFSCONFFILES)
+ EXTRA_DIST = $(EXTFS_MISC) $(EXTFS_CONST) $(EXTFSCONFFILES)
+ all: all-am
diff --git a/sysutils/mc/patches/patch-su b/sysutils/mc/patches/patch-su
deleted file mode 100644
index f306a508d92..00000000000
--- a/sysutils/mc/patches/patch-su
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-su,v 1.1 2008/02/13 10:20:57 rillig Exp $
-
-Old bash versions required octal characters with 3 digits, newer
-versions (>= 2.05) require 4 digits.
-
---- src/subshell.c.orig 2007-08-14 14:25:55.000000000 +0200
-+++ src/subshell.c 2007-08-14 14:37:39.000000000 +0200
-@@ -728,8 +728,8 @@ subshell_name_quote (const char *s)
- if (isalpha ((unsigned char) *s)) {
- *d++ = (unsigned char) *s;
- } else {
-- sprintf (d, "\\%03o", (unsigned char) *s);
-- d += 4;
-+ sprintf (d, "\\%04o", (unsigned char) *s);
-+ d += 5;
- }
- }
- } else {
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 21:19:42 +0000