From 3a08861bdb489fabef648cf5e3bd2324c9a6d7af Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 15 Jan 2005 21:14:27 +0000 Subject: Update to 4.6.1pre2, fixing a number of vulnerabilities. Joined work in pkgsrc-wip by Pavel Arnost, myself, and Roland Illig. Version 4.6.1-pre2. Release candidate for 4.6.1. - Security. - Fixed CAN-2004-0226 (buffer overflows). - Fixed CAN-2004-0231 (unsafe temporary file and directory creation). - Fixed CAN-2004-0232 (format string vulnerablities). - cons.saver does not need to be setuid-root on Linux. - Hiding of FTP passwords. - Portability. - PC port has been removed. - Support for SCO UNIX has been removed. - Improve support for QNX Neutrino. - Core functionality. - Use 8bit input as default. - Better support for '@' in FTP usernames. - Better large file support (int -> off_t) - Add gnome, rxvt and xterm-new terminals (keyword copy for mc.lib). - Make the find dialog more responsive while scanning through large files. - Add implementation to cons.handler for FreeBSD 4.x and 5.x. - Screen saving is now supported on FreeBSD console. - Hide temporary commands from history. - Add --with-glib12 option to configure to force using glib 1.2.x. - Add --disable-background option to disable background support. - Background support now uses pipes instead of UNIX sockets. - libX11 is loaded dynamically using gmodule if possible. - User is warned if one mc is run from another. - In red dialog boxes draw the hotkey characters with a color different than the one used to paint the dialog. - Screen libraries. - Add many boundary check into internal slang library. - Internal slang upgrade to 1.4.9. - Increased maximum screen size to 512 x 512. - Add support for qansi-m terminals. - Editor. - Fix bugs for mcedit compiled with ncurses. - New status string format in mcedit. - Support for large syntax files. - Temporarily disable safe save and backups on remote VFS because it doesn't work. - Enable user menu in mcedit. - Add syntax file for the ASP.NET technology. - Add syntax file for the Eiffel programming language. - Add syntax file for the Ruby programming language. - Add syntax file for the C# programming language. - Upgrade php.syntax file. - Improve sql.syntax file. - Improve perl.syntax. - Improve diff.syntax. - Improve makefile.syntax. - VFS. - Full audit of quoting of parameters in vfs scripts (CAN-2004-0494). - Fixed CAN-2003-1023 (stack overflow in vfs_s_resolve_symlink). - Various fixes in tar.c. - VFS supports iso9660 images. - Translations. - New translations: Mongolian, Serbian and Lithuanian. - Updated translations: Ukrainian, Italian, Hungarian. Version 4.6.0. - Core functionality. - Fixed infinite loop under xterm if xterm is forcedly closed. - Portability. - ncurses can be found even if it's renamed to curses (OpenBSD). - Warning fixes for 64-bit systems. Version 4.6.0-pre3. Another release candidate for 4.6.0. - Core functionality. - ".." is no longer shown in the root directory. - Fixed segmentation fault when processing truncated section header in the corrupted initialization file. - Screen libraries. - Fixed incorrect processing of AltGr on Linux console introduced in -pre2. - Documentation. - Fixed a bug in man2hlp that could randomly prevent correct generation of the help files. - Added manual page for mcview. Version 4.6.0-pre2. Release candidate for 4.6.0. - Security. - mc now creates its own temporary directory /tmp/mc-$USER. If it fails or permissions are wrong, the user is warned. - Portability. - mc now complies with the Filesystem Hierarchy Standard and uses @prefix@/share/mc for the data files. - Support for glib 2.0.x has been added. - glib 1.2 is now properly detected on FreeBSD. - Core functionality. - Fixed segmentation fault when displaying messages from background operations. - When using support for setting the last working directory of mc in the parent shell, "mc" is now an alias in all shells, not a function. The "-P" option needs an argument now. - Alt-O sets the same directory on the other panel. - Current directory is shown in the xterm window title. - Screen libraries. - Screen library is now selected by the option --with-screen. - X11 support is enabled by default, use --without-x to disable. - The keycode now contains information about all screen modifiers. This allows to implement more shortcuts, but this work has just begun. - Included S-Lang library has been updated to version 1.4.5. - Mouse wheel is supported in the internal editor and viewer in xterm compatible terminals that implement wheel events. - Editor. - Internal editor now saves the cursor position in the file. - New syntax rules - RPM specfile, m4. - Editor shows control characters in the caret notation. - VFS. - Most extfs scripts have been reviewed and improved. - Fixed viewing and editing files on mcfs. - Support for termnet and HSC firewall has been removed. - Documentation. - Polish manual has been added. Version 4.6.0-pre1. - Security release. Massive code cleanup. Most improvements didn't need any significant amount of the new code. - Security. - Fixes for remotely exploitable buffer overflows in VFS. - Ports and editions. - GNOME edition has been removed. - OS/2 port has been removed. - MAD (Memory Allocation Debugger) has been removed. - Core functionality. - Large file support enabled by default. - Shift-F5 and Shift-F6 copy and rename like F5 and F6, but suggest the selected filename as the destination. - File search with contents doesn't use external egrep. - Directories with many files are now reloaded much faster. - Subshell works under Cygwin. - Screen libraries. - Improved support for ncurses. - Dropped support for the old Curses library. - Colors are enabled on all capable terminals when using S-Lang. - Syntax highlighting now works with ncurses. - Editor. - Editor files are now stored in ~/.mc/cedit instead of ~/.cedit to avoid collision with Cooledit. - New syntax rules - PHP, Tcl, SQL, DOS batch file. - Editor supports word completion. - VFS. - Local temporary file is used for uploading via ftpfs/fish only if file is uploaded to the same ftp/fish server. - mcfs support is disabled by default. - Samba configuration and codepage files locations can be configured. - .netrc support in ftpfs is enabled by default. - Viewing zip files could corrupt them. - Documentation. - Added manuals in Spanish, Italian and Russian. - Help files are not distributed, but generated during the build from the manual pages. - Translations. - Belarussian translation has been added. Version 4.5.55 - Mostly bugfixes and portability fixes. Making things work as they were meant to work. - Text edition improvements. - Ctrl-O supported in the viewer and editor. - Better terminal support. Should not need "Learn Keys" on rxvt and xterm in most cases. - GNOME edition improvements. - Find dialog rewritten. - Editor and viewer ask whether to save modified file when closed from window manager. - Editor. - New syntax rules - S-Lang, PO files, Octave. - Alt-B goes to matching bracket. - Portability improvements. - Should compile out-of-box on Cygwin and QNX Neutrino. - Can be compiled by BSD make. - Subshell and VFS code are safer and more portable. - Experimental features (disabled by default). - Charset conversion support. - Large (64-bit) file support on 32-bit systems. --- sysutils/mc/DESCR | 10 ++- sysutils/mc/Makefile | 125 +++++++++++++++++++---------- sysutils/mc/PLIST | 183 ++++++++++++++++++++++++------------------- sysutils/mc/distinfo | 18 +---- sysutils/mc/patches/patch-aa | 65 --------------- sysutils/mc/patches/patch-ab | 33 +++----- sysutils/mc/patches/patch-ac | 21 ----- sysutils/mc/patches/patch-ad | 24 ------ sysutils/mc/patches/patch-ae | 23 ------ sysutils/mc/patches/patch-af | 31 -------- sysutils/mc/patches/patch-ag | 13 --- sysutils/mc/patches/patch-ah | 13 --- sysutils/mc/patches/patch-ai | 13 --- sysutils/mc/patches/patch-aj | 16 ---- sysutils/mc/patches/patch-ak | 16 ---- 15 files changed, 205 insertions(+), 399 deletions(-) delete mode 100644 sysutils/mc/patches/patch-aa delete mode 100644 sysutils/mc/patches/patch-ac delete mode 100644 sysutils/mc/patches/patch-ad delete mode 100644 sysutils/mc/patches/patch-ae delete mode 100644 sysutils/mc/patches/patch-af delete mode 100644 sysutils/mc/patches/patch-ag delete mode 100644 sysutils/mc/patches/patch-ah delete mode 100644 sysutils/mc/patches/patch-ai delete mode 100644 sysutils/mc/patches/patch-aj delete mode 100644 sysutils/mc/patches/patch-ak (limited to 'sysutils/mc') diff --git a/sysutils/mc/DESCR b/sysutils/mc/DESCR index 68a677db993..51b5905b5f6 100644 --- a/sysutils/mc/DESCR +++ b/sysutils/mc/DESCR @@ -1,4 +1,6 @@ -Midnight Commander is a visual shell much like a file manager, only with way -more features. It is text mode, but also includes mouse support if you are -running GPM. Its coolest feature is the ability to ftp, view tar, zip -files, and poke into RPMs for specific files. +GNU Midnight Commander is a user-friendly yet powerful file manager +and visual shell, useful to novice and guru alike. It provides a +clear, user-friendly, and somewhat protected interface to a Unix +system while making many frequent file operations more efficient and +preserving the full power of the command prompt. You will wonder how +you could ever live without it. diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile index 5fc4c6cf315..26bff4ed815 100644 --- a/sysutils/mc/Makefile +++ b/sysutils/mc/Makefile @@ -1,58 +1,101 @@ -# $NetBSD: Makefile,v 1.46 2004/12/20 15:58:27 wiz Exp $ -# FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp -# +# $NetBSD: Makefile,v 1.47 2005/01/15 21:14:27 wiz Exp $ -DISTNAME= mc-4.5.51 -PKGREVISION= 5 -CATEGORIES= sysutils -MASTER_SITES+= ${MASTER_SITE_GNOME:=stable/sources/mc/} +DISTNAME= mc-4.6.1-pre2b +PKGNAME= mc-4.6.1rc2 +CATEGORIES= sysutils +MASTER_SITES= http://pavelsh.pp.ru/mc/ +#MASTER_SITES= http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \ +# ${MASTER_SITE_SUNSITE:=utils/file/managers/mc/} -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.ibiblio.org/mc/ -COMMENT= Midnight Commander, a free Norton Commander Clone +MAINTAINER= pavel.arnost@clnet.cz +HOMEPAGE= http://www.ibiblio.org/mc/ +COMMENT= User-friendly file manager and visual shell -BUILD_USES_MSGFMT= YES - -CONFLICTS+= gmc-[0-9]* +.include "../../mk/bsd.prefs.mk" USE_BUILDLINK3= YES -USE_PKGLOCALEDIR= YES +GNU_CONFIGURE= YES USE_GNU_TOOLS+= make +USE_PKGLOCALEDIR= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --without-included-gettext -CONFIGURE_ARGS+= --with-netrc --with-included-slang +.if ${OPSYS} == "Linux" +PLIST_SRC+= ${PKGDIR}/PLIST.cons.saver +.endif + +# remove dir if no extensions were installed there +post-install: + @${RMDIR} ${PREFIX}/lib/mc 2>/dev/null || ${TRUE} + +# we need working e2fsprogs and gpm packages first +CONFIGURE_ARGS+= --without-ext2undel +CONFIGURE_ARGS+= --without-gpm-mouse + +MC_FEATURES= edit charset largefile samba subshell vfs x11 +MC_DISABLE_FEATURES= x11 samba + +MC_SCREEN_LIBRARY= slang + +.for feature in ${MC_FEATURES} + +__feature:=${feature} + +. if empty(MC_DISABLE_FEATURES:M${feature}) + +. if ${__feature} == edit +CONFIGURE_ARGS+= --with-edit +PLIST_SRC+= ${PKGDIR}/PLIST.mcedit +. elif ${__feature} == charset +CONFIGURE_ARGS+= --enable-charset +.include "../../converters/libiconv/buildlink3.mk" +PLIST_SRC+= ${PKGDIR}/PLIST.charset +. elif ${__feature} == largefile +CONFIGURE_ARGS+= --enable-largefile +. elif ${__feature} == samba CONFIGURE_ARGS+= --with-samba -CONFIGURE_ARGS+= --without-gnome -CONFIGURE_ARGS+= --without-tk -CONFIGURE_ARGS+= --without-tm-x-support -CONFIGURE_ARGS+= --without-x +. elif ${__feature} == subshell +CONFIGURE_ARGS+= --with-subshell +. elif ${__feature} == vfs +CONFIGURE_ARGS+= --with-vfs +PLIST_SRC+= ${PKGDIR}/PLIST.vfs +. elif ${__feature} == x11 +USE_X11= YES +CONFIGURE_ARGS+= --with-x +. endif -# Don't pick up readline if it's installed in the build environment. -# -CONFIGURE_ENV+= ac_cv_header_history_h=no -CONFIGURE_ENV+= ac_cv_header_readline_h=no -CONFIGURE_ENV+= ac_cv_header_readline_history_h=no -CONFIGURE_ENV+= ac_cv_header_readline_readline_h=no +. else -CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} +. if ${__feature} == edit +CONFIGURE_ARGS+= --without-edit +. elif ${__feature} == charset +CONFIGURE_ARGS+= --disable-charset +. elif ${__feature} == largefile +CONFIGURE_ARGS+= --disable-largefile +. elif ${__feature} == samba +CONFIGURE_ARGS+= --without-samba +. elif ${__feature} == subshell +CONFIGURE_ARGS+= --without-subshell +. elif ${__feature} == vfs +CONFIGURE_ARGS+= --without-vfs +. elif ${__feature} == x11 +CONFIGURE_ARGS+= --without-x +. endif -LIBS+= -lm -ltermcap # -lslang -CPPFLAGS+= -Dunix +. endif -.include "../../mk/bsd.prefs.mk" +.endfor -.if ${OPSYS} == "SunOS" -CFLAGS+= -DSunOS -.endif +PLIST_SRC+= ${PKGDIR}/PLIST -# Remove unwanted directories in a non-GNOME installation. -# -post-install: - ${RMDIR} -p ${PREFIX}/share/idl 2>/dev/null || ${TRUE} - ${RMDIR} -p ${PREFIX}/share/pixmaps/mc 2>/dev/null || ${TRUE} +.if ${MC_SCREEN_LIBRARY} == "slang" +CONFIGURE_ARGS+= --with-screen=slang +.include "../../devel/libslang/buildlink3.mk" +.elif ${MC_SCREEN_LIBRARY} == "ncurses" +CONFIGURE_ARGS+= --with-screen=ncurses +.include "../../devel/ncurses/buildlink3.mk" +.else +CONFIGURE_ARGS+= --with-screen=mcslang +.endif +.include "../../devel/glib2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" -.include "../../devel/glib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/mc/PLIST b/sysutils/mc/PLIST index 78c90f8a849..b3d858dfb66 100644 --- a/sysutils/mc/PLIST +++ b/sysutils/mc/PLIST @@ -1,110 +1,129 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:27 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2005/01/15 21:14:27 wiz Exp $ bin/mc -bin/mcedit bin/mcmfmt -bin/mcserv -etc/mc.global -lib/mc/FAQ -lib/mc/bin/mc.csh -lib/mc/bin/mc.sh -lib/mc/bin/mcfn_install -lib/mc/desktop-scripts/README.desktop -lib/mc/desktop-scripts/startup.links -lib/mc/edit.indent.rc -lib/mc/extfs/README -lib/mc/extfs/a -lib/mc/extfs/deb -lib/mc/extfs/extfs.ini -lib/mc/extfs/ftplist -lib/mc/extfs/hp48 -lib/mc/extfs/lslR -lib/mc/extfs/mailfs -lib/mc/extfs/patchfs -lib/mc/extfs/rpm -lib/mc/extfs/rpms -lib/mc/extfs/sfs.ini -lib/mc/extfs/trpm -lib/mc/extfs/uar -lib/mc/extfs/uarj -lib/mc/extfs/ucpio -lib/mc/extfs/uha -lib/mc/extfs/ulha -lib/mc/extfs/unarj.diff -lib/mc/extfs/urar -lib/mc/extfs/uzip -lib/mc/extfs/uzoo -lib/mc/mc-gnome.ext -lib/mc/mc.csh -lib/mc/mc.ext -lib/mc/mc.hint -lib/mc/mc.hint.cs -lib/mc/mc.hint.es -lib/mc/mc.hint.ru -lib/mc/mc.hlp -lib/mc/mc.lib -lib/mc/mc.menu -lib/mc/mc.sh -lib/mc/syntax/ada95.syntax -lib/mc/syntax/c.syntax -lib/mc/syntax/changelog.syntax -lib/mc/syntax/diff.syntax -lib/mc/syntax/fortran.syntax -lib/mc/syntax/html.syntax -lib/mc/syntax/java.syntax -lib/mc/syntax/latex.syntax -lib/mc/syntax/lsm.syntax -lib/mc/syntax/mail.syntax -lib/mc/syntax/makefile.syntax -lib/mc/syntax/ml.syntax -lib/mc/syntax/nroff.syntax -lib/mc/syntax/pascal.syntax -lib/mc/syntax/perl.syntax -lib/mc/syntax/python.syntax -lib/mc/syntax/sh.syntax -lib/mc/syntax/smalltalk.syntax -lib/mc/syntax/swig.syntax -lib/mc/syntax/texinfo.syntax -lib/mc/syntax/unknown.syntax -lib/mc/term/README.xterm -lib/mc/term/ansi.ti -lib/mc/term/linux.ti -lib/mc/term/vt100.ti -lib/mc/term/xterm.ad -lib/mc/term/xterm.tcap -lib/mc/term/xterm.ti +bin/mcview +man/es/man1/mc.1 +man/hu/man1/mc.1 +man/it/man1/mc.1 man/man1/mc.1 man/man1/mcedit.1 -man/man8/mcserv.8 +man/man1/mcview.1 +man/pl/man1/mc.1 +man/ru/man1/mc.1 +man/sr/man1/mc.1 +${PKGLOCALEDIR}/locale/az/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/be/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/mc.mo -${PKGLOCALEDIR}/locale/es_ES/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/mc.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/mc.mo -${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo -${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo -@dirrm lib/mc/term -@dirrm lib/mc/syntax -@dirrm lib/mc/extfs -@dirrm lib/mc/desktop-scripts -@dirrm lib/mc/bin -@dirrm lib/mc +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/mc.mo +${PKGLOCALEDIR}/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 +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/mc.lib +share/mc/mc.menu +share/mc/mc.menu.sr +share/mc/syntax/Syntax +share/mc/syntax/ada95.syntax +share/mc/syntax/aspx.syntax +share/mc/syntax/c.syntax +share/mc/syntax/changelog.syntax +share/mc/syntax/cs.syntax +share/mc/syntax/diff.syntax +share/mc/syntax/dos.syntax +share/mc/syntax/eiffel.syntax +share/mc/syntax/fortran.syntax +share/mc/syntax/html.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/m4.syntax +share/mc/syntax/mail.syntax +share/mc/syntax/makefile.syntax +share/mc/syntax/ml.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/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/swig.syntax +share/mc/syntax/syntax.syntax +share/mc/syntax/tcl.syntax +share/mc/syntax/texinfo.syntax +share/mc/syntax/unknown.syntax +share/mc/syntax/xml.syntax +@dirrm share/mc/syntax +@dirrm share/mc/bin +@unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr/man8 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/sr 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/ru 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/it 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/hu/man1 2>/dev/null || ${TRUE} +@unexec ${RMDIR} %D/man/hu 2>/dev/null || ${TRUE} diff --git a/sysutils/mc/distinfo b/sysutils/mc/distinfo index bcab01a3b31..2bf82297384 100644 --- a/sysutils/mc/distinfo +++ b/sysutils/mc/distinfo @@ -1,15 +1,5 @@ -$NetBSD: distinfo,v 1.10 2004/11/12 05:23:33 erh Exp $ +$NetBSD: distinfo,v 1.11 2005/01/15 21:14:27 wiz Exp $ -SHA1 (mc-4.5.51.tar.gz) = 24d5d90695266587a2e8190196b32c8f3a4b2406 -Size (mc-4.5.51.tar.gz) = 4330056 bytes -SHA1 (patch-aa) = 57bd96ecafd94e8bb2bd888c31bf3b1b97937eaf -SHA1 (patch-ab) = 6da1ccfdcd9b0623bf5619a99c59e67cd70b51b6 -SHA1 (patch-ac) = 36ee4017c74f04efff92e2a79cdb40cd5a4de6ed -SHA1 (patch-ad) = 9867fe55febd06055ab4bc5415260708fb5d7472 -SHA1 (patch-ae) = c3ad5c2f2ad99782f343f7197a3ebcfb07366dee -SHA1 (patch-af) = be7b6906f5cd23e28311519b42a1d8c630e98f2e -SHA1 (patch-ag) = 60e697e475647038181d12186a0424c4a6165c59 -SHA1 (patch-ah) = a5ef804a13870ae5d100a7f6fb45281303da82c3 -SHA1 (patch-ai) = 7bac376900226618f1bb5849cb5ac277bdd4e4f9 -SHA1 (patch-aj) = b9ab663bf8f2d1b048338b85449846869362f125 -SHA1 (patch-ak) = 1277d8072ac279e6c4a8fc5d7334ac831dce1783 +SHA1 (mc-4.6.1-pre2b.tar.gz) = 1e66efa538cd682fca9bee16b4d6b751b4d87bab +Size (mc-4.6.1-pre2b.tar.gz) = 3903628 bytes +SHA1 (patch-ab) = 7f6ace2493bc2e453f570153073183a289fbd153 diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa deleted file mode 100644 index f6343137ef6..00000000000 --- a/sysutils/mc/patches/patch-aa +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-aa,v 1.12 2004/05/04 08:08:19 wiz Exp $ - ---- configure.orig 2000-07-03 16:31:57.000000000 +0200 -+++ configure -@@ -3543,6 +3543,11 @@ fi - - - -+# Set DATADIRNAME to "${PKGLOCALEDIR}" -+DATADIRNAME="${PKGLOCALEDIR}" -+INTLDEPS= -+INTLLIBS="-lintl" -+ - cc_uses_g=yes - if test x$GCC = xyes; then - if test x$ac_cv_prog_gcc_g = xyes; then -@@ -9409,11 +9414,15 @@ fi - - - # Check whether --with-gnome or --without-gnome was given. -+gnomecodedirs= -+gnomeunixdirs= - if test "${with_gnome+set}" = set; then - withval="$with_gnome" - if test x$withval = xyes; then - want_gnome=yes - -+ gnomecodedirs='gnome idl' -+ gnomeunixdirs='doc-gnome' - mx=mx - gmcdep=gmcdep - libgtkedit="libgtkedit.a" -@@ -10682,7 +10691,6 @@ EOF - LIBEDIT_A="libedit.a" - MCEDIT="mcedit" - LEDIT="-ledit" -- CPPFLAGS="$CPPFLAGS -I\$(rootdir)" - EDIT_msg="yes" - echo "$ac_t""will call internal editor" 1>&6 - -@@ -10698,7 +10706,6 @@ EOF - LIBEDIT_A="libedit.a" - MCEDIT="mcedit" - LEDIT="-ledit" -- CPPFLAGS="$CPPFLAGS -I\$(rootdir)" - EDIT_msg="yes" - echo "$ac_t""will call internal editor" 1>&6 - -@@ -11891,6 +11898,7 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF - $ac_vpsub - $extrasub -+s%@LOCALBASE@%$LOCALBASE%g - s%@SHELL@%$SHELL%g - s%@CFLAGS@%$CFLAGS%g - s%@CPPFLAGS@%$CPPFLAGS%g -@@ -12019,6 +12027,8 @@ s%@GNOME_APPLETS_LIBS@%$GNOME_APPLETS_LI - s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g - s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g - s%@gnomeicondir@%$gnomeicondir%g -+s%@gnomecodedirs@%$gnomecodedirs%g -+s%@gnomeunixdirs@%$gnomeunixdirs%g - s%@mx@%$mx%g - s%@gmcdep@%$gmcdep%g - s%@libgtkedit@%$libgtkedit%g diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab index 7cf94ceb285..f455ca224c4 100644 --- a/sysutils/mc/patches/patch-ab +++ b/sysutils/mc/patches/patch-ab @@ -1,26 +1,13 @@ -$NetBSD: patch-ab,v 1.10 2000/10/19 23:31:18 jlam Exp $ +$NetBSD: patch-ab,v 1.11 2005/01/15 21:14:27 wiz Exp $ ---- vfs/Make-mc.in.orig Mon Jul 3 10:31:58 2000 -+++ vfs/Make-mc.in -@@ -16,6 +16,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755 - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - AR = @AR@ +--- configure.orig 2003-12-24 18:14:58.000000000 +0100 ++++ configure +@@ -9633,7 +9633,7 @@ _ACEOF - # -@@ -342,11 +343,11 @@ - $(DESTDIR)$(extfsdir)/$$I; \ - done - for I in $(EXTFS_CONST) ; do \ -- $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \ -+ $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \ - $(DESTDIR)$(extfsdir)/$$I; \ - done - for I in $(EXTFS_OUT) ; do \ -- $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \ -+ $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \ - $(DESTDIR)$(extfsdir)/$$I; \ - done + if test "x$USE_INCLUDED_LIBINTL" = xyes; then +- CPPFLAGS="$CPPFLAGS -I\$(top_builddir)/intl -I\$(top_srcdir)/intl" ++ : + fi + + ALL_DOC_LINGUAS="es hu it pl ru sr" diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac deleted file mode 100644 index 4012d167e12..00000000000 --- a/sysutils/mc/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.7 1999/10/23 11:54:35 tron Exp $ - ---- lib/Makefile.in.orig Wed Sep 29 22:39:38 1999 -+++ lib/Makefile.in Sat Oct 23 13:29:19 1999 -@@ -7,6 +7,7 @@ - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - # - # Distribution variables -@@ -62,7 +63,7 @@ - for I in $(LIBFILES_OUT); \ - do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done - for I in $(SUPPBIN_OUT); \ -- do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done -+ do $(INSTALL_SCRIPT) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done - for I in $(TIFILES); \ - do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done - $(MKINSTALLDIRS) $(DESTDIR)$(confdir) diff --git a/sysutils/mc/patches/patch-ad b/sysutils/mc/patches/patch-ad deleted file mode 100644 index 41d74c44976..00000000000 --- a/sysutils/mc/patches/patch-ad +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2002/10/23 08:49:07 bouyer Exp $ - ---- vfs/smbfs.c.orig Mon Jul 3 16:31:59 2000 -+++ vfs/smbfs.c Tue Oct 22 22:29:12 2002 -@@ -29,7 +29,9 @@ - confilcts with definitions in other includes */ - #undef HAVE_LIBREADLINE - #define NO_CONFIG_H -+#ifndef SunOS - #define BOOL_DEFINED -+#endif - #include "samba/include/includes.h" - - #include -@@ -375,7 +377,8 @@ - static int - smbfs_init(vfs *me) - { -- char *servicesf = "/etc/smb.conf"; -+ /* This must match what net/samba uses. */ -+ char *servicesf = "/etc/samba/smb.conf"; - - /* DEBUGLEVEL = 4; */ - diff --git a/sysutils/mc/patches/patch-ae b/sysutils/mc/patches/patch-ae deleted file mode 100644 index 0ca76233330..00000000000 --- a/sysutils/mc/patches/patch-ae +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ae,v 1.7 2002/07/24 05:06:00 hubertf Exp $ - ---- vfs/extfs/ulha.in.orig Wed Jul 24 06:52:24 2002 -+++ vfs/extfs/ulha.in -@@ -34,11 +34,16 @@ - # Define your awk - AWK=@AWK@ - --if ls -de . >& /dev/null; -+if ls -de . >/dev/null 2>&1 ; - then - LS_COMMAND="ls -le" - else -- LS_COMMAND="ls -l --full-time" -+ if ls -dT . >/dev/null 2>&1; # BSD::ls -T == Linux::ls -e -+ then -+ LS_COMMAND="ls -lT" -+ else -+ LS_COMMAND="ls -l --full-time" -+ fi - fi - - # Define which archiver you are using with appropriate options diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af deleted file mode 100644 index d046fdabccb..00000000000 --- a/sysutils/mc/patches/patch-af +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-af,v 1.11 2000/10/19 23:31:18 jlam Exp $ - ---- Makefile.in.orig Mon Jul 3 10:31:57 2000 -+++ Makefile.in -@@ -5,14 +5,15 @@ - @MCFGR@@MCF@ - - foreigndirs=pc --codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax --unixdirs=intl $(codedirs) doc-gnome @POSUB@ -+codedirs=vfs lib doc slang gtkedit edit src new_icons icons syntax @gnomecodedirs@ -+unixdirs=intl $(codedirs) @gnomeunixdirs@ @POSUB@ - alldirs=$(unixdirs) $(foreigndirs) - subdirs=$(alldirs) - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ - - DISTMAIN = configure configure.in NEWS README INSTALL INSTALL.FAST \ - Makefile.in FAQ COPYING create_vcs install-sh \ -@@ -45,7 +46,7 @@ - install: installdirs - @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done - $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ -- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install -+ $(INSTALL_SCRIPT) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install - chmod +x $(DESTDIR)$(suppbindir)/mcfn_install - @echo "Please verify that the configuration values are correctly" - @echo "set in the mc.ext file in $(mclibdir)" diff --git a/sysutils/mc/patches/patch-ag b/sysutils/mc/patches/patch-ag deleted file mode 100644 index 2e5e08aa010..00000000000 --- a/sysutils/mc/patches/patch-ag +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ag,v 1.9 2002/07/24 04:30:16 hubertf Exp $ - ---- vfs/extfs/uzip.in.orig Mon Jul 3 10:32:00 2000 -+++ vfs/extfs/uzip.in -@@ -7,7 +7,7 @@ - # - # - --DZIP=/usr/bin -+DZIP=@LOCALBASE@/bin - XZIP="$DZIP/zip -g" - XDZIP="$DZIP/zip -d" - XUNZIP="$DZIP/unzip" diff --git a/sysutils/mc/patches/patch-ah b/sysutils/mc/patches/patch-ah deleted file mode 100644 index 171599a2da6..00000000000 --- a/sysutils/mc/patches/patch-ah +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ah,v 1.4 2002/07/24 04:30:16 hubertf Exp $ - ---- vfs/extfs/urar.in.orig Mon Jul 3 10:32:00 2000 -+++ vfs/extfs/urar.in -@@ -5,7 +5,7 @@ - # Updated by christian.gennerat@alcatel.fr 1999 - # beta version 2.0 - # --DRAR=/usr/bin -+DRAR=@LOCALBASE@/bin - RAR=$DRAR/rar - UNRAR=$DRAR/unrar # Prefer unrar (freeware) - # diff --git a/sysutils/mc/patches/patch-ai b/sysutils/mc/patches/patch-ai deleted file mode 100644 index 67bb2f4ea42..00000000000 --- a/sysutils/mc/patches/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2002/10/08 17:27:20 wiz Exp $ - ---- vfs/samba/Makefile.in.orig Tue Oct 8 19:13:16 2002 -+++ vfs/samba/Makefile.in -@@ -518,8 +518,6 @@ $(srcdir)/include/config.h.in: $(srcdir) - @: - - $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in -- cd $(srcdir) && $(AUTOHEADER) -- @date -u > $@ - - # automatic dependency tracking rules - .deps/.dummy: diff --git a/sysutils/mc/patches/patch-aj b/sysutils/mc/patches/patch-aj deleted file mode 100644 index 5dd58741277..00000000000 --- a/sysutils/mc/patches/patch-aj +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2003/05/22 17:02:54 salo Exp $ - ---- slang/slang-mc.h.orig 2000-07-03 16:32:03.000000000 +0200 -+++ slang/slang-mc.h 2003-05-22 18:43:06.000000000 +0200 -@@ -25,6 +25,11 @@ - # endif - #endif /* __watcomc__ */ - -+#ifdef __NetBSD__ -+#undef unix -+#define unix 1 -+#endif -+ - #ifdef unix - # ifndef __unix__ - # define __unix__ 1 diff --git a/sysutils/mc/patches/patch-ak b/sysutils/mc/patches/patch-ak deleted file mode 100644 index 32056d41368..00000000000 --- a/sysutils/mc/patches/patch-ak +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2004/11/12 05:23:33 erh Exp $ - ---- src/subshell.c.orig 2004-11-12 05:03:13.000000000 +0000 -+++ src/subshell.c 2004-11-12 05:03:18.000000000 +0000 -@@ -63,7 +63,11 @@ - #endif - - #ifdef HAVE_GRANTPT -+# ifdef HAVE_STROPTS_H - # include /* For I_PUSH */ -+# else -+# include -+# endif - #else - # include /* For the group struct & getgrnam() */ - #endif -- cgit v1.2.3