Page MenuHomeFreeBSD

misc/mc: Update to 4.8.17
ClosedPublic

Authored by woodsb02 on May 11 2016, 10:17 AM.

Details

Summary

misc/mc: Update to 4.8.17

  • Remove patches for upstream tickets 2742, 3611, 3617 (resolved)
  • Move patch of lib/tty/win.c to lib/tty/tty-ncurses.c (upstream change)
  • Add patch of src/cons.handler.c to fix build, reported upstream [1]

Changes this release:

https://www.midnight-commander.org/wiki/NEWS-4.8.17


[1] https://www.midnight-commander.org/ticket/3643
Test Plan

poudriere testport misc/mc

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

woodsb02 retitled this revision from to misc/mc: Update to 4.8.17.May 11 2016, 10:17 AM
woodsb02 updated this object.
woodsb02 edited the test plan for this revision. (Show Details)
woodsb02 added reviewers: adamw, mat, koobs.
woodsb02 updated this revision to Diff 16193.
mat edited edge metadata.May 11 2016, 11:17 AM
mat accepted this revision.

Looks good, make sure the patches are generated with make makepatch and none have the legacy name.

This revision is now accepted and ready to land.May 11 2016, 11:17 AM

Commit failed with this error message:
Sending misc/mc/Makefile
Sending misc/mc/distinfo
Deleting misc/mc/files/patch-libttywin.c
Adding misc/mc/files/patch-lib_tty_tty-ncurses.c
Adding misc/mc/files/patch-src_cons.handler.c
Deleting misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch
Deleting misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch
Deleting misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch
Transmitting file data ....done
Committing transaction...
svn: E165001: Commit failed (details follow):
svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
Path "head/misc/mc/files/patch-src_cons.handler.c" has fbsd:nokeywords AND svn:keywords. Remove one.

Additional errors may compound and may not be accurate

Path "head/misc/mc/files/patch-src_cons.handler.c" does not have a valid $FreeBSD$ string (keywords not disabled here)

Pre-commit problem count: 2

mat added a comment.EditedMay 11 2016, 11:42 AM

Commit failed with this error message:
Sending misc/mc/Makefile
Sending misc/mc/distinfo
Deleting misc/mc/files/patch-libttywin.c
Adding misc/mc/files/patch-lib_tty_tty-ncurses.c
Adding misc/mc/files/patch-src_cons.handler.c
Deleting misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch
Deleting misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch
Deleting misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch
Transmitting file data ....done
Committing transaction...
svn: E165001: Commit failed (details follow):
svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
Path "head/misc/mc/files/patch-src_cons.handler.c" has fbsd:nokeywords AND svn:keywords. Remove one.

Additional errors may compound and may not be accurate

Path "head/misc/mc/files/patch-src_cons.handler.c" does not have a valid $FreeBSD$ string (keywords not disabled here)

Pre-commit problem count: 2

You must have some strange svn configuration

Any way:

svn pd svn:keywords files/patch-src_cons.handler.c
This revision was automatically updated to reflect the committed changes.
In D6321#134197, @mat wrote:

Commit failed with this error message:
Sending misc/mc/Makefile
Sending misc/mc/distinfo
Deleting misc/mc/files/patch-libttywin.c
Adding misc/mc/files/patch-lib_tty_tty-ncurses.c
Adding misc/mc/files/patch-src_cons.handler.c
Deleting misc/mc/files/patch-upstreamticket2742-detect-csh-as-tcsh-by-name.patch
Deleting misc/mc/files/patch-upstreamticket3611-fish-fix-perl-ls-helper.patch
Deleting misc/mc/files/patch-upstreamticket3617-mc_open-handle-varargs-mode_t-promotion-issue--v2.patch
Transmitting file data ....done
Committing transaction...
svn: E165001: Commit failed (details follow):
svn: E165001: Commit blocked by pre-commit hook (exit code 1) with output:
Path "head/misc/mc/files/patch-src_cons.handler.c" has fbsd:nokeywords AND svn:keywords. Remove one.

