Upgrade 4.0 -> 4.1.

PR:		4598
Submitted by:	vanilla@MinJe.com.TW
This commit is contained in:
Masafumi Max NAKANE 1997-09-21 19:58:07 +00:00
parent 35f98f5a1b
commit b9fab04d7e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=7979
6 changed files with 153 additions and 251 deletions

View file

@ -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.11 1997/06/20 12:22:15 tg Exp $
# $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

View file

@ -1 +1 @@
MD5 (mc-4.0.tar.gz) = 1420c696eeff2678199144e38d0ee0aa
MD5 (mc-4.1.tar.gz) = c779d89e1fdc3d24d1216fc812f0c4a9

View file

@ -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"

View file

@ -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

View file

@ -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@

View file

@ -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)"