Date: Thu, 22 May 1997 07:26:54 +0800 (CST) From: vanilla@Minje.Com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/3658: mc 3.5.39 Message-ID: <199705212326.HAA01202@Minje.Com.TW> Resent-Message-ID: <199705212330.QAA14561@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 3658
>Category: ports
>Synopsis: midnight command devel version ports
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: support
>Submitter-Id: current-users
>Arrival-Date: Wed May 21 16:30:00 PDT 1997
>Last-Modified:
>Originator: Vanill Ice
>Organization:
Cray running FreeBSD
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
FreeBSD 3.0-current
>Description:
Midnight Command devel version(3.5.39) ports
I forgot to check MASTER_SITES too. 8)
here is fix..
>How-To-Repeat:
>Fix:
diff -bcrNp mc-3.2.1/Makefile mc/Makefile
*** mc-3.2.1/Makefile Sat Apr 5 22:56:49 1997
--- mc/Makefile Thu May 22 07:21:40 1997
***************
*** 1,24 ****
# New ports collection makefile for: mc
! # Version required: 3.2.1
! # Date created: 15 Jul 1995
! # Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.9 1996/11/18 10:25:14 asami Exp $
#
! DISTNAME= mc-3.2.1
CATEGORIES= misc
! MASTER_SITES= ${MASTER_SITE_GNU}
! MAINTAINER= torstenb@FreeBSD.ORG
GNU_CONFIGURE= YES
! CONFIGURE_ARGS= --with-ncurses
STRIP=
! MAN1= mc.1
MAN8= mcserv.8
post-install:
! @/usr/bin/strip ${PREFIX}/bin/mc ${PREFIX}/sbin/mcserv
.include <bsd.port.mk>
--- 1,25 ----
# New ports collection makefile for: mc
! # Version required: 3.5.39
! # Date created: 22 May 1997
! # Whom: vanilla@MinJe.Com.TW
#
# $Id: Makefile,v 1.9 1996/11/18 10:25:14 asami Exp $
#
! DISTNAME= mc-3.5.39
CATEGORIES= misc
! MASTER_SITES= ${MASTER_SITE_SUNSITE}
! MASTER_SITE_SUBDIR= utils/file/managers/mc/devel
! MAINTAINER= vanilla@MinJe.Com.TW
GNU_CONFIGURE= YES
! CONFIGURE_ARGS= --with-ncurses --without-subshell
STRIP=
! MAN1= mc.1 mcedit.1
MAN8= mcserv.8
post-install:
! @/usr/bin/strip ${PREFIX}/bin/mc ${PREFIX}/bin/mcedit ${PREFIX}/bin/mcmfmt ${PREFIX}/sbin/mcserv
.include <bsd.port.mk>
diff -bcrNp mc-3.2.1/files/md5 mc/files/md5
*** mc-3.2.1/files/md5 Sat Apr 5 22:56:49 1997
--- mc/files/md5 Thu May 22 01:05:41 1997
***************
*** 1 ****
! MD5 (mc-3.2.1.tar.gz) = c8591a48e65f72debfcda495b4cb5576
--- 1 ----
! MD5 (mc-3.5.39.tar.gz) = c615e2e2e9263f1eb7ca119ee59eb4cd
diff -bcrNp mc-3.2.1/patches/patch-aa mc/patches/patch-aa
*** mc-3.2.1/patches/patch-aa Sat Apr 5 22:56:49 1997
--- mc/patches/patch-aa Fri Apr 25 02:40:40 1997
***************
*** 1,7 ****
! *** configure.orig Mon Sep 18 21:27:59 1995
! --- configure Mon Sep 18 21:29:01 1995
! ***************
! *** 4828,4834 ****
then
search_ncurses=true
else
--- 1,59 ----
! *** configure.orig Fri Apr 25 02:37:22 1997
! --- configure Fri Apr 25 02:40:28 1997
! *************** fi
! *** 709,717 ****
!
! echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
! if test $ac_cv_prog_gcc_g = yes; then
! ! CFLAGS="-g -O"
! else
! ! CFLAGS="-O"
! fi
! fi
! else
! --- 709,717 ----
!
! echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
! if test $ac_cv_prog_gcc_g = yes; then
! ! CFLAGS="-O2 -m486 -pipe"
! else
! ! CFLAGS="-O2 -m486 -pipe"
! fi
! fi
! else
! *************** if test "x$CCOPTS" = x; then
! *** 1401,1414 ****
! CCOPTS='-O2 -fno-strength-reduce'
! if test x$use_cc_g_flag = xyes; then
! if test $cc_uses_g = yes; then
! ! CCOPTS='-g -O'
! fi
! fi
! else
! CCOPTS='-O'
! if test x$use_cc_g_flag = xyes; then
! if test $cc_uses_g = yes; then
! ! CCOPTS='-g -O'
! fi
! fi
! fi
! --- 1401,1414 ----
! CCOPTS='-O2 -fno-strength-reduce'
! if test x$use_cc_g_flag = xyes; then
! if test $cc_uses_g = yes; then
! ! CCOPTS='-O2 -m486 -pipe'
! fi
! fi
! else
! CCOPTS='-O'
! if test x$use_cc_g_flag = xyes; then
! if test $cc_uses_g = yes; then
! ! CCOPTS='-O2 -m486 -pipe'
! fi
! fi
! fi
! *************** if test "${with_ncurses+set}" = set; the
! *** 5359,5365 ****
then
search_ncurses=true
else
***************
*** 9,15 ****
CPPFLAGS="$CPPFLAGS -I$withval/include"
search_ncurses=false
screen_manager="ncurses"
! --- 4828,4834 ----
then
search_ncurses=true
else
--- 61,67 ----
CPPFLAGS="$CPPFLAGS -I$withval/include"
search_ncurses=false
screen_manager="ncurses"
! --- 5359,5365 ----
then
search_ncurses=true
else
***************
*** 17,24 ****
CPPFLAGS="$CPPFLAGS -I$withval/include"
search_ncurses=false
screen_manager="ncurses"
! ***************
! *** 5661,5667 ****
if test -f /usr/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
--- 69,76 ----
CPPFLAGS="$CPPFLAGS -I$withval/include"
search_ncurses=false
screen_manager="ncurses"
! *************** then
! *** 6320,6326 ****
if test -f /usr/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
***************
*** 26,32 ****
CPPFLAGS="$CPPFLAGS "
search_ncurses=false
screen_manager="ncurses on /usr/include"
! --- 5661,5667 ----
if test -f /usr/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
--- 78,84 ----
CPPFLAGS="$CPPFLAGS "
search_ncurses=false
screen_manager="ncurses on /usr/include"
! --- 6320,6326 ----
if test -f /usr/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
***************
*** 34,41 ****
CPPFLAGS="$CPPFLAGS "
search_ncurses=false
screen_manager="ncurses on /usr/include"
! ***************
! *** 5678,5684 ****
if test -f /usr/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
--- 86,93 ----
CPPFLAGS="$CPPFLAGS "
search_ncurses=false
screen_manager="ncurses on /usr/include"
! *************** EOF
! *** 6337,6343 ****
if test -f /usr/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
***************
*** 43,49 ****
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/include/ncurses"
! --- 5678,5684 ----
if test -f /usr/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
--- 95,101 ----
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/include/ncurses"
! --- 6337,6343 ----
if test -f /usr/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
***************
*** 51,58 ****
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/include/ncurses"
! ***************
! *** 5695,5701 ****
if test -f /usr/local/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
--- 103,110 ----
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/include/ncurses"
! *************** EOF
! *** 6354,6360 ****
if test -f /usr/local/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
***************
*** 60,66 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
search_ncurses=false
screen_manager="ncurses on /usr/local"
! --- 5695,5701 ----
if test -f /usr/local/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
--- 112,118 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
search_ncurses=false
screen_manager="ncurses on /usr/local"
! --- 6354,6360 ----
if test -f /usr/local/include/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
***************
*** 68,75 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
search_ncurses=false
screen_manager="ncurses on /usr/local"
! ***************
! *** 5712,5718 ****
if test -f /usr/local/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
--- 120,127 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include"
search_ncurses=false
screen_manager="ncurses on /usr/local"
! *************** EOF
! *** 6371,6377 ****
if test -f /usr/local/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
***************
*** 77,83 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/local/include/ncurses"
! --- 5712,5718 ----
if test -f /usr/local/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
--- 129,135 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/local/include/ncurses"
! --- 6371,6377 ----
if test -f /usr/local/include/ncurses/ncurses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
***************
*** 85,92 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/local/include/ncurses"
! ***************
! *** 5730,5736 ****
if test -f /usr/local/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
--- 137,144 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
search_ncurses=false
screen_manager="ncurses on /usr/local/include/ncurses"
! *************** EOF
! *** 6389,6395 ****
if test -f /usr/local/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
***************
*** 94,100 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/local/.../ncurses"
! --- 5730,5736 ----
if test -f /usr/local/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
--- 146,152 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/local/.../ncurses"
! --- 6389,6395 ----
if test -f /usr/local/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
***************
*** 102,109 ****
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/local/.../ncurses"
! ***************
! *** 5748,5754 ****
if test -f /usr/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
--- 154,161 ----
CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/local/.../ncurses"
! *************** EOF
! *** 6407,6413 ****
if test -f /usr/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
***************
*** 111,117 ****
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/include/ncurses"
! --- 5748,5754 ----
if test -f /usr/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
--- 163,169 ----
CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
search_ncurses=false
screen_manager="renamed ncurses on /usr/include/ncurses"
! --- 6407,6413 ----
if test -f /usr/include/ncurses/curses.h
then
echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
diff -bcrNp mc-3.2.1/patches/patch-ab mc/patches/patch-ab
*** mc-3.2.1/patches/patch-ab Sat Apr 5 22:56:49 1997
--- mc/patches/patch-ab Tue Apr 1 03:16:19 1997
***************
*** 1,17 ****
! *** vfs/Makefile.in.orig Wed Sep 27 20:07:56 1995
! --- vfs/Makefile.in Wed Sep 27 20:08:28 1995
! ***************
! *** 75,81 ****
! install:
if test x@mcserv@ != x; then \
! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
fi
install.extfs:
! --- 75,81 ----
! install:
if test x@mcserv@ != x; then \
! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
fi
--- 1,17 ----
! *** vfs/Makefile.in.orig Fri Mar 21 02:07:58 1997
! --- vfs/Makefile.in Tue Apr 1 03:16:11 1997
! *************** distclean:
! *** 78,84 ****
! install: mcserv install.extfs
if test x@mcserv@ != x; then \
! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
fi
install.extfs:
! --- 78,84 ----
! install: mcserv install.extfs
if test x@mcserv@ != x; then \
! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
fi
diff -bcrNp mc-3.2.1/patches/patch-ac mc/patches/patch-ac
*** mc-3.2.1/patches/patch-ac Sat Apr 5 22:56:49 1997
--- mc/patches/patch-ac Tue Apr 1 03:17:43 1997
***************
*** 1,6 ****
! *** Make.common.in.orig Wed Sep 27 20:09:34 1995
! --- Make.common.in Wed Sep 27 20:10:42 1995
! ***************
*** 14,19 ****
--- 14,20 ----
binprefix =
--- 1,6 ----
! *** Make.common.in.orig Tue Apr 1 03:16:38 1997
! --- Make.common.in Tue Apr 1 03:17:27 1997
! *************** exec_prefix = $(prefix)
*** 14,19 ****
--- 14,20 ----
binprefix =
***************
*** 10,17 ****
libdir = $(exec_prefix)/lib/mc
suppbindir = $(libdir)/bin
tidir = $(libdir)/term
! ***************
! *** 42,48 ****
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
--- 10,17 ----
libdir = $(exec_prefix)/lib/mc
suppbindir = $(libdir)/bin
tidir = $(libdir)/term
! *************** AWK = @AWK@
! *** 45,51 ****
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
***************
*** 19,25 ****
XLDFLAGS = @LDFLAGS@
XDEFS = @DEFS@
XLIBS = @LIBS@
! --- 43,49 ----
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
--- 19,25 ----
XLDFLAGS = @LDFLAGS@
XDEFS = @DEFS@
XLIBS = @LIBS@
! --- 46,52 ----
# No way, to make make happy (except GNU), we cannot use := to append
# something to these, so that's why there is a leading _
XCFLAGS = @CFLAGS@
diff -bcrNp mc-3.2.1/patches/patch-ad mc/patches/patch-ad
*** mc-3.2.1/patches/patch-ad Sat Apr 5 22:56:49 1997
--- mc/patches/patch-ad Thu May 22 06:12:44 1997
***************
*** 1,5 ****
! *** vfs/local.c.orig Fri May 17 10:34:04 1996
! --- vfs/local.c Mon Oct 21 03:40:28 1996
***************
*** 1,7 ****
#include <config.h>
--- 1,5 ----
! *** vfs/local.c.orig Tue Apr 1 03:18:52 1997
! --- vfs/local.c Tue Apr 1 03:19:07 1997
***************
*** 1,7 ****
#include <config.h>
***************
*** 17,24 ****
#include <unistd.h>
#include <stdio.h>
#include <string.h>
! *** vfs/vfs.c.orig Fri May 17 10:34:04 1996
! --- vfs/vfs.c Mon Oct 21 03:42:34 1996
***************
*** 25,31 ****
#include <string.h>
--- 17,24 ----
#include <unistd.h>
#include <stdio.h>
#include <string.h>
! *** vfs/vfs.c.orig Tue Apr 1 03:19:15 1997
! --- vfs/vfs.c Tue Apr 1 03:19:30 1997
***************
*** 25,31 ****
#include <string.h>
***************
*** 36,43 ****
#include <fcntl.h>
#include <signal.h>
#include <time.h>
! *** vfs/tcputil.c.orig Fri May 17 10:34:05 1996
! --- vfs/tcputil.c Mon Oct 21 03:44:37 1996
***************
*** 28,34 ****
#include <sys/socket.h>
--- 36,43 ----
#include <fcntl.h>
#include <signal.h>
#include <time.h>
! *** vfs/tcputil.c.orig Tue Apr 1 03:20:13 1997
! --- vfs/tcputil.c Tue Apr 1 03:20:29 1997
***************
*** 28,34 ****
#include <sys/socket.h>
***************
*** 55,62 ****
#ifdef HAVE_PMAP_SET
#include <rpc/rpc.h>
! *** vfs/utilvfs.c.orig Fri May 17 10:34:06 1996
! --- vfs/utilvfs.c Mon Oct 21 03:46:32 1996
***************
*** 29,35 ****
#include <sys/socket.h>
--- 55,62 ----
#ifdef HAVE_PMAP_SET
#include <rpc/rpc.h>
! *** vfs/utilvfs.c.orig Tue Apr 1 03:20:41 1997
! --- vfs/utilvfs.c Tue Apr 1 03:20:57 1997
***************
*** 29,35 ****
#include <sys/socket.h>
***************
*** 74,81 ****
#ifdef USE_TERMNET
#include <termnet.h>
#endif
! *** src/key.c.orig Fri May 17 10:34:28 1996
! --- src/key.c Mon Oct 21 03:48:57 1996
***************
*** 35,41 ****
#include "tty.h"
--- 74,81 ----
#ifdef USE_TERMNET
#include <termnet.h>
#endif
! *** src/key.c.orig Tue Apr 1 03:21:39 1997
! --- src/key.c Tue Apr 1 03:21:56 1997
***************
*** 35,41 ****
#include "tty.h"
***************
*** 93,100 ****
#include "util.h" /* For xmalloc prototype */
#include "mad.h" /* The memory debugger */
#include "global.h"
! *** src/menu.c.orig Fri May 17 10:34:28 1996
! --- src/menu.c Mon Oct 21 03:50:24 1996
***************
*** 21,27 ****
#include <stdarg.h>
--- 93,100 ----
#include "util.h" /* For xmalloc prototype */
#include "mad.h" /* The memory debugger */
#include "global.h"
! *** src/menu.c.orig Tue Apr 1 03:22:04 1997
! --- src/menu.c Tue Apr 1 03:22:17 1997
***************
*** 21,27 ****
#include <stdarg.h>
***************
*** 112,121 ****
#include "mad.h"
#include "util.h"
#include "menu.h"
! *** src/file.c.orig Fri May 17 10:34:28 1996
! --- src/file.c Mon Oct 21 03:52:00 1996
***************
! *** 45,51 ****
#include <errno.h>
#include "tty.h"
#include <ctype.h>
--- 112,121 ----
#include "mad.h"
#include "util.h"
#include "menu.h"
! *** src/file.c.orig Tue Apr 1 03:22:23 1997
! --- src/file.c Tue Apr 1 03:22:37 1997
***************
! *** 62,68 ****
#include <errno.h>
#include "tty.h"
#include <ctype.h>
***************
*** 123,129 ****
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! --- 45,51 ----
#include <errno.h>
#include "tty.h"
#include <ctype.h>
--- 123,129 ----
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! --- 62,68 ----
#include <errno.h>
#include "tty.h"
#include <ctype.h>
***************
*** 131,138 ****
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! *** src/help.c.orig Fri May 17 10:34:29 1996
! --- src/help.c Mon Oct 21 03:53:56 1996
***************
*** 41,47 ****
#include <stdio.h>
--- 131,138 ----
#include <string.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! *** src/help.c.orig Tue Apr 1 03:23:20 1997
! --- src/help.c Tue Apr 1 03:23:33 1997
***************
*** 41,47 ****
#include <stdio.h>
***************
*** 150,178 ****
#include <errno.h>
#include "mad.h"
#include "color.h"
! *** src/find.c.orig Fri May 17 10:34:29 1996
! --- src/find.c Mon Oct 21 03:55:16 1996
***************
! *** 22,28 ****
! #include "tty.h"
! #include <string.h>
! #include <stdio.h>
! #include <malloc.h> /* For free() */
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! --- 22,28 ----
! #include "tty.h"
! #include <string.h>
! #include <stdio.h>
! #include <stdlib.h> /* For free() */
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! *** src/view.c.orig Fri May 17 10:34:30 1996
! --- src/view.c Mon Oct 21 03:57:10 1996
***************
! *** 38,44 ****
#include <unistd.h>
#include <ctype.h> /* For toupper() */
#include <stdlib.h> /* atoi() */
--- 150,178 ----
#include <errno.h>
#include "mad.h"
#include "color.h"
! *** src/find.c.orig Tue Apr 1 03:23:38 1997
! --- src/find.c Tue Apr 1 03:23:50 1997
***************
! *** 27,33 ****
! # include <direct.h>
! #endif
!
! #include <malloc.h> /* For free() */
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! --- 27,33 ----
! # include <direct.h>
! #endif
!
! #include <stdlib.h> /* For free() */
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
! *** src/view.c.orig Tue Apr 1 03:23:57 1997
! --- src/view.c Tue Apr 1 03:24:14 1997
***************
! *** 39,45 ****
#include <unistd.h>
#include <ctype.h> /* For toupper() */
#include <stdlib.h> /* atoi() */
***************
*** 180,186 ****
#include <errno.h>
#include <limits.h>
#include <sys/param.h>
! --- 38,44 ----
#include <unistd.h>
#include <ctype.h> /* For toupper() */
#include <stdlib.h> /* atoi() */
--- 180,186 ----
#include <errno.h>
#include <limits.h>
#include <sys/param.h>
! --- 39,45 ----
#include <unistd.h>
#include <ctype.h> /* For toupper() */
#include <stdlib.h> /* atoi() */
***************
*** 188,195 ****
#include <errno.h>
#include <limits.h>
#include <sys/param.h>
! *** src/ext.c.orig Fri May 17 10:34:30 1996
! --- src/ext.c Mon Oct 21 03:58:37 1996
***************
*** 25,31 ****
#include <unistd.h>
--- 188,195 ----
#include <errno.h>
#include <limits.h>
#include <sys/param.h>
! *** src/ext.c.orig Tue Apr 1 03:24:20 1997
! --- src/ext.c Tue Apr 1 03:24:32 1997
***************
*** 25,31 ****
#include <unistd.h>
***************
*** 207,236 ****
#include <string.h>
#include <errno.h>
#include "mad.h"
! *** src/mouse.c.orig Fri May 17 10:34:30 1996
! --- src/mouse.c Mon Oct 21 03:59:56 1996
***************
! *** 28,34 ****
! #include <signal.h> /* For kill() and SIGQUIT */
! #include <fcntl.h>
! #include <termios.h>
! #include <malloc.h>
#include <stdio.h>
#include "mad.h"
! --- 28,34 ----
! #include <signal.h> /* For kill() and SIGQUIT */
! #include <fcntl.h>
! #include <termios.h>
! #include <stdlib.h>
#include <stdio.h>
#include "mad.h"
! *** src/dlg.c.orig Fri May 17 10:34:31 1996
! --- src/dlg.c Mon Oct 21 04:01:01 1996
***************
*** 20,26 ****
! /* "$Id: patch-ad,v 1.1 1996/10/20 19:20:44 max Exp $" */
#include <string.h>
#include <stdio.h>
! #include <malloc.h>
--- 207,236 ----
#include <string.h>
#include <errno.h>
#include "mad.h"
! *** src/mouse.c.orig Tue Apr 1 03:25:38 1997
! --- src/mouse.c Tue Apr 1 03:25:52 1997
***************
! *** 30,36 ****
! #if (!defined(__IBMC__) && !defined(__IBMCPP__))
! # include <termios.h>
! #endif
! #include <malloc.h>
#include <stdio.h>
#include "mad.h"
! --- 30,36 ----
! #if (!defined(__IBMC__) && !defined(__IBMCPP__))
! # include <termios.h>
! #endif
! #include <stdlib.h>
#include <stdio.h>
#include "mad.h"
! *** src/dlg.c.orig Tue Apr 1 03:25:59 1997
! --- src/dlg.c Tue Apr 1 03:26:13 1997
***************
*** 20,26 ****
! /* "$Id: dlg.c,v 1.3 1995/02/21 19:05:40 miguel Exp $" */
#include <string.h>
#include <stdio.h>
! #include <malloc.h>
***************
*** 238,254 ****
#include <stdarg.h>
#include "mad.h"
--- 20,26 ----
! /* "$Id: patch-ad,v 1.1 1996/10/20 19:20:44 max Exp $" */
#include <string.h>
#include <stdio.h>
! #include <stdlib.h>
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! *** src/widget.c.orig Fri May 17 10:34:32 1996
! --- src/widget.c Mon Oct 21 04:03:13 1996
***************
! *** 26,32 ****
#include <config.h>
#include <string.h>
#include <stdio.h>
--- 238,254 ----
#include <stdarg.h>
#include "mad.h"
--- 20,26 ----
! /* "$Id: dlg.c,v 1.3 1995/02/21 19:05:40 miguel Exp $" */
#include <string.h>
#include <stdio.h>
! #include <stdlib.h>
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! *** src/widget.c.orig Tue Apr 1 03:26:22 1997
! --- src/widget.c Tue Apr 1 03:26:32 1997
***************
! *** 27,33 ****
#include <config.h>
#include <string.h>
#include <stdio.h>
***************
*** 256,262 ****
#include "tty.h"
#include <ctype.h>
#include "mad.h"
! --- 26,32 ----
#include <config.h>
#include <string.h>
#include <stdio.h>
--- 256,262 ----
#include "tty.h"
#include <ctype.h>
#include "mad.h"
! --- 27,33 ----
#include <config.h>
#include <string.h>
#include <stdio.h>
***************
*** 264,273 ****
#include "tty.h"
#include <ctype.h>
#include "mad.h"
! *** src/wtools.c.orig Fri May 17 10:34:33 1996
! --- src/wtools.c Mon Oct 21 04:04:23 1996
***************
! *** 33,39 ****
#include <config.h>
#include <string.h>
#include <stdio.h>
--- 264,273 ----
#include "tty.h"
#include <ctype.h>
#include "mad.h"
! *** src/wtools.c.orig Tue Apr 1 03:26:42 1997
! --- src/wtools.c Tue Apr 1 03:27:01 1997
***************
! *** 34,40 ****
#include <config.h>
#include <string.h>
#include <stdio.h>
***************
*** 275,281 ****
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! --- 33,39 ----
#include <config.h>
#include <string.h>
#include <stdio.h>
--- 275,281 ----
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! --- 34,40 ----
#include <config.h>
#include <string.h>
#include <stdio.h>
***************
*** 283,290 ****
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! *** src/info.c.orig Fri May 17 10:34:31 1996
! --- src/info.c Mon Oct 21 04:05:30 1996
***************
*** 21,27 ****
#include <sys/types.h>
--- 283,290 ----
#include "tty.h"
#include <stdarg.h>
#include "mad.h"
! *** src/info.c.orig Tue Apr 1 03:27:57 1997
! --- src/info.c Tue Apr 1 03:28:08 1997
***************
*** 21,27 ****
#include <sys/types.h>
***************
*** 302,328 ****
#include "mad.h"
#include "util.h" /* statfs calls */
#include "mouse.h" /* Gpm_Event */
! *** src/boxes.c.orig Fri May 17 10:34:34 1996
! --- src/boxes.c Mon Oct 21 04:06:38 1996
***************
*** 26,32 ****
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
! #include <malloc.h>
#include "global.h"
#include "mad.h" /* The great mad */
- #include "util.h" /* Required by panel.h */
--- 26,32 ----
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
! #include <stdlib.h>
#include "global.h"
#include "mad.h" /* The great mad */
! #include "util.h" /* Required by panel.h */
! *** src/complete.c.orig Fri May 17 10:34:36 1996
! --- src/complete.c Mon Oct 21 04:09:12 1996
***************
*** 24,30 ****
#include <stdio.h>
--- 302,328 ----
#include "mad.h"
#include "util.h" /* statfs calls */
#include "mouse.h" /* Gpm_Event */
! *** src/boxes.c.orig Tue Apr 1 03:28:16 1997
! --- src/boxes.c Tue Apr 1 03:28:32 1997
***************
*** 26,32 ****
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
! #include <malloc.h>
+ #include <signal.h>
#include "global.h"
#include "mad.h" /* The great mad */
--- 26,32 ----
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/param.h>
! #include <stdlib.h>
+ #include <signal.h>
#include "global.h"
#include "mad.h" /* The great mad */
! *** src/complete.c.orig Tue Apr 1 03:28:42 1997
! --- src/complete.c Tue Apr 1 03:28:59 1997
***************
*** 24,30 ****
#include <stdio.h>
***************
*** 340,347 ****
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
! *** src/command.c.orig Fri May 17 10:34:36 1996
! --- src/command.c Mon Oct 21 04:10:51 1996
***************
*** 25,31 ****
#include <errno.h>
--- 340,347 ----
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
! *** src/command.c.orig Tue Apr 1 03:29:06 1997
! --- src/command.c Tue Apr 1 03:29:19 1997
***************
*** 25,31 ****
#include <errno.h>
***************
*** 359,366 ****
#include <string.h>
#include <stdlib.h>
#include "mad.h"
! *** src/cmd.c.orig Fri May 17 10:34:37 1996
! --- src/cmd.c Mon Oct 21 04:12:00 1996
***************
*** 29,35 ****
#include <sys/param.h>
--- 359,366 ----
#include <string.h>
#include <stdlib.h>
#include "mad.h"
! *** src/cmd.c.orig Tue Apr 1 03:29:29 1997
! --- src/cmd.c Tue Apr 1 03:29:41 1997
***************
*** 29,35 ****
#include <sys/param.h>
diff -bcrNp mc-3.2.1/patches/patch-ae mc/patches/patch-ae
*** mc-3.2.1/patches/patch-ae Sat Apr 5 22:56:49 1997
--- mc/patches/patch-ae Tue Apr 1 03:18:28 1997
***************
*** 1,5 ****
! *** mcfn_install.in.orig Fri May 17 10:34:03 1996
! --- mcfn_install.in Mon Oct 21 04:16:14 1996
***************
*** 1,4 ****
! #/bin/sh
--- 1,5 ----
! *** mcfn_install.in.orig Tue Apr 1 03:18:00 1997
! --- mcfn_install.in Tue Apr 1 03:18:07 1997
***************
*** 1,4 ****
! #/bin/sh
diff -bcrNp mc-3.2.1/patches/patch-af mc/patches/patch-af
*** mc-3.2.1/patches/patch-af Thu Jan 1 08:00:00 1970
--- mc/patches/patch-af Thu May 22 06:24:00 1997
***************
*** 0 ****
--- 1,36 ----
+ *** src/main.c.orig Thu May 22 06:19:22 1997
+ --- src/main.c Sat May 17 08:02:42 1997
+ *************** static void handle_args (int argc, char
+ *** 2411,2417 ****
+ SLtt_try_termcap = 1;
+ #endif
+
+ ! while ((c = getopt (argc, argv, "VbsdPcfC:hmxtuUe:v:l:NXB")) != -1) {
+ switch (c) {
+ case 'V':
+ version (1);
+ --- 2411,2417 ----
+ SLtt_try_termcap = 1;
+ #endif
+
+ ! while ((c = getopt (argc, argv, "VbsdPcfC:hmxtuUe:v:l:NXB" ARCH_FLAGS)) != -1) {
+ switch (c) {
+ case 'V':
+ version (1);
+ *************** static void handle_args (int argc, char
+ *** 2520,2526 ****
+ version (0);
+ fprintf (stderr,
+ "The Midnight Commander " VERSION "\nUsage is:\n\n"
+ ! "mc [-bCcdfhlmNPstuUVvx?""] [other_panel_dir] [this-dir]\n"
+ "-b Force black and white\n"
+ "-C <keyword>=<fore>,<back> Color usage keywords:\n"
+ " normal, selected, marked, markselect, errors, reverse\n"
+ --- 2520,2526 ----
+ version (0);
+ fprintf (stderr,
+ "The Midnight Commander " VERSION "\nUsage is:\n\n"
+ ! "mc [-bCcdfhlmNPstuUVvx?" ARCH_FLAGS "] [other_panel_dir] [this-dir]\n"
+ "-b Force black and white\n"
+ "-C <keyword>=<fore>,<back> Color usage keywords:\n"
+ " normal, selected, marked, markselect, errors, reverse\n"
diff -bcrNp mc-3.2.1/pkg/PLIST mc/pkg/PLIST
*** mc-3.2.1/pkg/PLIST Sat Apr 5 22:56:50 1997
--- mc/pkg/PLIST Mon Apr 28 11:15:29 1997
***************
*** 1,13 ****
--- 1,20 ----
bin/mc
+ bin/mcmfmt
+ bin/mcedit
sbin/mcserv
lib/mc/FAQ
lib/mc/bin/mcfn_install
lib/mc/extfs/README
lib/mc/extfs/a
+ lib/mc/extfs/cpio
+ lib/mc/extfs/deb
lib/mc/extfs/extfs.ini
lib/mc/extfs/ftplist
+ lib/mc/extfs/lha
lib/mc/extfs/lslR
+ lib/mc/extfs/rar
lib/mc/extfs/rpm
+ lib/mc/extfs/zip
lib/mc/extfs/zoo
lib/mc/mc.ext
lib/mc/mc.hint
*************** lib/mc/term/xterm.ad
*** 23,26 ****
--- 30,34 ----
lib/mc/term/xterm.tcap
lib/mc/term/xterm.ti
man/man1/mc.1.gz
+ man/man1/mcedit.1.gz
man/man8/mcserv.8.gz
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199705212326.HAA01202>