Date: 21 Sep 1997 16:02:16 -0000 From: vanilla@MinJe.com.TW To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/4598: Update mc to 4.1 Message-ID: <19970921160216.1266.qmail@MinJe.com.TW> Resent-Message-ID: <199709211610.JAA05562@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4598
>Category: ports
>Synopsis: update mc to 4.1
>Confidential: yes
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 21 09:10:01 PDT 1997
>Last-Modified:
>Originator: Vanill I. Shu
>Organization:
Cray running FreeBSD
>Release: FreeBSD 3.0-CURRENT i386
>Environment:
>Description:
update mc to 4.0,
i change the patch file's type,
it make patch file seems small..
>How-To-Repeat:
>Fix:
diff -ruN mc.orig/Makefile mc/Makefile
--- mc.orig/Makefile Wed Jun 25 15:11:39 1997
+++ mc/Makefile Sun Sep 21 05:15:35 1997
@@ -1,12 +1,12 @@
# New ports collection makefile for: mc
-# Version required: 4.0
+# Version required: 4.1
# Date created: 15 Jul 1995
# Whom: torstenb@FreeBSD.ORG
#
# $Id: Makefile,v 1.12 1997/06/25 07:11:39 tg Exp $
#
-DISTNAME= mc-4.0
+DISTNAME= mc-4.1
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/file/managers/mc
diff -ruN mc.orig/files/md5 mc/files/md5
--- mc.orig/files/md5 Fri Jun 20 20:22:26 1997
+++ mc/files/md5 Sun Sep 21 05:15:27 1997
@@ -1 +1 @@
-MD5 (mc-4.0.tar.gz) = 1420c696eeff2678199144e38d0ee0aa
+MD5 (mc-4.1.tar.gz) = c779d89e1fdc3d24d1216fc812f0c4a9
diff -ruN mc.orig/patches/patch-aa mc/patches/patch-aa
--- mc.orig/patches/patch-aa Fri Jun 20 20:22:29 1997
+++ mc/patches/patch-aa Sun Sep 21 23:27:11 1997
@@ -1,148 +1,82 @@
-*** configure.orig Tue Jun 17 09:51:22 1997
---- configure Fri Jun 20 00:03:50 1997
-*************** if test "x$CCOPTS" = x; then
-*** 1382,1388 ****
- CCOPTS='-O'
- if test x$use_cc_g_flag = xyes; then
- if test $cc_uses_g = yes; then
-! CCOPTS='-g -O'
- fi
- fi
- fi
---- 1382,1388 ----
- 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
-*************** ac_configure=$ac_aux_dir/configure # Thi
-*** 1437,1442 ****
---- 1437,1443 ----
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+ INSTALL="/usr/bin/install -c"
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-*************** if test "${with_ncurses+set}" = set; the
-*** 5411,5417 ****
- then
- search_ncurses=true
- else
-! LIBS="$LIBS -L$withval/lib -lncurses"
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- search_ncurses=false
- screen_manager="ncurses"
---- 5412,5418 ----
- then
- search_ncurses=true
- else
-! LIBS="$LIBS -L$withval/lib -lncurses -lmytinfo"
- CPPFLAGS="$CPPFLAGS -I$withval/include"
- search_ncurses=false
- screen_manager="ncurses"
-*************** then
-*** 6372,6378 ****
- if test -f /usr/include/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses"
- CPPFLAGS="$CPPFLAGS "
- search_ncurses=false
- screen_manager="ncurses on /usr/include"
---- 6373,6379 ----
- if test -f /usr/include/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo"
- CPPFLAGS="$CPPFLAGS "
- search_ncurses=false
- screen_manager="ncurses on /usr/include"
-*************** EOF
-*** 6389,6395 ****
- if test -f /usr/include/ncurses/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses"
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
- search_ncurses=false
- screen_manager="ncurses on /usr/include/ncurses"
---- 6390,6396 ----
- if test -f /usr/include/ncurses/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo"
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
- search_ncurses=false
- screen_manager="ncurses on /usr/include/ncurses"
-*************** EOF
-*** 6406,6412 ****
- if test -f /usr/local/include/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- search_ncurses=false
- screen_manager="ncurses on /usr/local"
---- 6407,6413 ----
- if test -f /usr/local/include/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- search_ncurses=false
- screen_manager="ncurses on /usr/local"
-*************** EOF
-*** 6423,6429 ****
- if test -f /usr/local/include/ncurses/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -L/usr/local/lib -L/usr/local/lib/ncurses"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
- search_ncurses=false
- screen_manager="ncurses on /usr/local/include/ncurses"
---- 6424,6430 ----
- if test -f /usr/local/include/ncurses/ncurses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib -L/usr/local/lib/ncurses"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
- search_ncurses=false
- screen_manager="ncurses on /usr/local/include/ncurses"
-*************** EOF
-*** 6441,6447 ****
- if test -f /usr/local/include/ncurses/curses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
-! LIBS="$LIBS -lncurses -L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
- search_ncurses=false
- screen_manager="renamed ncurses on /usr/local/.../ncurses"
---- 6442,6448 ----
- if test -f /usr/local/include/ncurses/curses.h
- then
- echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
- CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
- search_ncurses=false
- screen_manager="renamed ncurses on /usr/local/.../ncurses"
-*************** EOF
-*** 6459,6465 ****
- if test -f /usr/include/ncurses/curses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
-! LIBS="$LIBS -lncurses"
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
- search_ncurses=false
- screen_manager="renamed ncurses on /usr/include/ncurses"
---- 6460,6466 ----
- if test -f /usr/include/ncurses/curses.h
- then
- echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
-! LIBS="$LIBS -lncurses -lmytinfo"
- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
- search_ncurses=false
- screen_manager="renamed ncurses on /usr/include/ncurses"
+--- configure.orig Sun Sep 21 23:23:04 1997
++++ configure Sun Sep 21 23:26:58 1997
+@@ -1426,7 +1426,7 @@
+ CCOPTS='-O'
+ if test x$use_cc_g_flag = xyes; then
+ if test $cc_uses_g = yes; then
+- CCOPTS='-g -O'
++ CCOPTS='-O2 -m486 -pipe'
+ fi
+ fi
+ fi
+@@ -1480,6 +1480,7 @@
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
++INSTALL="/usr/bin/install -c"
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -5818,7 +5819,7 @@
+ search_ncurses=true
+ else
+ LIBS="$LIBS -L$withval/lib -lncurses"
+- CPPFLAGS="$CPPFLAGS -I$withval/include"
++ CPPFLAGS="$CPPFLAGS -I$withval/include -lmytinfo"
+ search_ncurses=false
+ screen_manager="ncurses"
+ cat >> confdefs.h <<\EOF
+@@ -6954,7 +6955,7 @@
+ if test -f /usr/include/ncurses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
+- LIBS="$LIBS -lncurses"
++ LIBS="$LIBS -lncurses -lmytinfo"
+ CPPFLAGS="$CPPFLAGS "
+ search_ncurses=false
+ screen_manager="ncurses on /usr/include"
+@@ -6971,7 +6972,7 @@
+ if test -f /usr/include/ncurses/ncurses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/include/ncurses/ncurses.h" 1>&6
+- LIBS="$LIBS -lncurses"
++ LIBS="$LIBS -lncurses -lmytinfo"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+ search_ncurses=false
+ screen_manager="ncurses on /usr/include/ncurses"
+@@ -6988,7 +6989,7 @@
+ if test -f /usr/local/include/ncurses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/local/include/ncurses.h" 1>&6
+- LIBS="$LIBS -lncurses -L/usr/local/lib"
++ LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+ search_ncurses=false
+ screen_manager="ncurses on /usr/local"
+@@ -7005,7 +7006,7 @@
+ if test -f /usr/local/include/ncurses/ncurses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/local/include/ncurses/ncurses.h" 1>&6
+- LIBS="$LIBS -lncurses -L/usr/local/lib -L/usr/local/lib/ncurses"
++ LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib -L/usr/local/lib/ncurses"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
+ search_ncurses=false
+ screen_manager="ncurses on /usr/local/include/ncurses"
+@@ -7023,7 +7024,7 @@
+ if test -f /usr/local/include/ncurses/curses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/local/include/ncurses/curses.h" 1>&6
+- LIBS="$LIBS -lncurses -L/usr/local/lib"
++ LIBS="$LIBS -lncurses -lmytinfo -L/usr/local/lib"
+ CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
+ search_ncurses=false
+ screen_manager="renamed ncurses on /usr/local/.../ncurses"
+@@ -7041,7 +7042,7 @@
+ if test -f /usr/include/ncurses/curses.h
+ then
+ echo "$ac_t""Found ncurses on /usr/include/ncurses/curses.h" 1>&6
+- LIBS="$LIBS -lncurses"
++ LIBS="$LIBS -lncurses -lmytinfo"
+ CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses -DRENAMED_NCURSES"
+ search_ncurses=false
+ screen_manager="renamed ncurses on /usr/include/ncurses"
diff -ruN mc.orig/patches/patch-ab mc/patches/patch-ab
--- mc.orig/patches/patch-ab Fri Jun 20 20:22:30 1997
+++ mc/patches/patch-ab Sun Sep 21 23:29:32 1997
@@ -1,51 +1,37 @@
-*** vfs/Makefile.in.orig Tue Jun 17 09:51:24 1997
---- vfs/Makefile.in Fri Jun 20 00:17:24 1997
-*************** distclean:
-*** 91,113 ****
-
- install: mcserv install.extfs
- if test x@mcserv@ != x; then \
-! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
- fi
-
- install.extfs:
- $(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
- $(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
-
-! $(INSTALL_PROGRAM) extfs/a $(DESTDIR)$(libdir)/extfs/a
-! $(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
-! $(INSTALL_PROGRAM) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
-! $(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-! $(INSTALL_PROGRAM) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-! $(INSTALL_PROGRAM) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-! $(INSTALL_PROGRAM) extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
-! $(INSTALL_PROGRAM) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-! $(INSTALL_PROGRAM) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-! $(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
-
- uninstall:
- -$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
---- 91,113 ----
-
- install: mcserv install.extfs
- if test x@mcserv@ != x; then \
-! $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
- fi
-
- install.extfs:
- $(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
- $(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
-
-! $(INSTALL_DATA) extfs/a $(DESTDIR)$(libdir)/extfs/a
-! $(INSTALL_DATA) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
-! $(INSTALL_DATA) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
-! $(INSTALL_DATA) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
-! $(INSTALL_DATA) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
-! $(INSTALL_DATA) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
-! $(INSTALL_DATA) extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
-! $(INSTALL_DATA) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
-! $(INSTALL_DATA) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
-! $(INSTALL_DATA) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
-
- uninstall:
- -$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
+--- vfs/Makefile.in.orig Sun Sep 21 23:28:07 1997
++++ vfs/Makefile.in Sun Sep 21 23:29:15 1997
+@@ -91,23 +91,23 @@
+
+ install: mcserv install.extfs
+ if test x@mcserv@ != x; then \
+- $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(bindir)/$(binprefix)mcserv; \
++ $(INSTALL_PROGRAM) mcserv $(DESTDIR)$(sbindir)/$(binprefix)mcserv; \
+ fi
+
+ install.extfs:
+ $(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README
+ $(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
+- $(INSTALL_PROGRAM) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
+- $(INSTALL_PROGRAM) $(srcdir)/extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
++ $(INSTALL_DATA) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
++ $(INSTALL_DATA) $(srcdir)/extfs/rpm $(DESTDIR)$(libdir)/extfs/rpm
+
+- $(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
+- $(INSTALL_PROGRAM) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
+- $(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
+- $(INSTALL_PROGRAM) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
+- $(INSTALL_PROGRAM) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
+- $(INSTALL_PROGRAM) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
+- $(INSTALL_PROGRAM) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
+- $(INSTALL_PROGRAM) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
++ $(INSTALL_DATA) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
++ $(INSTALL_DATA) extfs/deb $(DESTDIR)$(libdir)/extfs/deb
++ $(INSTALL_DATA) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
++ $(INSTALL_DATA) extfs/lslR $(DESTDIR)$(libdir)/extfs/lslR
++ $(INSTALL_DATA) extfs/lha $(DESTDIR)$(libdir)/extfs/lha
++ $(INSTALL_DATA) extfs/rar $(DESTDIR)$(libdir)/extfs/rar
++ $(INSTALL_DATA) extfs/zip $(DESTDIR)$(libdir)/extfs/zip
++ $(INSTALL_DATA) extfs/zoo $(DESTDIR)$(libdir)/extfs/zoo
+
+ uninstall:
+ -$(RMF) $(DESTDIR)$(libdir)/extfs/rpm
diff -ruN mc.orig/patches/patch-ac mc/patches/patch-ac
--- mc.orig/patches/patch-ac Fri Jun 20 20:22:31 1997
+++ mc/patches/patch-ac Sun Sep 21 23:30:47 1997
@@ -1,29 +1,19 @@
-*** Make.common.in.orig Thu Jun 19 23:14:51 1997
---- Make.common.in Thu Jun 19 23:16:28 1997
-*************** exec_prefix = $(prefix)
-*** 14,19 ****
---- 14,20 ----
- binprefix =
- manprefix =
- bindir = $(exec_prefix)/bin
-+ sbindir = $(exec_prefix)/sbin
- 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@
-! XCPPFLAGS = @CPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
- 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@
-! XCPPFLAGS = @CPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
- XLDFLAGS = @LDFLAGS@
- XDEFS = @DEFS@
- XLIBS = @LIBS@
+--- Make.common.in.orig Sun Sep 21 23:29:55 1997
++++ Make.common.in Sun Sep 21 23:30:34 1997
+@@ -14,6 +14,7 @@
+ binprefix =
+ manprefix =
+ bindir = $(exec_prefix)/bin
++sbindir = $(exec_prefix)/sbin
+ libdir = $(exec_prefix)/lib/mc
+ suppbindir = $(libdir)/bin
+ tidir = $(libdir)/term
+@@ -45,7 +46,7 @@
+ # 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@
+-XCPPFLAGS = @CPPFLAGS@ -I.. -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
++XCPPFLAGS = @CPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC)
+ XLDFLAGS = @LDFLAGS@
+ XDEFS = @DEFS@
+ XLIBS = @LIBS@
diff -ruN mc.orig/patches/patch-ad mc/patches/patch-ad
--- mc.orig/patches/patch-ad Fri Jun 20 20:22:32 1997
+++ mc/patches/patch-ad Sun Sep 21 23:55:34 1997
@@ -1,380 +1,231 @@
-*** vfs/local.c.orig Thu Jun 19 23:25:13 1997
---- vfs/local.c Thu Jun 19 23:25:53 1997
-***************
-*** 1,7 ****
- #include <config.h>
- #include <errno.h>
- #include <sys/types.h>
-! #include <malloc.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
---- 1,7 ----
- #include <config.h>
- #include <errno.h>
- #include <sys/types.h>
-! #include <stdlib.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
-*** vfs/vfs.c.orig Thu Jun 19 23:25:45 1997
---- vfs/vfs.c Thu Jun 19 23:27:37 1997
-***************
-*** 25,31 ****
- #include <string.h>
- #include <errno.h>
- #include <sys/types.h>
-! #include <malloc.h>
- #include <fcntl.h>
- #include <signal.h>
- #ifdef SCO_FLAVOR
---- 25,31 ----
- #include <string.h>
- #include <errno.h>
- #include <sys/types.h>
-! /* #include <malloc.h> */
- #include <fcntl.h>
- #include <signal.h>
- #ifdef SCO_FLAVOR
-*** vfs/tcputil.c.orig Thu Jun 19 23:25:27 1997
---- vfs/tcputil.c Thu Jun 19 23:26:31 1997
-***************
-*** 28,34 ****
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-! #include <malloc.h>
-
- #ifdef HAVE_PMAP_SET
- #include <rpc/rpc.h>
---- 28,34 ----
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-! /* #include <malloc.h> */
-
- #ifdef HAVE_PMAP_SET
- #include <rpc/rpc.h>
-*** vfs/utilvfs.c.orig Thu Jun 19 23:29:28 1997
---- vfs/utilvfs.c Thu Jun 19 23:27:22 1997
-***************
-*** 32,38 ****
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-! #include <malloc.h>
- #ifdef USE_TERMNET
- #include <termnet.h>
- #endif
---- 32,38 ----
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-! /* #include <malloc.h> */
- #ifdef USE_TERMNET
- #include <termnet.h>
- #endif
-*** src/key.c.orig Thu Jun 19 23:31:27 1997
---- src/key.c Thu Jun 19 23:36:48 1997
-***************
-*** 38,44 ****
- #include "tty.h"
- #include <ctype.h>
- #include <errno.h>
-! #include <malloc.h>
- #include "util.h" /* For xmalloc prototype */
- #include "mad.h" /* The memory debugger */
- #include "global.h"
---- 38,44 ----
- #include "tty.h"
- #include <ctype.h>
- #include <errno.h>
-! #include <stdlib.h>
- #include "util.h" /* For xmalloc prototype */
- #include "mad.h" /* The memory debugger */
- #include "global.h"
-*** src/menu.c.orig Thu Jun 19 23:31:33 1997
---- src/menu.c Thu Jun 19 23:37:01 1997
-***************
-*** 21,27 ****
- #include <stdarg.h>
- #include <sys/types.h>
- #include <ctype.h>
-! #include <malloc.h>
- #include "mad.h"
- #include "util.h"
- #include "menu.h"
---- 21,27 ----
- #include <stdarg.h>
- #include <sys/types.h>
- #include <ctype.h>
-! #include <stdlib.h>
- #include "mad.h"
- #include "util.h"
- #include "menu.h"
-*** src/file.c.orig Thu Jun 19 23:31:06 1997
---- src/file.c Thu Jun 19 23:35:43 1997
-***************
-*** 68,74 ****
- #include <errno.h>
- #include "tty.h"
- #include <ctype.h>
-! #include <malloc.h>
- #include <string.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
---- 68,74 ----
- #include <errno.h>
- #include "tty.h"
- #include <ctype.h>
-! #include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
-*** src/help.c.orig Thu Jun 19 23:31:18 1997
---- src/help.c Thu Jun 19 23:36:21 1997
-***************
-*** 41,47 ****
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-! #include <malloc.h>
- #include <errno.h>
- #include "mad.h"
- #include "color.h"
---- 41,47 ----
- #include <stdio.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-! #include <stdlib.h>
- #include <errno.h>
- #include "mad.h"
- #include "color.h"
-*** src/find.c.orig Thu Jun 19 23:31:11 1997
---- src/find.c Thu Jun 19 23:36:05 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 Thu Jun 19 23:31:42 1997
---- src/view.c Thu Jun 19 23:37:30 1997
-***************
-*** 42,48 ****
- #include <unistd.h>
- #include <ctype.h> /* For toupper() */
- #include <stdlib.h> /* atoi() */
-! #include <malloc.h>
- #include <errno.h>
- #include <limits.h>
- #include <sys/param.h>
---- 42,48 ----
- #include <unistd.h>
- #include <ctype.h> /* For toupper() */
- #include <stdlib.h> /* atoi() */
-! /* #include <malloc.h> */
- #include <errno.h>
- #include <limits.h>
- #include <sys/param.h>
-*** src/ext.c.orig Thu Jun 19 23:31:01 1997
---- src/ext.c Thu Jun 19 23:34:41 1997
-***************
-*** 29,35 ****
- #include <unistd.h>
- #endif
- #include <fcntl.h>
-! #include <malloc.h>
- #include <string.h>
- #include <errno.h>
- #include "mad.h"
---- 29,35 ----
- #include <unistd.h>
- #endif
- #include <fcntl.h>
-! #include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- #include "mad.h"
-*** src/mouse.c.orig Thu Jun 19 23:31:38 1997
---- src/mouse.c Thu Jun 19 23:37:14 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 Thu Jun 19 23:30:55 1997
---- src/dlg.c Thu Jun 19 23:34:19 1997
-***************
-*** 20,26 ****
- /* "$Id: patch-ad,v 1.2 1997/06/20 12:22:32 tg Exp $" */
- #include <string.h>
- #include <stdio.h>
-! #include <malloc.h>
- #include "tty.h"
- #include <stdarg.h>
- #include "mad.h"
---- 20,26 ----
- /* "$Id: patch-ad,v 1.2 1997/06/20 12:22:32 tg Exp $" */
- #include <string.h>
- #include <stdio.h>
-! #include <stdlib.h>
- #include "tty.h"
- #include <stdarg.h>
- #include "mad.h"
-*** src/widget.c.orig Thu Jun 19 23:31:50 1997
---- src/widget.c Thu Jun 19 23:37:42 1997
-***************
-*** 27,33 ****
- #include <config.h>
- #include <string.h>
- #include <stdio.h>
-! #include <malloc.h>
- #include "tty.h"
- #include <ctype.h>
- #include "mad.h"
---- 27,33 ----
- #include <config.h>
- #include <string.h>
- #include <stdio.h>
-! #include <stdlib.h>
- #include "tty.h"
- #include <ctype.h>
- #include "mad.h"
-*** src/wtools.c.orig Thu Jun 19 23:31:57 1997
---- src/wtools.c Thu Jun 19 23:37:53 1997
-***************
-*** 34,40 ****
- #include <config.h>
- #include <string.h>
- #include <stdio.h>
-! #include <malloc.h>
- #include "tty.h"
- #include <stdarg.h>
- #include "mad.h"
---- 34,40 ----
- #include <config.h>
- #include <string.h>
- #include <stdio.h>
-! #include <stdlib.h>
- #include "tty.h"
- #include <stdarg.h>
- #include "mad.h"
-*** src/info.c.orig Thu Jun 19 23:31:21 1997
---- src/info.c Thu Jun 19 23:36:33 1997
-***************
-*** 21,27 ****
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
-! #include <malloc.h>
- #include "mad.h"
- #include "util.h" /* statfs calls */
- #include "mouse.h" /* Gpm_Event */
---- 21,27 ----
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/param.h>
-! #include <stdlib.h>
- #include "mad.h"
- #include "util.h" /* statfs calls */
- #include "mouse.h" /* Gpm_Event */
-*** src/boxes.c.orig Thu Jun 19 23:30:20 1997
---- src/boxes.c Thu Jun 19 23:32:23 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 Thu Jun 19 23:30:35 1997
---- src/complete.c Thu Jun 19 23:33:43 1997
-***************
-*** 24,30 ****
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-! #include <malloc.h>
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
---- 24,30 ----
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-! /* #include <malloc.h> */
- #ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif
-*** src/command.c.orig Thu Jun 19 23:30:26 1997
---- src/command.c Thu Jun 19 23:33:30 1997
-***************
-*** 25,31 ****
- #include <errno.h>
- #include "tty.h"
- #include "fs.h"
-! #include <malloc.h>
- #include <string.h>
- #include <stdlib.h>
- #include "mad.h"
---- 25,31 ----
- #include <errno.h>
- #include "tty.h"
- #include "fs.h"
-! /* #include <malloc.h> */
- #include <string.h>
- #include <stdlib.h>
- #include "mad.h"
-*** src/cmd.c.orig Thu Jun 19 23:32:40 1997
---- src/cmd.c Thu Jun 19 23:33:08 1997
-***************
-*** 34,40 ****
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-! #include <malloc.h>
- #include <string.h>
- #include <fcntl.h> /* open, O_RDWR */
- #include <errno.h>
---- 34,40 ----
- #include <sys/param.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-! /* #include <malloc.h> */
- #include <string.h>
- #include <fcntl.h> /* open, O_RDWR */
- #include <errno.h>
+--- vfs/local.c.orig Sun Sep 21 23:34:00 1997
++++ vfs/local.c Sun Sep 21 23:34:11 1997
+@@ -1,7 +1,7 @@
+ #include <config.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <string.h>
+--- vfs/tcputil.c.orig Sun Sep 21 23:34:27 1997
++++ vfs/tcputil.c Sun Sep 21 23:34:37 1997
+@@ -28,7 +28,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+
+ #ifdef HAVE_PMAP_SET
+ #include <rpc/rpc.h>
+--- vfs/undelfs.c.orig Sun Sep 21 23:35:24 1997
++++ vfs/undelfs.c Sun Sep 21 23:35:39 1997
+@@ -42,7 +42,7 @@
+ #include "vfs.h"
+
+ #include <stdio.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #include <fcntl.h>
+ #include <stdlib.h>
+ #include <linux/ext2_fs.h>
+--- vfs/utilvfs.c.orig Sun Sep 21 23:34:51 1997
++++ vfs/utilvfs.c Sun Sep 21 23:35:05 1997
+@@ -32,7 +32,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #ifdef USE_TERMNET
+ #include <termnet.h>
+ #endif
+--- vfs/vfs.c.orig Sun Sep 21 23:33:10 1997
++++ vfs/vfs.c Sun Sep 21 23:33:55 1997
+@@ -25,7 +25,7 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <sys/types.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #include <fcntl.h>
+ #include <signal.h>
+ #ifdef SCO_FLAVOR
+--- src/boxes.c.orig Sun Sep 21 23:38:00 1997
++++ src/boxes.c Sun Sep 21 23:39:04 1997
+@@ -26,7 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <signal.h>
+ #include "global.h"
+ #include "mad.h" /* The great mad */
+--- src/cmd.c.orig Sun Sep 21 23:38:07 1997
++++ src/cmd.c Sun Sep 21 23:39:30 1997
+@@ -34,7 +34,7 @@
+ #include <sys/param.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #include <string.h>
+ #include <fcntl.h> /* open, O_RDWR */
+ #include <errno.h>
+--- src/command.c.orig Sun Sep 21 23:38:12 1997
++++ src/command.c Sun Sep 21 23:39:51 1997
+@@ -25,7 +25,7 @@
+ #include <errno.h>
+ #include "tty.h"
+ #include "fs.h"
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #include <string.h>
+ #include <stdlib.h>
+ #include "mad.h"
+--- src/complete.c.orig Sun Sep 21 23:38:19 1997
++++ src/complete.c Sun Sep 21 23:40:10 1997
+@@ -24,7 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif
+--- src/dlg.c.orig Sun Sep 21 23:38:36 1997
++++ src/dlg.c Sun Sep 21 23:40:33 1997
+@@ -20,7 +20,7 @@
+ /* "$Id: dlg.c,v 1.3 1995/02/21 19:05:40 miguel Exp $" */
+ #include <string.h>
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "tty.h"
+ #include <stdarg.h>
+ #include "mad.h"
+--- src/ext.c.orig Sun Sep 21 23:40:42 1997
++++ src/ext.c Sun Sep 21 23:48:18 1997
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #endif
+ #include <fcntl.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include "mad.h"
+--- src/file.c.orig Sun Sep 21 23:40:48 1997
++++ src/file.c Sun Sep 21 23:48:39 1997
+@@ -68,7 +68,7 @@
+ #include <errno.h>
+ #include "tty.h"
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+--- src/find.c.orig Sun Sep 21 23:47:58 1997
++++ src/find.c Sun Sep 21 23:48:53 1997
+@@ -27,7 +27,7 @@
+ # include <direct.h>
+ #endif
+
+-#include <malloc.h> /* For free() */
++#include <stdlib.h> /* For free() */
+ #include <sys/types.h>
+ #ifdef HAVE_UNISTD_H
+ # include <unistd.h>
+--- src/help.c.orig Sun Sep 21 23:49:07 1997
++++ src/help.c Sun Sep 21 23:49:19 1997
+@@ -41,7 +41,7 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <errno.h>
+ #include "mad.h"
+ #include "color.h"
+--- src/info.c.orig Sun Sep 21 23:49:30 1997
++++ src/info.c Sun Sep 21 23:49:43 1997
+@@ -22,7 +22,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "mad.h"
+ #include "util.h" /* statfs calls */
+ #include "mouse.h" /* Gpm_Event */
+--- src/key.c.orig Sun Sep 21 23:49:52 1997
++++ src/key.c Sun Sep 21 23:50:17 1997
+@@ -38,7 +38,7 @@
+ #include "tty.h"
+ #include <ctype.h>
+ #include <errno.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "util.h" /* For xmalloc prototype */
+ #include "mad.h" /* The memory debugger */
+ #include "global.h"
+--- src/menu.c.orig Sun Sep 21 23:50:25 1997
++++ src/menu.c Sun Sep 21 23:51:15 1997
+@@ -21,7 +21,7 @@
+ #include <stdarg.h>
+ #include <sys/types.h>
+ #include <ctype.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "mad.h"
+ #include "util.h"
+ #include "menu.h"
+--- src/mouse.c.orig Sun Sep 21 23:50:30 1997
++++ src/mouse.c Sun Sep 21 23:51:34 1997
+@@ -30,7 +30,7 @@
+ #if (!defined(__IBMC__) && !defined(__IBMCPP__))
+ # include <termios.h>
+ #endif
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <stdio.h>
+
+ #include "mad.h"
+--- src/view.c.orig Sun Sep 21 23:50:36 1997
++++ src/view.c Sun Sep 21 23:51:57 1997
+@@ -42,7 +42,7 @@
+ #include <unistd.h>
+ #include <ctype.h> /* For toupper() */
+ #include <stdlib.h> /* atoi() */
+-#include <malloc.h>
++/* #include <malloc.h> */
+ #include <errno.h>
+ #include <limits.h>
+ #include <sys/param.h>
+--- src/widget.c.orig Sun Sep 21 23:50:42 1997
++++ src/widget.c Sun Sep 21 23:52:27 1997
+@@ -27,7 +27,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "tty.h"
+ #include <ctype.h>
+ #include "mad.h"
+--- src/wtools.c.orig Sun Sep 21 23:50:50 1997
++++ src/wtools.c Sun Sep 21 23:52:49 1997
+@@ -34,7 +34,7 @@
+ #include <config.h>
+ #include <string.h>
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include "tty.h"
+ #include <stdarg.h>
+ #include "mad.h"
diff -ruN mc.orig/patches/patch-ae mc/patches/patch-ae
--- mc.orig/patches/patch-ae Fri Jun 20 20:22:34 1997
+++ mc/patches/patch-ae Sun Sep 21 23:56:21 1997
@@ -1,13 +1,8 @@
-*** mcfn_install.in.orig Thu Jun 19 23:17:04 1997
---- mcfn_install.in Thu Jun 19 23:17:12 1997
-***************
-*** 1,4 ****
-! #/bin/sh
- #
- prefix=@prefix@
- if test -n `echo $prefix | grep prefix`; then
---- 1,4 ----
-! #!/bin/sh
- #
- prefix=@prefix@
- if test -n `echo $prefix | grep prefix`; then
+--- mcfn_install.in.orig Sun Sep 21 23:31:24 1997
++++ mcfn_install.in Sun Sep 21 23:31:33 1997
+@@ -1,4 +1,4 @@
+-#/bin/sh
++#!/bin/sh
+ #
+ prefix=@prefix@
+ if test -n `echo $prefix | grep prefix`; then
diff -ruN mc.orig/patches/patch-af mc/patches/patch-af
--- mc.orig/patches/patch-af Wed Jun 25 15:11:49 1997
+++ mc/patches/patch-af Sun Sep 21 23:32:32 1997
@@ -1,19 +1,11 @@
-*** Makefile.in.orig Tue Jun 24 01:26:06 1997
---- Makefile.in Tue Jun 24 01:26:22 1997
-*************** config.h.in: configure.in acconfig.h
-*** 38,44 ****
- install: installdirs @vcs@
- @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
-! $(INSTALL_PROGRAM) 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 $(libdir)"
---- 38,44 ----
- install: installdirs @vcs@
- @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
-! $(INSTALL_DATA) 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 $(libdir)"
+--- Makefile.in.orig Sun Sep 21 23:32:12 1997
++++ Makefile.in Sun Sep 21 23:32:22 1997
+@@ -39,7 +39,7 @@
+ install: installdirs @vcs@
+ @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
+ $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+- $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++ $(INSTALL_DATA) 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 $(libdir)"
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19970921160216.1266.qmail>