From 6ab1104c2f3b7db096e2f0b3feca877749cc502f Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 28 Aug 2015 07:47:08 +0000 Subject: Update to 4.8.14. Reduce package options to simplify package maintenance. Let me know if you need one of the removed options. Version 4.8.14 - Core * Minimal version of GLib is 2.14.0 * Add new panel binding "!SelectExt" to select/unselect files with the same extension as the current file (#3228) * Speed up of directory size calculation (#3247) * Support of italic text (#3065) - Editor * New syntax highlighting support: - puppet (#3266) - Viewer * Rewrite mcview's rendering and scrolling (#3250, #3256) - no more partial lines at the top and failure to scroll when Up or Down is pressed; - better handling of CJK characters; - handle combining accents; - improved nroff support; - more conventional scrolling behavior at the end of the file. * Use VIEW_SELECTED_COLOR in plain mode (#3405) * In !QuickView panel, don't pass any chars to command line to avoid unexpected command execution (#3253) - Misc * Code cleanup (#3265, #3262) * Bind poedit to Edit action for .po files (#3287) * Better grammar mcedit user menu (#3246) - Fixes * Fail to build against musl libc (#3267) * Error compiling with glib 2.20.3 (#3333) * Overwrite of the PROMPT_COMMAND bash variable (#2027) * contrib/*.?sh are not recreated after rerun of configure (#3181) * File rename handles zero-length substitutions incorrectly (#2952) * Lose files on "Skip" when "Cannot preallocate space for target file" (#3297) * Info panel can't obtain file system statistics on Solaris (#3277) * "Shell patterns" broken beyond repair (#2309) * File selection by patterns uses bytes instead of unicode characters (#2743) * Copy files dosn't work as expected, when copying to a directory with the special symbol in its name (#3235) * Wrong order of old_colors table items (#3404) * Input line: Alt+Backspace on one-letter word erases too much (#3390) * "Directory scanning" window is too narrow (#3162) * No Help for User Menu (#3409) * mcedit: paste from clipboard does not work (#3339) * mcviewer: hang when viewing broken man page (#2966) * mcview hex: incorrect highlight when search string not found (#3263) * mcview hex edit: UTF-8 chars are not updated (#3259) * mcview hex edit: can't enter certain UTF-8 characters (#3260) * mcview hex edit: CJK overflow (#3261) * mcedit: status line doesn't show full path to file (#3285) * Freeze when copying from one FTP location to another (#358) Version 4.8.13 - Core * New engine of user-friendly interruption of long-time operations (#2136) - Editor * Improvements of syntax highlighting: * CMake (#3216) * PHP (#3230) * Translate language names in the spelling assistant dialogue (#3233) - Viewer * Add separate normal(default) colour pair for viewer (#3204) * Dealing with utf-8 man pages in view/open (#1539) * "Goto line" is 1-based now (#3245) - Misc * Code cleanup (#3189, #3223, #3242) * Add new skins: gray-green-purple256 and gray-orange-blue256 (#3190) - Fixes * First Backspace/Delete is ignored after mouse click in an input widget (#3225) * Recursive find file doesn't work on Samba share (#3097) * Recursive find file doesn't work on Windows NFS share (#3202) * Incorrect file counter in move operation (#3196, #3209) * "Directory scanning" window is too narrow (#3162) * Colon is not recognized inside escape seq in prompt (#3241) * Quick view doesn't grab focus on mouse click (#3251) * fish subshell: overridden prompt (#3232, #3237) * mcviewer: broken switch between raw and parse modes (#3219) * mcviewer: incorrect percentage in mcview hex mode (#3258) * RAR VFS incorrectly recognizes UnRAR version (#3240) * viewbold and viewselected are missing from some skins (#3244) * Incorrect enconding name for manual page (#3239) * "User menu -> View manual page" doesn't do coloring (#3243) Version 4.8.12 - Core * Speed up of file find (#2290) * If cwd is a symlink it is kept at startup (#3093) * Improve support of Zsh (#3121, #3124, #3125, #3177) * Launch external editor/viewer without passing line number (#3117) * Exit without confirmation by default (#3132) * Simple user-friendly skin selector (#2165, #3178) * Use Joliet and RockRidge in ISO9660 image view action (#3187) - VFS * Use .zip extension as preferred way to recognize ZIP archives (#2857) - Editor * Configurable selection reset on CK_Store (#3111) - Misc * Code cleanup (#3113, #3151) * Adjust script permissions to installed ones (#2274) * Fix name of FSF in add source files (#3167) * Skin cleanups (#3180, #3184) * Do not consider "String not found" message as error (#3179) - Fixes * Broken build with NCurses (#3114) * Incorrect tilde expansion in copy/rename/move dialog (#3131) * Advanced chown: Escape on user list accepts value (#3150) * Toggling hidden files using mouse doesn't update the other panel (#3156) * Question mark in delete confirmation is on its own line (#3123) * Popup dialogs wander upwards upon resize (#3173) * Keypad '*' doesn't work with numlock off (#3133) * Some inconsistencies in "Learn keys" UI (#3134) * Unconventional behavior of "Display bits" dialog (#3152) * Shift-Fn keys don't work in 256-color mode of tmux (#2978) * mcedit: format paragraph produces inconsistent wrapping (#3119) * mcedit: file out-of-date check on saving is botched (#3142) * mcedit: 1st line is shifted after paragraph format (#1666) * mcedit: trailing newline check applied too early when exiting (#3140) * Inconsistency of the arrow's direction in the panel header line across skins (#3157) * Possible segfault while passing messages to widgets (#3116) * Possible segfault when freeing a VFS (#3116) * Segfault in cpio VFS while reading corrupted RPM (#3116) * Segfault in sftpfs VFS when trying to view a file (#3176) * Incorrect handling of filenames with unrar v5 (#3073) * FISH VFS: remote panel confused by filenames with '%' (#2983) * iso9660: xorriso shows only one depth (#3122) * Nicedark skin looks bad on black-on-white terminals (#3154) * Incorrect definition of "topmiddle" and "bottommiddle" characters (#3183) Version 4.8.11 - Core * Live update of panels size when editing layout (#3060) * Support "Compute totals" option in move file operation (#2075) - VFS * rpm extfs - show dependency version (#2812) - support tar payload (#3064) - improve support for EPOCH tag (#1588) - add support for PREINPROG/POSTINPROG/PREUNPROG/POSTUNPROG, VERIFYSCRIPTPROG and TRIGGERSCRIPTS/TRIGGERSCRIPTPROG tags (#1588) - Editor * Support "bracketed paste mode" of xterm (#2661) * Clarify Java syntax highlighting (#3057) - Misc * Print warnings about unknown '--with-' / '--enable-' configure options (#3029) * Code cleanup and refactoring (#3051, #3066) - Fixes * FTBFS on GNU Hurd (#3053, #3071) * Segfault while moving files (#3059, #3105) * Broken handling of mc command line arguments (#3047) * Copy/move doesn't work if num_history_items_recorded=0 (#3076) * No subdir path completion in current dir, if stub is not starting with './' (#3018) * Deprecated "find -perm +xxx" syntax is used (#3089) * Home, End, Shift-Fn keys don't work in tmux (#2978) * Improper [en|dis]abling of layout dialog split adjustment buttons (#3061) * Bogus strings in 'Confirmation' config dialog (#2271) * "Configure options" first entry not highlighted (#3084) * "Setup saved to ~/.config/mc/ini" message is misleading (#3096) * F3 doesn't work on .so files in FreeBSD 9.x (#3101) * Typo in mc.lib: "less=%filename +%linenog" instead of "+%lineno" (part of #3044) * Wrong order of filename and line number for external editor (part of #3044) * mcedit: tabs are lost when text is pasted (#1797 as part of #2661) * mcedit: question on large file treats Escape as Yes (#3107) * Broken case-sensitive search in editor/viewer/diffviewer (#3069) * Changes to files in nested .zip archives are lost (#3070) * Incorrect handling of filenames with spaces with unrar v5 (#3073) * iso9660 VFS: filenames truncating in ISO file listing (#3091) * vfs_path_from_str_flags() doesn't support VPF_STRIP_HOME (#3098) * Bright colors are used as background colors in 16-color skins (#3050) * Various defects in documentation (#3052, #3092) Version 4.8.10 - Core * Do not link GModule if it is not required (save space on embedded systems) (#2995) * Behavior of the 'Right' key in the 'Directory hotlist' was changed: now 'Right' key is used only to enter into the group (#3045) - Misc * Code cleanup (#3035) - Fixes * Build failure on Cygwin (#3041) * Broken NCurses detection (#3043) * Broken handling of mc command line arguments (#3047) * Cannot enter into zip archive in tar one (#3034) * Cannot open some jar files * mcedit: file descriptor leak (#3040) * mcedit: paragraph format doesn't respect multibyte characters (#2713) * Crash after entering a wrong SFTP password (#3036) Version 4.8.9 - VFS * extfs: support unrar-5 (#3015) * extfs: use xorriso (if exists) for writing into ISO images (#3027) - Editor * Support unlimited file size (#1743) - Misc * Lot of code cleanups (#2990, #2071, #2164, #2998, #3003, #3005, #3022) * Display additional info while viewing (by F3) *.iso files (#2006) * New skins: - modarin256: set of 256-color skins from Oliver Lange (#2737) - Fixes * Fail to link if system lib does not contain strverscmp (#2992) * Segfault when mc's temporary directory doesn't belong to the correct user (#3021) * Race condition when creating temporary directory (#3025) * Mouse doesn't work in screen and tmux (#3011) * Incorrect file size in copy/move overwrite query dialog (#3000) * Garbage in subshell prompt (#3001) * Incorrect WLabel redraw after text change (#2991) * Find File: "All charsets" options don't work (#3026) * When an unknown key is pressed, it is interpreted as garbage (#2988) * Segfault on creating new file in external editor (#3020) * Rotating dash is not removed when mc finishes reading the directory (#2163) * mcedit: word completion failed if word to be completed is begun from begin of file (#2245) * mcview: broken switch between raw and parse modes (#2968) * Hex viewer: continue search doesn't work (#2706) * sftpfs: broken SSH aliases (#2923) Version 4.8.8 - Core * Make copy/move progress dialog window wider up to 2/3 of screen width (#2076) * Ask file name before create new file in editor (#2585) * Support newer extended mouse protocol SGR-1006 instead of URXVT-1015 (#2956) * Allow skip directory scanning before file operation. Print directory count and size in addition to directory name (#2101) * Add jump support to target line in some external editors and viewers (#2206) - Editor * Update syntax highlighting: - Jal programming language (#2855) - gplink configuration files (.lkr extension) (#2855) - Makefile with .mak extension (#2896) - ZSH configuration files (#2950) - Fortran (#2962) - Misc * Code cleanup (#2944, #2954) * Report real compiler in MC_CHECK_ONE_CFLAG instead of 'gcc' * Hints files now translated via Transifex (#2980) - Fixes * Segfault in file operation due to unhandled regexp error (#2493) * Tab completion vs. spaces and escaping (#55)\ * Special chars are not escaped in autocompletion of filenames (#2626) * Buttons in the 'Directory hotlist' window are placed incorrectly (#2958) * Mouse doesn't select text in subshell in native console (#2964) * Mouse click below non-droppeddown menubar activates menu box (#2971) * Insufficient quoting and wrong message in user menu (#2947) * mcedit: floating point exception (division by zero) (#2953) * mcedit: broken autocompletion (#2957) * mcview: broken magic mode (#2976) * Broken opening of .war archives (#2974) Version 4.8.7 - Core * Minimal GLib version is 2.12.0 * Implementation of suspend/resume in copy/move file operations (#2111) * Start of widget subsystem reimplementation (#2919) - VFS * uc1541 extfs plug-in updated up to version 2.5 (#2935) - Editor * Reset selection after text paste (only in non-persistent selection mode) (#2660) * Don't indent blank lines (#303). * Add .psgi as Perl syntax highlighting (#2912) * Place cursor after inserted chars (#319) * Add option in ini file to save spelling language (spell_language=NONE for disable aspell support) (#2914) - Misc * Code cleanup (#2888, #1950) * Minimal "check" utility version is 0.9.8 * Remove the empty contrib/dist/debian/ since it maintained separately in Debian (#2871) * mc.ext updates: - add support of SVG images (#2895) - add support of .asm file extension (#2892) - add support of .hh file extension (#2892) - all file extension for source files now are case insensitive (#2892) - add support of JNG and MNG images (#2893) - add support of Gnumeric's spreadsheets (#2894) - add support of .war archives (#2891) - make a choice between arj and unarj archivers (#2890) - make a choice between 7z and 7za archivers (#2890) - add support of ape, aac and wvm4a media formats (#2767) - add support of cbr and cbz comic books (#2739) - add support of epub e-book format (#2739) - add support of PAR archives (#2739) - use libreoffice instead of ooffice, if found, to open ODT files (#2723) - use dvicat if dvi2tty not found to view DVI files (#1686) - use 'see' utility as default pdf viewer, if found (#1686) - use 'see' utility to view images in console (#1686) * Highlight OGV files as media (#2934) * Added new translations: - Persian (fa) - Croatian (hr) - Fixes * Build failure on Cygwin (#2917) * Fail to check ncurses library if --with-ncurses-inc and --with-ncurses-libs options are used (#2926) * Crash on Solaris while trying to copy a file (#2906) * CVE-2012-4463: Does not sanitize MC_EXT_SELECTED variable properly (#2913) * Attributes of existing directories are never preserved when copying (#2924) * Broken path completion on paths starting with ~/ (#2898) * Terminal settings are not changed when window is resized (#2198) * Enter into symlink to compressed patch shows empty patch (#2910) * Test failure on Cygwin due to incorrect linkage flag (#2918) * Non-portable test (#2883) Version 4.8.6 - Fixes * mcedit: two-columns extra offset of cursor after tab character (#2881) * diffviewer: cannot open file if name contains '$' (#2873) Version 4.8.5 - Core * Implemented case-insensitive patterns in mc.ext bindings (#2250) - Editor * Code refactoring and cleanup (#1977) - Diff viewer * Bidirectional merge (F5 merge left-to-right, F15 - merge right-to-left) (#2863) - Misc * Syntax highlighting news and updates: - update assembler.syntax: x86 AMD64 registers highlighting (#2542) - new cmake.syntax: preliminary and incomplete syntax file for CMakeLists.txt files (#2084) - new dlink.syntax: syntax highlighting for D-Link switches command set (#2649) - update properties.syntax: more nice look-and-feel (#1869) * mc.ext enhancement (#2103): - use chm_http text-mode handler for CHM files - play sounds only from videos in text mode - use pdftotext -layout -nopgbrk switches - try to use elinks before links for HTML - soffice2html text-mode handler for SXW files - wvHtml text-mode handler for doc files - xlhtml text-mode handler for XLS files - ppthtml text-mode handler for PPT/PPS files - open=view+pager fallback (noX) for PostScript, PDF, OD[PST] and DVI - standarized $DISPLAY checks * File extension support: - SQLite database files (#2103) - compiled Java files (*.class) (#2103) - m4a for MP4 containers with audio data in the Advanced Audio Coding (AAC) or its own Apple Lossless (ALE, ALAC) formats (#2869) - .ogm extension was deprecated in favor of .ogv (#2664) - Fixes * Bad EXTHELPERSDIR substitution if --prefix is not set (#2849) * Partially broken loading of user-defined keymap file (#2848) * Enter on directory named '~' goes to the home one (#2874) * Cannot Copy/Move files with filename encoding change (#2791) * Cannot view compressed files named like log.1.gz (with digit in name) (#2852) * Panel is not refreshed if panel history is called using mouse (#2854) * Duplicate entities in panel with 'tree view' mode (#2835) * Broken synchronization with filelist and tree panels (#2862) * Standalone mcedit doesn't load saved file position (#2853) * mcedit segfaults when aspell (en) dictionary is not installed (#2856) * mcedit segfaults after "Back from declaration" call (#2859) * mcedit: unable to save changes in "Safe save" mode(#2832) * Segfault when viewing HTML files with "mc -v" (#2858) * Broken 'Enter' action on a rpm file containing space character in filename (#2838) * extfs: uc1541 broken handling (#2864) * mc.ext: OGV format handled as audio (#2869) Version 4.8.4 - Core * Use xdg-open by default in mc.ext.in if present to open files, fallback on current scheme otherwise (#2118) * Improve of mouse event handling in dialogs (#2817) * Show extended info about compiled-in paths for internal/external macros in the "mc -F" output (2495) - VFS * Added SFTP support (#1535) - Editor * Multieditor: allow edit many files in one mcedit window (#2261, #2839) * Aspell support for spell check (#2788) - Viewer * Handle CK_FileNext/CK_FilePrev actions inside mcviewer (#2814) - Misc * Tweak and cleanup of code in case of --disable-charset option usage (#2827) * File extension support: - .gem - rubygems (#2797) - .cpio.xz - compressed cpio archives (#2798) - .webm - WebM video (#2746) - .lib - gputils artifacts (#2751) - Fixes * Build failure on FreeBSD 6 (#2808) * src/filemanager/filegui.c does not compile on Solaris due to missing macros (#2825) * Loss of data on copy to full partition (#2829) * Crash at Chown command (#2784) * Crash when creating relative symlink (#2787) * Misinterpretation of dirs as command line arguments (#2783, #2805) * Number of panelized files was limited to 127 (#2813) * CK_History removes CK_HistoryNext entries (#2313) * URL with port was stored wrong in history (#2833) * Can't find 00 (zeroes) in patterns in hex search (#2795) * Hotkey conflicts in 'Search' dialog (#2843) * Error message when entering into compressed tar and cpio archives (#2785) * Garbage directory listing in ftpfs (#2800) * Incomplete sand256 skin (#2807) * mcedit scripts are installed as data files (#1437) * Fails to build from source with --enable-tests (#2786) * Tests failure on PowerPC,S390,S390x (#2804) * Fail to compile if --without-vfs configure option specified (#2834) * do_panel_cd: FTBFS with --enable-tests on [kfreebsd-i386,kfreebsd-amd64,ia64,armhf] (#2803) Version 4.8.3 - Misc * Code cleanup (#2780) - Fixes * Broken support of XDG_* shell variables (#1851) * Segmentation fault while background copying (#2663) * MC ignores second directory argument (#2762) * Interpretation of LANG variable needs to be case insensitive (#2386) * Cannot copy zero-length files with "Preallocate space" option (#2755) * Problem in the Copy operation with unchecked the "Preserve attributes" option (#2278) * * Cursor position reset after update when panel is panelized, but doesn't (#2766) * File selection reset after exit from the archive in the root (#2776) * Hotlist: broken newly added entries if old-style path is present (#2753) * Can't rebind Fx keys in the file manager (#2384) * "justified" menu alignment (#2756) * The last (or single) word of hyperlinks in the interactive help don't act on mouse clicks (#2763) * 'cd' command is not working in shell link (#2758) * mc hangs on switching screens (#2608) * Case sensitive search with SEARCH_TYPE_PCRE is broken (#2764) * mcedit can't run w/o file as parameter (#2754) * mcedit can't record input char (#2757) * mcedit: save file on top of existing directory changes dir's permissions (#2761) * Unable to edit gzipped files (#2759) * mcedit hangs up on replace with regexp contains '^' or '$' (#1868) * Segfault after open incorrect archive (#2775) * mcdiff crashes if one panel is not in the listing mode (#2769) * The password for vfs sessions remains in input history (#2760) * Showing directory sizes is broken in VFS'es (#2765) * Stale symlinks in vfs (#2777) * Active VFS directories list contain incorrect current path (#2779) * Date not set properly in manpage (#2692) * Empty texinfo rule in mc.ext (#2774) * Test failure if 'HOME' contains trailing slashes (#2768) Version 4.8.2 - Core * Added new flag -X (--no-x11) to allow dont't use X11 to get the state of modifiers Alt, Ctrl, Shift (#86) * Support of '~' as home dir in 'Start at:' field in 'Find File' dialog (#2694) * Support of '~' as home dir in hotlists (#2747) * Learn of 'Back Tab' is possible now in 'Learn keys' dialog (#2628) * Optional '0x' prefix for hexadecimal search (#2705) * Dynamically resize panels (#2465) * New bindings (ScrollLeft, ScrollRight) for scroll long filenames in panels (#2731) - VFS * Internal VFS reorganization (#2695) - Editor * Added as.syntax (#2708) - Viewer * Added action bindings for backward search (#2105) - Misc * Added hotkeys for all radio/check-buttons in search/replace dialogs (#2704) * New file bindings: - .m4v, .ts - video (#2702) - djv - DjVu? (#2645) * Simplify mc.menu - remove LZMA|LZ and change p7 to 7z (#2703) * Updated list of known browsers: gnome-moz-remote mozilla firefox konqueror opera (#2725) * Added MC_HOME environment variable to set up home directory of MC (as part of #2738) * Lot of code cleanup (#2740) - Fixes * Compile failure of 4.8.1 on xBSD because "Undefined symbols: _posix_fallocate" (#2689) * MC deletes the wrong file because of forced panel reload before file operation (#2736) * Cannot chdir to directory if directory name contains the dollar sign (#2451) * Incorrect panel size after change panel split type (#2521) * Wrong total bytes counter for subdirs in copy/move dialog (#2503) * Display corruption in panels after window shrink (#2684) * Command line is unaccessible from tree panel (#2714) * Extra confirmation before delete an empty hotlist group (#1576) * Can't open an edit zero-length file from VFS in mcedit (#2710) * mcedit crashes when ~/.config is a file (#2738) * mcedit: reset selection after END/HOME/PgDn/PgUp (#2726) * 'make check' fails on arm and alpha (-z muldefs) (#2732) Version 4.8.1 - Core * Use posix_fallocate64() when copying files/moving to a new mount point (#2610) * Faster startup (#2637) * Support of extended mouse clicks beyond 223 (#2662) - VFS * Added exit point ("..") at the top of file list (after external panelization) (#275, #278) - Editor * Lex/Flex sources (extension .l) handled by yxx.syntax file. Yacc/Bison syntax completed with all symbols (#1647) * Updated syntax files: - lua - Misc * Updated skins: - sand256 (#2640) - xoria256 (#2641) * Added ability to move MC config files to specified place instead of multiple places in $HOME (#2636) * Added configure option --with-homedir (default value: XDG) (#2636) * Respect traditional placement of user preferences on Mac OS X (#2658 as part of #2636) * A few useful additions to filehighlight.ini (#2646) - Fixes * Doesn't compile when using --disable-nls (#2639) * Can't compile on OpenIndiana (Solaris) (#2643) * Moving content of bindings to mc.ext during 4.7 -> 4.8 upgrade breaks mc * Free space on filesystems >2TB is not displayed properly (#2338) * Not all errors are skipped after "Ignore all" choose (#71) * Input field in password mode is fully masked with asterisks (#2653) * In "Copy File" dialog the "preserve Attributes" checkbox is always unchecked for filesystems mounted with FUSE (#2254) * Command line cursor misplaced after a resize in viewer/editor (#2678) * Save of some learned keys is broken (#2676) * Editor sometimes shows two dots instead of letter (#2372) * Editor: word completion should ignore the current word (#2614) * Viewer sometimes shows two dots instead of letter (#1730) * Viewer shows two dialogs when searcj hot found (#2677) * Cannot navigate over spftp servers (#2634) * mc adds spaces at the beginning of all files/dirs on ftp servers (#2635) * VFS: broken SMB (#2652) * man page lies about mc.keymap (#2675) * mc does not preserve file mtime when copying over ssh (#2625) Version 4.8.0 - Misc * Code cleanup (#2620) * License version updated to GPL3+ (#1551) * Added new translation: - Interlingua - Fixes * Viewer: cursor position is not restored in hex mode (#2543) * fish: broken panels drawing after entering password (#2611) * fish: content of modified file is appended instead of overwritten in the remote host (#2632) * extfs: broken navigation in archives if current path is encoded (#2621) * extfs: strange error message when opening a 7z file if p7zip is not installed (#2598) Version 4.8.0-pre2 - Core * Added -g/--oldmouse option to support of NORMAL/BUTTON_EVENT mouse type (useful for screen/tmux) (#2601) - VFS * New extfs plugin: gitfs (#2467) * patchfs enchancement: join several hunks of the same file into one VFS entry (#2573) - Misc * mc.ext: use "include" for $EDITOR entries (#1689) * New file bindings: - .3gp - video (#2583) - Fixes * Cannot compile 4.8.0-pre1 and 4.7.5.3 on Solaris (#2587) * Recent autoconf displays warnings about missing AC_LANG_SOURCE (#2589) * Duplication of variable declarations (#2576) * Incorrect TTY layer initialization (#2601) * Wrong Backspace key behavior in QuickSearch mode if BS key is mapped to CdParentSmart action (#2522) * M-o works unexpectedly on symlink shortcuts (#2590) * Panelize doesn't honour current sorting (#2175) * Hintbar jumps to the top of the screen and overwrites main menu (#2593) * File size column is bogus for widths above 9 (#2580) * Hex search: incorrect length usage in hexadecimal search (#2579) * Editor: Incorrect Pascal syntax highlighting (#2531) * Editor: mouse clicks are ignored on the bottom line (#2591) * Editor: extended keybingings are broken (#2586) * Viewer: Fixed search finds bold/underlined strings twice and highlight search results (#265) * Broken listing in ExtFS VFS module (#81) * File name length is limited in tar archive (#2201) * Crash when copying symlink over ssh (#2582) * Broken panels recode (#2595) * ftp failures - leading white space in file name (#2594) * FISH hangs while copiyng a lot of small files (#2605) Version 4.8.0-pre1 WARNING: Configuration files was moved from your $HOME/.mc directory into XDG_CONFIG_* directories to respect FDO standard (http://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html). To get more information, see ticket #1851. WARNING: VFS paths now handled as vfsprefix1://vfsdata/vfsprefix2://vfsdata (see #2361). Also, 'bindings' user file was renamed to 'mc.ext', so you need search in this file all Open=file.ext#vfsprefix and replace them to Open=file.ext/vfsprefix:// After this you should rename your 'bindings' file to 'mc.ext'. Old-style paths are handled just in 'Directory hotlist' dialog, but you couldn't mix URL-like and old style path elements in one path string. Support of old-style paths will be removed in next major release (probably in 4.9, who knows...) WARNING: keybinding names was renamed to provide some unification (see #2511). The correspondence of old and new keybinging names are described in doc/keybind-migration.txt file and in doc/keybindMigration web page. Be aware. - Core * Added 256 colours support (#2169, #2173, #2475) * Changed default text in filtered view (alt-!) to input command line (if not empty) or stay old behaviour (current file under cursor) (#2266) * Added simple swap mode that means the swap of panel locations, in addition to current swap of panel content (#2368) * Cofiguration files now moved to directory specified in XDG_CONFIG_HOME environment variable (#1851) * Panel options are read now from [Panels] section only. [Midnight-Commander] section is not read (#2305) * "Show mini info" checkbox was moved from the "Layout" dialog window to the "Panel options" one (#2305) * Select files by shift-left/right in file panel (#2534) * Added support of skip all errors on multi-file/dir operation (#71) * 'Find Files' improvements: - support relative ignored directories (#2275); - handle of ignored directories in dialog window (#2275); - "Search for content" checkbox is enabled by default (#2462) * Added hardlinks detection for filehighlight (#2478) * Unification of keybind names (#2511): - most of keybinding names are changes to unify that names. Table of old and new names is available in doc/keybind-migration.txt; - improve of key rebinding: previously, to rebind some keys, used must redefine the entire section where that bindings are placed in user keymap file. New merge algorithm doesn't require that and allows rebind only wanted keys; - added --nokeymap command line option to disable external keymaps * Sources in 'lib' directory now independent to sources in 'src' one (#2501) * Added configure parameter --enable-mclib for build libmc.so shared library (#2501) * Added new engine for universal event system (as part of #2501) * Optimized loading and saving of configurations and histories (#2541, #2545) * Reimplemented i18n support in 'Chmod' dialog window (#2557) - VFS * VFS structure changes (as part of #2501): - moved from lib/vfs/mc-vfs to lib/vfs; - split VFS-modules by directories and moved to src/vfs; - lib/vfs/vfs-impl.h was merged into lib/vfs/vfs.h * VFS now used URL-like paths (#2361) - Editor * New engine of the editor macro (#323) * Multiply repeat of the recorded actions (#323) * Call extermal scripts from the editor (#323, #2512) * Added REDO action (#25) * Group UNDO by action (#27) * Selection is not reset after execute user menu (#2463) * Vertical selection is not reset after copy/move (#2504) * More intuitive word left/right action (now the cursor stop beside EOL/BOL) (#2483) * Duble-click marks the current word. Added action MarkWord to mark word, MarkLine to mark current line (#2499) * Regexp search&replace: support escape sequences in replacement string (#1882) - Misc * Minor enhancement in mc.ext: * added -C key to nm utility in View action for static libraries (#2485) * New file bindings: - .torrent: view using ctorrent (#2562); - .mts: handle as videofile (#2566) * Added new entries in cedit.menu: "Sort selection", "Upper case", "Lower case" * New skins: - Xoria256 (#2469) - mc-4.6 (#2524) * Updated skins: * Nice dark (#1791) * Added support for check unit test framework (http://check.sourceforge.net) (as part of #2501) * Added -F/--datadir-info option to show extended information about used data dirs (#2495) * Added --configure-options to easy update & reconfigure existing mc (#2495) * Language-specific man pages and hint and help files are not installed if mc is built with --disable-nls option (#2514) * Added new translation: - Esperanto * Code cleanup (#2481, #2515, #2518, #2560, #2570) - Fixes * Build failure on DragonFly BSD (#2516) * Broken Del & Backspace in dialogs (in locale CP866) (#1634) * Screen and input corruption under xterm in non-UTF locales (#1668) * Alt-Backspace shortcut doesn't work (#2455) * Broken command autocompletion (#2458) * Swap panels doesn't respect sort options (#2368) * File list format of panel is initialized incorrectly after switch back from quick view or info mode to file list one (#2390) * Main menu is not drawn correctly after change of it visibility and activity (#2466) * MC switches to left panel after call of command history using mouse (#2459) * Find file: don't check content regexp if search for content is not used (#2464) * Find file: broken lynx-like navigation in panelization of search result (#2491) * Dialog trims leading spaces in input field (#2544) * Panelize content is lost when doing F5/F6/F8 on a file on the other panel (#2312) * Color of panel header cannot be set in the command line (#2170) * ctrl-g key closes file panels (#2520) * Incorrect files mark by mouse (#2556) * Editor: incorrect restore selection after UNDO (#2456) * Editor: segfault after getting the previous char in utf8 (#2484) * Editor: incorrect detection of the word boundary (added '{', '}' as end of word) (#2500) * Bold and selected colors of viewer cannot be set in the command line (#2489) * Viewer: fixed incorrect starting offset for 'search again' (#2294) * Viewer: fixed problems while displaying UTF-8 manual pages (#1629) * Diff viewer: quick left/right movements don't work in non-default key maps (#2509) * AI_ADDRCONFIG is not optional for RFC 3493 non-compliant systems (#2401) * FTP directories containing @ result severe security risks (eg. deletion of homedir) (#2220) * Builtin ftp client can't download files with apostrophe in a file name (#2251) * Unable to show FTP listing if password contains # (#2360) * FTP: fixed access to file names starting with space (#81) * Bashisms in extfs (#2569) * Browsing *.deb files is broken with latest Perl (#2552) * isoinfo adds ";1" to the end of file name when Joliet without Rock Ridge is used (#2471) * patchfs incorrectly works with filenames containing spaces (#2572) * cd to ~ processed incorrectly in the command line if more than one space is separating the "cd" and "~" (#2120) --- sysutils/mc/Makefile | 53 ++--- sysutils/mc/PLIST | 261 +++++++++++++++++++-- sysutils/mc/PLIST.charset | 4 +- sysutils/mc/PLIST.mcedit | 72 ------ sysutils/mc/PLIST.vfs | 49 ---- sysutils/mc/distinfo | 17 +- sysutils/mc/options.mk | 40 +--- sysutils/mc/patches/patch-aa | 62 ----- sysutils/mc/patches/patch-ab | 17 -- sysutils/mc/patches/patch-ac | 10 +- sysutils/mc/patches/patch-ae | 14 -- sysutils/mc/patches/patch-af | 14 -- sysutils/mc/patches/patch-lib_fs.h | 19 -- sysutils/mc/patches/patch-src_editor_syntax.c | 13 - .../patch-src_vfs_extfs_helpers_Makefile.in | 15 ++ 15 files changed, 291 insertions(+), 369 deletions(-) delete mode 100644 sysutils/mc/PLIST.mcedit delete mode 100644 sysutils/mc/PLIST.vfs delete mode 100644 sysutils/mc/patches/patch-aa delete mode 100644 sysutils/mc/patches/patch-ab delete mode 100644 sysutils/mc/patches/patch-ae delete mode 100644 sysutils/mc/patches/patch-af delete mode 100644 sysutils/mc/patches/patch-lib_fs.h delete mode 100644 sysutils/mc/patches/patch-src_editor_syntax.c create mode 100644 sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in (limited to 'sysutils/mc') diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile index 141c845c630..f3ca699609f 100644 --- a/sysutils/mc/Makefile +++ b/sysutils/mc/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.98 2015/08/18 07:31:17 wiz Exp $ +# $NetBSD: Makefile,v 1.99 2015/08/28 07:47:08 wiz Exp $ -DISTNAME= mc-4.7.0.10 -PKGREVISION= 15 +DISTNAME= mc-4.8.14 CATEGORIES= sysutils MASTER_SITES= http://www.midnight-commander.org/downloads/ EXTRACT_SUFX= .tar.bz2 @@ -11,11 +10,19 @@ HOMEPAGE= http://www.midnight-commander.org/ COMMENT= User-friendly file manager and visual shell LICENSE= gnu-gpl-v2 -USE_TOOLS+= pkg-config unzip:run -GNU_CONFIGURE= YES -USE_PKGLOCALEDIR= YES +USE_TOOLS+= pkg-config unzip:run perl:build +GNU_CONFIGURE= yes +USE_PKGLOCALEDIR= yes -CHECK_INTERPRETER_SKIP= libexec/mc/extfs.d/s3+ +# don't want to pull in python +CHECK_INTERPRETER_SKIP+= libexec/mc/extfs.d/s3+ +CHECK_INTERPRETER_SKIP+= libexec/mc/extfs.d/uc1541 + +# save copies of the configure arguments, harmless +CHECK_WRKREF_SKIP+= bin/mc +CHECK_WRKREF_SKIP+= bin/mcdiff +CHECK_WRKREF_SKIP+= bin/mcedit +CHECK_WRKREF_SKIP+= bin/mcview .include "../../mk/bsd.prefs.mk" @@ -34,34 +41,24 @@ PLIST_SRC+= ${PKGDIR}/PLIST 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:Mmc-edit) -CONFFILES+= syntax/Syntax -.endif - -.if !empty(PKG_OPTIONS:Mmc-vfs) +CONFFILES+= edit.indent.rc +CONFFILES+= filehighlight.ini +CONFFILES+= mc.default.keymap +CONFFILES+= mc.emacs.keymap +CONFFILES+= mc.ext +CONFFILES+= mc.keymap +CONFFILES+= mc.menu +CONFFILES+= mc.menu.sr +CONFFILES+= mcedit.menu CONFFILES+= sfs.ini -.endif -.if !empty(PKG_OPTIONS:Mmc-charset) -CONFFILES+= mc.charsets -.endif - -OWN_DIRS+= ${PKG_SYSCONFDIR}/mc ${PKG_SYSCONFDIR}/mc/syntax +OWN_DIRS+= ${PKG_SYSCONFDIR}/mc .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}/lib/mc 2>/dev/null || ${TRUE} - .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.glib2+= glib2>=2.14.0 .include "../../devel/glib2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST index b0e11b5830b..9f50805fe61 100644 --- a/sysutils/mc/PLIST +++ b/sysutils/mc/PLIST @@ -1,7 +1,69 @@ -@comment $NetBSD: PLIST,v 1.9 2011/01/23 14:36:10 wiz Exp $ +@comment $NetBSD: PLIST,v 1.10 2015/08/28 07:47:08 wiz Exp $ bin/mc -bin/mcmfmt +bin/mcdiff +bin/mcedit bin/mcview +libexec/mc/ext.d/archive.sh +libexec/mc/ext.d/doc.sh +libexec/mc/ext.d/image.sh +libexec/mc/ext.d/misc.sh +libexec/mc/ext.d/package.sh +libexec/mc/ext.d/sound.sh +libexec/mc/ext.d/text.sh +libexec/mc/ext.d/video.sh +libexec/mc/ext.d/web.sh +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/changesetfs +libexec/mc/extfs.d/deb +libexec/mc/extfs.d/deba +libexec/mc/extfs.d/debd +libexec/mc/extfs.d/dpkg+ +libexec/mc/extfs.d/gitfs+ +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/patchsetfs +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/ulib +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 +libexec/mc/fish/utime libexec/mc/mc-wrapper.csh libexec/mc/mc-wrapper.sh libexec/mc/mc.csh @@ -15,35 +77,43 @@ 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.default.keymap +share/examples/mc/mc.emacs.keymap 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/examples/mc/mcedit.menu +share/examples/mc/sfs.ini 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 share/locale/da/LC_MESSAGES/mc.mo share/locale/de/LC_MESSAGES/mc.mo +share/locale/de_CH/LC_MESSAGES/mc.mo share/locale/el/LC_MESSAGES/mc.mo +share/locale/en_GB/LC_MESSAGES/mc.mo +share/locale/eo/LC_MESSAGES/mc.mo share/locale/es/LC_MESSAGES/mc.mo +share/locale/et/LC_MESSAGES/mc.mo share/locale/eu/LC_MESSAGES/mc.mo +share/locale/fa/LC_MESSAGES/mc.mo share/locale/fi/LC_MESSAGES/mc.mo +share/locale/fi_FI/LC_MESSAGES/mc.mo share/locale/fr/LC_MESSAGES/mc.mo share/locale/gl/LC_MESSAGES/mc.mo +share/locale/hr/LC_MESSAGES/mc.mo share/locale/hu/LC_MESSAGES/mc.mo +share/locale/ia/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/ka/LC_MESSAGES/mc.mo +share/locale/kk/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 @@ -59,6 +129,8 @@ share/locale/sk/LC_MESSAGES/mc.mo share/locale/sl/LC_MESSAGES/mc.mo share/locale/sr/LC_MESSAGES/mc.mo share/locale/sv/LC_MESSAGES/mc.mo +share/locale/sv_SE/LC_MESSAGES/mc.mo +share/locale/szl/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 @@ -66,26 +138,163 @@ 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/mc.hint -share/mc/mc.hint.cs -share/mc/mc.hint.es -share/mc/mc.hint.hu -share/mc/mc.hint.it -share/mc/mc.hint.nl -share/mc/mc.hint.pl -share/mc/mc.hint.ru -share/mc/mc.hint.sr -share/mc/mc.hint.uk -share/mc/mc.hint.zh -share/mc/mc.hlp -share/mc/mc.hlp.es -share/mc/mc.hlp.hu -share/mc/mc.hlp.it -share/mc/mc.hlp.pl -share/mc/mc.hlp.ru -share/mc/mc.hlp.sr +share/mc/examples/macros.d/macro.0.sh +share/mc/examples/macros.d/macro.1.sh +share/mc/examples/macros.d/macro.3.sh +share/mc/examples/macros.d/macro.4.sh +share/mc/examples/macros.d/macro.5.sh +share/mc/examples/macros.d/macro.6.sh +share/mc/examples/macros.d/macro.7.sh +share/mc/help/mc.hlp +share/mc/help/mc.hlp.es +share/mc/help/mc.hlp.hu +share/mc/help/mc.hlp.it +share/mc/help/mc.hlp.pl +share/mc/help/mc.hlp.ru +share/mc/help/mc.hlp.sr +share/mc/hints/mc.hint +share/mc/hints/mc.hint.az +share/mc/hints/mc.hint.be +share/mc/hints/mc.hint.bg +share/mc/hints/mc.hint.ca +share/mc/hints/mc.hint.cs +share/mc/hints/mc.hint.da +share/mc/hints/mc.hint.de +share/mc/hints/mc.hint.de_CH +share/mc/hints/mc.hint.el +share/mc/hints/mc.hint.en_GB +share/mc/hints/mc.hint.eo +share/mc/hints/mc.hint.es +share/mc/hints/mc.hint.et +share/mc/hints/mc.hint.eu +share/mc/hints/mc.hint.fa +share/mc/hints/mc.hint.fi +share/mc/hints/mc.hint.fr +share/mc/hints/mc.hint.fr_CA +share/mc/hints/mc.hint.gl +share/mc/hints/mc.hint.hr +share/mc/hints/mc.hint.hu +share/mc/hints/mc.hint.ia +share/mc/hints/mc.hint.id +share/mc/hints/mc.hint.it +share/mc/hints/mc.hint.it_IT +share/mc/hints/mc.hint.ja +share/mc/hints/mc.hint.ka +share/mc/hints/mc.hint.kk +share/mc/hints/mc.hint.ko +share/mc/hints/mc.hint.lt +share/mc/hints/mc.hint.nl +share/mc/hints/mc.hint.pl +share/mc/hints/mc.hint.pt +share/mc/hints/mc.hint.pt_BR +share/mc/hints/mc.hint.ro +share/mc/hints/mc.hint.ru +share/mc/hints/mc.hint.sk +share/mc/hints/mc.hint.sl +share/mc/hints/mc.hint.sr +share/mc/hints/mc.hint.sv +share/mc/hints/mc.hint.sv_SE +share/mc/hints/mc.hint.szl +share/mc/hints/mc.hint.te +share/mc/hints/mc.hint.tr +share/mc/hints/mc.hint.uk +share/mc/hints/mc.hint.zh +share/mc/hints/mc.hint.zh_CN +share/mc/mc.lib +share/mc/skins/dark.ini 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 +share/mc/skins/gray-green-purple256.ini +share/mc/skins/gray-orange-blue256.ini +share/mc/skins/mc46.ini +share/mc/skins/modarcon16-defbg.ini +share/mc/skins/modarcon16.ini +share/mc/skins/modarcon16root-defbg.ini +share/mc/skins/modarcon16root.ini +share/mc/skins/modarin256-defbg.ini +share/mc/skins/modarin256.ini +share/mc/skins/modarin256root-defbg.ini +share/mc/skins/modarin256root.ini +share/mc/skins/nicedark.ini +share/mc/skins/sand256.ini +share/mc/skins/xoria256.ini +share/mc/syntax/PKGBUILD.syntax +share/mc/syntax/Syntax +share/mc/syntax/ada95.syntax +share/mc/syntax/as.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/cmake.syntax +share/mc/syntax/cs.syntax +share/mc/syntax/css.syntax +share/mc/syntax/cxx.syntax +share/mc/syntax/cython.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/dlink.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/jal.syntax +share/mc/syntax/java.syntax +share/mc/syntax/js.syntax +share/mc/syntax/latex.syntax +share/mc/syntax/lisp.syntax +share/mc/syntax/lkr.syntax +share/mc/syntax/lsm.syntax +share/mc/syntax/lua.syntax +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 +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/puppet.syntax +share/mc/syntax/python.syntax +share/mc/syntax/ruby.syntax +share/mc/syntax/sh.syntax +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.charset b/sysutils/mc/PLIST.charset index f5fa3e1ff2c..6a45000c235 100644 --- a/sysutils/mc/PLIST.charset +++ b/sysutils/mc/PLIST.charset @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST.charset,v 1.2 2011/01/23 14:36:10 wiz Exp $ -share/examples/mc/mc.charsets +@comment $NetBSD: PLIST.charset,v 1.3 2015/08/28 07:47:08 wiz Exp $ +share/mc/mc.charsets diff --git a/sysutils/mc/PLIST.mcedit b/sysutils/mc/PLIST.mcedit deleted file mode 100644 index f67c0e900d9..00000000000 --- a/sysutils/mc/PLIST.mcedit +++ /dev/null @@ -1,72 +0,0 @@ -@comment $NetBSD: PLIST.mcedit,v 1.6 2011/01/23 14:36:10 wiz Exp $ -bin/mcedit -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 -share/mc/syntax/lisp.syntax -share/mc/syntax/lsm.syntax -share/mc/syntax/lua.syntax -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 -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 -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 deleted file mode 100644 index 0b28f3bbe9a..00000000000 --- a/sysutils/mc/PLIST.vfs +++ /dev/null @@ -1,49 +0,0 @@ -@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 diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo index 24235a80e28..033eda1db3b 100644 --- a/sysutils/mc/distinfo +++ b/sysutils/mc/distinfo @@ -1,13 +1,8 @@ -$NetBSD: distinfo,v 1.22 2012/12/19 16:00:21 joerg Exp $ +$NetBSD: distinfo,v 1.23 2015/08/28 07:47:08 wiz Exp $ -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 (mc-4.8.14.tar.bz2) = ff83beaca4777fd888b23999664bfa7d0fc584cb +RMD160 (mc-4.8.14.tar.bz2) = 6d08797e08368cd11dea363d13179d39027c4a72 +Size (mc-4.8.14.tar.bz2) = 3213271 bytes +SHA1 (patch-ac) = d01357b685acd8e863510248ed7519ae2821757f SHA1 (patch-ad) = 4484b91511cf5bac73f4ae940988d46239e2cd95 -SHA1 (patch-ae) = b25734f82e46a92eb2a6d6590b0f7524f63040b3 -SHA1 (patch-af) = cff069eb20a5df7095805e800a141f8bb1d94c7d -SHA1 (patch-lib_fs.h) = 89bb61541e0312c4e74d48a8668583d0925d8b7a -SHA1 (patch-src_editor_syntax.c) = 7e07b88df9c270f650268265bd599d781991a695 +SHA1 (patch-src_vfs_extfs_helpers_Makefile.in) = c5d4735ce9548714731fdb1227e1acac78f11332 diff --git a/sysutils/mc/options.mk b/sysutils/mc/options.mk index ea709b53b9c..b3acccef296 100644 --- a/sysutils/mc/options.mk +++ b/sysutils/mc/options.mk @@ -1,11 +1,10 @@ -# $NetBSD: options.mk,v 1.13 2013/10/25 06:53:33 wiz Exp $ -# +# $NetBSD: options.mk,v 1.14 2015/08/28 07:47:08 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mc PKG_OPTIONS_REQUIRED_GROUPS= screen PKG_OPTIONS_GROUP.screen= ncurses slang -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 +PKG_SUPPORTED_OPTIONS= mc-charset x11 +PKG_SUGGESTED_OPTIONS= mc-charset slang .include "../../mk/bsd.options.mk" @@ -19,39 +18,6 @@ PLIST_SRC+= ${PKGDIR}/PLIST.charset CONFIGURE_ARGS+= --disable-charset .endif -### The internal editor can be disabled to save disk space. -.if !empty(PKG_OPTIONS:Mmc-edit) -CONFIGURE_ARGS+= --with-edit -PLIST_SRC+= ${PKGDIR}/PLIST.mcedit -.else -CONFIGURE_ARGS+= --without-edit -.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) -CONFIGURE_ARGS+= --with-samba -.else -CONFIGURE_ARGS+= --without-samba -.endif - -### The subshell is a shell command line inside the Midnight Commander. -.if !empty(PKG_OPTIONS:Mmc-subshell) -CONFIGURE_ARGS+= --with-subshell -.else -CONFIGURE_ARGS+= --without-subshell -.endif - -### Enable the virtual file system of the Midnight Commander. With the -### 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) -PLIST_SRC+= ${PKGDIR}/PLIST.vfs -USE_TOOLS+= perl:run -.else -CONFIGURE_ARGS+= --disable-vfs -.endif - ### X11 support allows better key handling (detection of the Alt, Ctrl, ### Shift modifiers) and mouse support. .if !empty(PKG_OPTIONS:Mx11) diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa deleted file mode 100644 index dc29c4b8020..00000000000 --- a/sysutils/mc/patches/patch-aa +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-aa,v 1.15 2011/01/23 14:36:10 wiz Exp $ - -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 @@ - - #ifdef MOUNTED_GETMNTINFO2 /* NetBSD 3.0. */ - #include -+#define statfs statvfs - #endif - - #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 deleted file mode 100644 index 5fc613be2e7..00000000000 --- a/sysutils/mc/patches/patch-ab +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ab,v 1.14 2011/01/23 14:36:10 wiz Exp $ - -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 - --/* 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 - - #define RFC_AUTODETECT 0 diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac index e6fc92e8b7d..5635d5d66f2 100644 --- a/sysutils/mc/patches/patch-ac +++ b/sysutils/mc/patches/patch-ac @@ -1,14 +1,14 @@ -$NetBSD: patch-ac,v 1.10 2011/01/23 14:36:10 wiz Exp $ +$NetBSD: patch-ac,v 1.11 2015/08/28 07:47:08 wiz Exp $ for installing configs to share/examples/mc ---- misc/Makefile.in.orig 2010-07-05 19:13:19.000000000 +0000 +--- misc/Makefile.in.orig 2015-03-20 18:08:54.000000000 +0000 +++ misc/Makefile.in -@@ -369,7 +369,7 @@ LIBFILES_CONST = \ - mc.menu.sr +@@ -492,7 +492,7 @@ LIBFILES_SCRIPT = \ + edit.indent.rc CLEANFILES = $(SCRIPTS_OUT) -cfgdir = $(sysconfdir)/@PACKAGE@ +cfgdir = @datadir@/examples/@PACKAGE@ cfg_DATA = \ $(LIBFILES_CONST) \ - $(LIBFILES_OUT) \ + $(SCRIPTS_OUT) \ diff --git a/sysutils/mc/patches/patch-ae b/sysutils/mc/patches/patch-ae deleted file mode 100644 index dd64650fe6d..00000000000 --- a/sysutils/mc/patches/patch-ae +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ae,v 1.10 2011/01/23 14:36:10 wiz Exp $ - -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 deleted file mode 100644 index ef14d477f2b..00000000000 --- a/sysutils/mc/patches/patch-af +++ /dev/null @@ -1,14 +0,0 @@ -$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-lib_fs.h b/sysutils/mc/patches/patch-lib_fs.h deleted file mode 100644 index b6becbf4a09..00000000000 --- a/sysutils/mc/patches/patch-lib_fs.h +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-lib_fs.h,v 1.1 2011/04/08 22:48:04 wiz Exp $ - -Fix build on DragonFly (missing MAXNAMLEN macro), from upstream. - ---- lib/fs.h.orig 2010-11-08 11:46:13 +0000 -+++ lib/fs.h -@@ -44,6 +44,12 @@ - # define S_ISNAM(x) 0 - #endif - -+/* DragonFlyBSD doesn't provide MAXNAMLEN macro */ -+#ifndef MAXNAMLEN -+# define MAXNAMLEN NAME_MAX -+#endif -+ -+#define MC_MAXFILENAMELEN MAXNAMLEN - - #ifndef MAXPATHLEN - # define MC_MAXPATHLEN 4096 diff --git a/sysutils/mc/patches/patch-src_editor_syntax.c b/sysutils/mc/patches/patch-src_editor_syntax.c deleted file mode 100644 index 740368f93aa..00000000000 --- a/sysutils/mc/patches/patch-src_editor_syntax.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_editor_syntax.c,v 1.1 2012/12/19 16:00:21 joerg Exp $ - ---- src/editor/syntax.c.orig 2012-12-19 14:04:18.000000000 +0000 -+++ src/editor/syntax.c -@@ -1079,7 +1079,7 @@ edit_read_syntax_file (WEdit * edit, cha - - f = fopen (syntax_file, "r"); - if (!f){ -- lib_file = concat_dir_and_file (mc_home, "Syntax"); -+ lib_file = concat_dir_and_file (mc_home, "syntax" PATH_SEP_STR "Syntax"); - f = fopen (lib_file, "r"); - g_free (lib_file); - if (!f) diff --git a/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in b/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in new file mode 100644 index 00000000000..72ff3fba318 --- /dev/null +++ b/sysutils/mc/patches/patch-src_vfs_extfs_helpers_Makefile.in @@ -0,0 +1,15 @@ +$NetBSD: patch-src_vfs_extfs_helpers_Makefile.in,v 1.1 2015/08/28 07:47:08 wiz Exp $ + +Install config file to example directory. + +--- src/vfs/extfs/helpers/Makefile.in.orig 2015-08-28 07:03:49.000000000 +0000 ++++ src/vfs/extfs/helpers/Makefile.in +@@ -486,7 +486,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 -- cgit v1.2.3