diff options
-rw-r--r-- | misc/mc/Makefile | 8 | ||||
-rw-r--r-- | misc/mc/distinfo | 4 | ||||
-rw-r--r-- | misc/mc/files/patch-lib__tty__win.c | 15 | ||||
-rw-r--r-- | misc/mc/files/patch-mc-wrapper | 18 | ||||
-rw-r--r-- | misc/mc/pkg-plist | 89 |
5 files changed, 54 insertions, 80 deletions
diff --git a/misc/mc/Makefile b/misc/mc/Makefile index b78b74f68c92..dc3368a0e580 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mc -PORTVERSION= 4.8.12 -PORTREVISION= 2 +PORTVERSION= 4.8.13 CATEGORIES= misc shells MASTER_SITES= http://ftp.midnight-commander.org/ \ http://ftp.osuosl.org/pub/midnightcommander/ \ @@ -22,13 +21,14 @@ LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 CONFLICTS= mc-light-4* USES= gmake shebangfix perl5 pkgconfig tar:xz libtool -SHEBANG_FILES= misc/mcedit.menu configure configure.ac \ +SHEBANG_FILES= misc/mcedit.menu.in configure configure.ac \ + ${WRKSRC}/src/vfs/extfs/helpers/Makefile.in \ ${WRKSRC}/src/vfs/extfs/helpers/s3+.in \ ${WRKSRC}/src/vfs/extfs/helpers/uc1541.in python_OLD_CMD= @PYTHON@ USE_GNOME= glib20 GNU_CONFIGURE= yes -CONFIGURE_ENV= ZIP=${UNZIP_CMD} UNZIP=${UNZIP_CMD} +CONFIGURE_ENV= ZIP=${ZIP_CMD} UNZIP=${UNZIP_CMD} OPTIONS_DEFINE= DOCS EDITOR ICONV NLS SMB SUBSHELL X11 diff --git a/misc/mc/distinfo b/misc/mc/distinfo index e2b96e38ba3a..e4088d84ee71 100644 --- a/misc/mc/distinfo +++ b/misc/mc/distinfo @@ -1,4 +1,4 @@ -SHA256 (mc-4.8.12.tar.xz) = 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe -SIZE (mc-4.8.12.tar.xz) = 2237892 +SHA256 (mc-4.8.13.tar.xz) = 36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 +SIZE (mc-4.8.13.tar.xz) = 2231448 SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe SIZE (mc.png) = 6466 diff --git a/misc/mc/files/patch-lib__tty__win.c b/misc/mc/files/patch-lib__tty__win.c index cf51d91365af..3aafff6bf4b5 100644 --- a/misc/mc/files/patch-lib__tty__win.c +++ b/misc/mc/files/patch-lib__tty__win.c @@ -1,15 +1,6 @@ ---- ./lib/tty/win.c.orig 2013-09-02 19:13:32.000000000 +0200 -+++ ./lib/tty/win.c 2013-12-07 10:33:20.000000000 +0100 -@@ -96,7 +96,7 @@ - void - do_enter_ca_mode (void) - { -- if (mc_global.tty.xterm_flag && smcup != NULL) -+ if (mc_global.tty.xterm_flag) - { - fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h"); - fflush (stdout); -@@ -108,7 +108,7 @@ +--- lib/tty/win.c.orig 2014-09-02 09:23:58 UTC ++++ lib/tty/win.c +@@ -107,7 +107,7 @@ void do_exit_ca_mode (void) { diff --git a/misc/mc/files/patch-mc-wrapper b/misc/mc/files/patch-mc-wrapper deleted file mode 100644 index bad58d1cfbe7..000000000000 --- a/misc/mc/files/patch-mc-wrapper +++ /dev/null @@ -1,18 +0,0 @@ ---- contrib/mc-wrapper.csh.in.orig Wed Nov 6 00:46:12 2002 -+++ contrib/mc-wrapper.csh.in Tue Jun 15 03:16:29 2004 -@@ -14,5 +14,5 @@ - unsetenv MC_PWD - endif - --rm -f "$MC_PWD_FILE" -+/bin/rm -f "$MC_PWD_FILE" - unsetenv MC_PWD_FILE ---- contrib/mc-wrapper.sh.in.orig Wed Nov 6 00:46:12 2002 -+++ contrib/mc-wrapper.sh.in Tue Jun 15 03:16:29 2004 -@@ -9,5 +9,5 @@ - unset MC_PWD - fi - --rm -f "$MC_PWD_FILE" -+/bin/rm -f "$MC_PWD_FILE" - unset MC_PWD_FILE diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist index d025eb2dda98..7b0915aec8d1 100644 --- a/misc/mc/pkg-plist +++ b/misc/mc/pkg-plist @@ -2,16 +2,16 @@ bin/mc bin/mcdiff %%EDITOR%%bin/mcedit bin/mcview -etc/mc/edit.indent.rc -etc/mc/filehighlight.ini -etc/mc/mc.default.keymap -etc/mc/mc.emacs.keymap -etc/mc/mc.ext -etc/mc/mc.keymap -etc/mc/mc.menu -etc/mc/mc.menu.sr -etc/mc/mcedit.menu -etc/mc/sfs.ini +%%ETCDIR%%/edit.indent.rc +%%ETCDIR%%/filehighlight.ini +%%ETCDIR%%/mc.default.keymap +%%ETCDIR%%/mc.emacs.keymap +%%ETCDIR%%/mc.ext +%%ETCDIR%%/mc.keymap +%%ETCDIR%%/mc.menu +%%ETCDIR%%/mc.menu.sr +%%ETCDIR%%/mcedit.menu +%%ETCDIR%%/sfs.ini libexec/mc/ext.d/archive.sh libexec/mc/ext.d/doc.sh libexec/mc/ext.d/image.sh @@ -170,6 +170,7 @@ share/applications/mc.desktop %%NLS%%%%DATADIR%%/hints/mc.hint.fa %%NLS%%%%DATADIR%%/hints/mc.hint.fi %%NLS%%%%DATADIR%%/hints/mc.hint.fr +%%NLS%%%%DATADIR%%/hints/mc.hint.fr_CA %%NLS%%%%DATADIR%%/hints/mc.hint.gl %%NLS%%%%DATADIR%%/hints/mc.hint.hr %%NLS%%%%DATADIR%%/hints/mc.hint.hu @@ -194,6 +195,7 @@ share/applications/mc.desktop %%NLS%%%%DATADIR%%/hints/mc.hint.sv %%NLS%%%%DATADIR%%/hints/mc.hint.sv_SE %%NLS%%%%DATADIR%%/hints/mc.hint.szl +%%NLS%%%%DATADIR%%/hints/mc.hint.te %%NLS%%%%DATADIR%%/hints/mc.hint.tr %%NLS%%%%DATADIR%%/hints/mc.hint.uk %%NLS%%%%DATADIR%%/hints/mc.hint.zh @@ -206,6 +208,8 @@ share/applications/mc.desktop %%DATADIR%%/skins/double-lines.ini %%DATADIR%%/skins/featured.ini %%DATADIR%%/skins/gotar.ini +%%DATADIR%%/skins/gray-green-purple256.ini +%%DATADIR%%/skins/gray-orange-blue256.ini %%DATADIR%%/skins/mc46.ini %%DATADIR%%/skins/modarcon16-defbg.ini %%DATADIR%%/skins/modarcon16.ini @@ -295,39 +299,36 @@ share/applications/mc.desktop %%EDITOR%%%%DATADIR%%/syntax/yum-repo.syntax %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax share/pixmaps/mc.png -%%EDITOR%%@dirrm %%DATADIR%%/syntax -@dirrm %%DATADIR%%/skins -@dirrm %%DATADIR%%/hints -@dirrm %%DATADIR%%/help -@dirrm %%DATADIR%%/examples/macros.d -@dirrm %%DATADIR%%/examples -@dirrm %%DATADIR%% -%%NLS%%@dirrmtry share/locale/szl/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/szl -%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/sv_SE -%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/kk -%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/ia -%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/fi_FI -%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/de_CH -%%NLS%%@dirrmtry man/sr/man1 -%%NLS%%@dirrmtry man/sr -%%NLS%%@dirrmtry man/ru/man1 -%%NLS%%@dirrmtry man/ru -%%NLS%%@dirrmtry man/pl/man1 -%%NLS%%@dirrmtry man/pl -%%NLS%%@dirrmtry man/it/man1 -%%NLS%%@dirrmtry man/it -%%NLS%%@dirrmtry man/hu/man1 -%%NLS%%@dirrmtry man/hu -%%NLS%%@dirrmtry man/es/man1 -%%NLS%%@dirrmtry man/es -@dirrm libexec/mc/fish -@dirrm libexec/mc/extfs.d +@dirrmtry %%ETCDIR%% @dirrm libexec/mc/ext.d +@dirrm libexec/mc/extfs.d +@dirrm libexec/mc/fish @dirrm libexec/mc -@dirrmtry etc/mc +%%NLS%%@dirrmtry man/es/man1 +%%NLS%%@dirrmtry man/es +%%NLS%%@dirrmtry man/hu/man1 +%%NLS%%@dirrmtry man/hu +%%NLS%%@dirrmtry man/it/man1 +%%NLS%%@dirrmtry man/it +%%NLS%%@dirrmtry man/pl/man1 +%%NLS%%@dirrmtry man/pl +%%NLS%%@dirrmtry man/ru/man1 +%%NLS%%@dirrmtry man/ru +%%NLS%%@dirrmtry man/sr/man1 +%%NLS%%@dirrmtry man/sr +%%NLS%%@dirrmtry share/locale/de_CH/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/de_CH +%%NLS%%@dirrmtry share/locale/fi_FI/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/fi_FI +%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/ia +%%NLS%%@dirrmtry share/locale/sv_SE/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sv_SE +%%NLS%%@dirrmtry share/locale/szl/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/szl +%%NLS%%@dirrmtry %%DATADIR%%/examples/macros.d +@dirrm %%DATADIR%%/examples +@dirrm %%DATADIR%%/help +@dirrm %%DATADIR%%/hints +@dirrm %%DATADIR%%/skins +%%EDITOR%%@dirrm %%DATADIR%%/syntax |