Additional errors may compound and may not be accurate

Path "head/misc/mc/files/patch-src_cons.handler.c" does not have a valid $FreeBSD$ string (keywords not disabled here)

Pre-commit problem count: 2

You must have some strange svn configuration

This is because I have combined the main auto-props.txt for src and ports and put them both in my ~/.subversion/config, as explained here:
Committers Guide - 5.3.7. Adding and Removing Files

This results in the following being in ~/.subversion/config:

[auto-props]
bsd.*.mk        = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
distinfo*       = svn:eol-style=native; fbsd:nokeywords=yes; svn:mime-type=text/plain
extrapatch-*    = svn:eol-style=native; fbsd:nokeywords=yes; svn:mime-type=text/plain
extra-patch-*   = svn:eol-style=native; fbsd:nokeywords=yes; svn:mime-type=text/plain
patch-*         = svn:eol-style=native; fbsd:nokeywords=yes; svn:mime-type=text/plain
pkg-*           = svn:eol-style=native; fbsd:nokeywords=yes; svn:mime-type=text/plain
Makefile*       = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.c             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.h             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.s             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.S             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.cc            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.cpp           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.cxx           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.in            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.sh            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
*.pl            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable
*.pm            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.py            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.rb            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.awk           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.sed           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.txt           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.conf          = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.po            = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
Makefile*       = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.1             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.2             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.3             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.4             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.5             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.6             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.7             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.8             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain
*.9             = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain

*.css           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css
*.html          = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html
*.xhtml         = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml
*.xml           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
*.xsd           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
*.xsl           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
*.xslt          = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml
*.xul           = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul
*.sgml          = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml
*.docbook       = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml

*.pdf           = svn:mime-type=application/pdf
*.ps            = svn:mime-type=application/postscript
*.eps           = svn:mime-type=application/postscript
*.exe           = svn:mime-type=application/octet-stream
*.bin           = svn:mime-type=application/octet-stream

*.jpg           = svn:mime-type=image/jpeg
*.jpeg          = svn:mime-type=image/jpeg
*.gif           = svn:mime-type=image/gif
*.png           = svn:mime-type=image/png
*.tiff          = svn:mime-type=image/tiff
mat added a comment.May 11 2016, 11:58 AM
In D6321#134197, @mat wrote:

You must have some strange svn configuration

This is because I have combined the main auto-props.txt for src and ports and put them both in my ~/.subversion/config, as explained here:
Committers Guide - 5.3.7. Adding and Removing Files
This results in the following being in ~/.subversion/config:

Mmm, this is a bad idea, the ports tree already has all the auto-props you need, only extreme cases will warrant you setting manually properties:

$ svn pl -v svn+ssh://repo.freebsd.org/ports/{,head,head/Mk,head/Mk/Scripts}
Properties on 'svn+ssh://repo.freebsd.org/ports':
  svn:auto-props
    bsd.*.mk     = svn:keywords=FreeBSD=%H
    distinfo*    = fbsd:nokeywords=yes
    extrapatch-* = fbsd:nokeywords=yes
    extra-patch-*= fbsd:nokeywords=yes
    patch-*      = fbsd:nokeywords=yes
    pkg-*        = fbsd:nokeywords=yes
    Makefile*    = svn:keywords=FreeBSD=%H
    *            = svn:eol-style=native; svn:mime-type=text/plain

Properties on 'svn+ssh://repo.freebsd.org/ports/head':
  svn:ignore
    distfiles
    packages

Properties on 'svn+ssh://repo.freebsd.org/ports/head/Mk':
  svn:auto-props
    *.mk = svn:keywords=FreeBSD=%H

Properties on 'svn+ssh://repo.freebsd.org/ports/head/Mk/Scripts':
  svn:auto-props
    *.sh = svn:keywords=FreeBSD=%H
mat added a comment.May 11 2016, 11:59 AM

(I know, because I did big cleanups a year or two ago)