svn commit: r369133 - in head/misc/mc: . files

Jason E. Hale jhale at freebsd.org
Wed Sep 24 04:38:28 UTC 2014


On Tuesday, September 23, 2014, Rusmir Dusko <nemysis at freebsd.org> wrote:

> Author: nemysis
> Date: Tue Sep 23 22:49:48 2014
> New Revision: 369133
> URL: http://svnweb.freebsd.org/changeset/ports/369133
> QAT: https://qat.redports.org/buildarchive/r369133/
>
> Log:
>   - Update to 4.8.13, announce message is here:
>
>       http://www.midnight-commander.org/wiki/NEWS-4.8.13
>
>   - Use ZIP=${ZIP_CMD} instead of ZIP=${UNZIP_CMD} [1]
>   - Change patch files/patch-lib__tty__win, changed by upstream
>   - Remove obsolete patch files/patch-mc-wrapper
>
>   PR:           193766
>   Submitted by: Dominik Kows <dkolowski at gmail.com <javascript:;>> [1]
>
> Deleted:
>   head/misc/mc/files/patch-mc-wrapper
> Modified:
>   head/misc/mc/Makefile
>   head/misc/mc/distinfo
>   head/misc/mc/files/patch-lib__tty__win.c
>   head/misc/mc/pkg-plist
>
> Modified: head/misc/mc/Makefile
>
> ==============================================================================
> --- head/misc/mc/Makefile       Tue Sep 23 22:27:41 2014        (r369132)
> +++ head/misc/mc/Makefile       Tue Sep 23 22:49:48 2014        (r369133)
> @@ -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}/secu
>  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
>
>
> Modified: head/misc/mc/distinfo
>
> ==============================================================================
> --- head/misc/mc/distinfo       Tue Sep 23 22:27:41 2014        (r369132)
> +++ head/misc/mc/distinfo       Tue Sep 23 22:49:48 2014        (r369133)
> @@ -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
>
> Modified: head/misc/mc/files/patch-lib__tty__win.c
>
> ==============================================================================
> --- head/misc/mc/files/patch-lib__tty__win.c    Tue Sep 23 22:27:41 2014
>       (r369132)
> +++ head/misc/mc/files/patch-lib__tty__win.c    Tue Sep 23 22:49:48 2014
>       (r369133)
> @@ -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)
>   {
>
> Modified: head/misc/mc/pkg-plist
>
> ==============================================================================
> --- head/misc/mc/pkg-plist      Tue Sep 23 22:27:41 2014        (r369132)
> +++ head/misc/mc/pkg-plist      Tue Sep 23 22:49:48 2014        (r369133)
> @@ -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
> - at dirrm %%DATADIR%%/skins
> - at dirrm %%DATADIR%%/hints
> - at dirrm %%DATADIR%%/help
> - at dirrm %%DATADIR%%/examples/macros.d
> - at dirrm %%DATADIR%%/examples
> - at 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
> - at dirrm libexec/mc/fish
> - at dirrm libexec/mc/extfs.d
> + at dirrmtry %%ETCDIR%%
>  @dirrm libexec/mc/ext.d
> + at dirrm libexec/mc/extfs.d
> + at dirrm libexec/mc/fish
>  @dirrm libexec/mc
> - at 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
> + at dirrm %%DATADIR%%/examples
> + at dirrm %%DATADIR%%/help
> + at dirrm %%DATADIR%%/hints
> + at dirrm %%DATADIR%%/skins
> +%%EDITOR%%@dirrm %%DATADIR%%/syntax


All of those @dirm* lines should have just been deleted instead of changing
them.


More information about the svn-ports-all mailing list