4 files changed, 17 insertions, 80 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 1e9d9c0869b6..9fc7888037c9 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	mc
-# Version required:	4.1.31
+# Version required:	4.1.35
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.19 1998/04/11 20:02:34 vanilla Exp $
+# $Id: Makefile,v 1.20 1998/05/02 21:19:48 vanilla Exp $
 #
 
-DISTNAME=	mc-4.1.31
+DISTNAME=	mc-4.1.35
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/file/managers/mc/devel
+MASTER_SITE_SUBDIR=	utils/file/managers/mc
 
 MAINTAINER=	ports@FreeBSD.ORG
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-ncurses --without-edit --without-subshell --disable-nls
-CONFIGURE_ENV=	INSTALL="/usr/bin/install -c"
+CONFIGURE_ENV=	INSTALL="$${INSTALL} -c"
 MAKE_ENV=	CCOPTS="$(CFLAGS)"
 MAN1=		midc.1
 MAN8=		mcserv.8
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 3a3331a0589a..0262b3affe57 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1 +1 @@
-MD5 (mc-4.1.31.tar.gz) = 920ed921f9daa869d404437a411a9788
+MD5 (mc-4.1.35.tar.gz) = b563fdffb6b25b9f75bb019c2f9f70a2
diff --git a/misc/mc/files/patch-aa b/misc/mc/files/patch-aa
index a313861efe6b..7d8c5dec92c9 100644
--- a/misc/mc/files/patch-aa
+++ b/misc/mc/files/patch-aa
@@ -1,24 +1,6 @@
---- configure.orig	Sun Apr 12 04:41:56 1998
-+++ configure	Sat May  2 13:01:54 1998
-@@ -3365,7 +3365,7 @@
-     fi
- fi
- 
--CCOPTS='-g'
-+CCOPTS='-O2 -m486 -pipe'
- 
- if test "x$CCOPTS" = x; then
-     if test x$GCC = xyes; then
-@@ -8857,7 +8857,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
-@@ -10419,7 +10419,7 @@
+--- configure.orig	Mon May 25 18:16:04 1998
++++ configure	Tue Jun  2 06:43:28 1998
+@@ -10462,7 +10462,7 @@
          if test -f /usr/include/ncurses.h
  	then
  	    echo "$ac_t""Found ncurses on /usr/include/ncurses.h" 1>&6
@@ -27,61 +9,16 @@
  	    CPPFLAGS="$CPPFLAGS "
  	    search_ncurses=false
  	    screen_manager="ncurses on /usr/include"
-@@ -10436,7 +10436,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"
-@@ -10453,7 +10453,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 -L/usr/local/lib -lncurses"
-+ 	    LIBS="$LIBS -L/usr/local/lib -lncurses -lmytinfo"
- 	    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
- 	    search_ncurses=false
- 	    screen_manager="ncurses on /usr/local"
-@@ -10470,7 +10470,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 -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses"
-+ 	    LIBS="$LIBS -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses -lmytinfo"
- 	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses"
- 	    search_ncurses=false
- 	    screen_manager="ncurses on /usr/local/include/ncurses"
-@@ -10488,7 +10488,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 -L/usr/local/lib -lncurses"
-+ 	    LIBS="$LIBS -L/usr/local/lib -lncurses -lmytinfo"
- 	    CPPFLAGS="$CPPFLAGS -I/usr/local/include/ncurses -DRENAMED_NCURSES"
- 	    search_ncurses=false
- 	    screen_manager="renamed ncurses on /usr/local/.../ncurses"
-@@ -10506,7 +10506,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"
-@@ -11225,7 +11225,7 @@
+@@ -11268,7 +11268,7 @@
  vfs/extfs/ftplist vfs/extfs/zip vfs/extfs/zoo vfs/extfs/lslR
  vfs/extfs/lha vfs/extfs/cpio vfs/extfs/deb vfs/extfs/rar
  
 -doc/mc.1 doc/mcedit.1 doc/mcserv.8
-+doc/mc.1  doc/mcserv.8
++doc/mc.1 doc/mcserv.8
  
  intl/Makefile po/Makefile.in
   config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-@@ -11422,7 +11422,7 @@
+@@ -11466,7 +11466,7 @@
  vfs/extfs/ftplist vfs/extfs/zip vfs/extfs/zoo vfs/extfs/lslR
  vfs/extfs/lha vfs/extfs/cpio vfs/extfs/deb vfs/extfs/rar
  
diff --git a/misc/mc/files/patch-ab b/misc/mc/files/patch-ab
index 0c0cac5cc9b1..3c72bcedd2f2 100644
--- a/misc/mc/files/patch-ab
+++ b/misc/mc/files/patch-ab
@@ -1,12 +1,12 @@
---- vfs/Makefile.in.orig	Mon Mar 30 05:26:08 1998
-+++ vfs/Makefile.in	Sun Apr 12 03:17:24 1998
+--- vfs/Makefile.in.orig	Mon May 25 18:16:04 1998
++++ vfs/Makefile.in	Tue Jun  2 06:29:12 1998
 @@ -91,25 +91,25 @@
  
- install: mcserv install.extfs
- 	if test x@mcserv@ != x; then \
+ 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
+ 	fi)
  
  install.extfs:
  	$(INSTALL_DATA) $(srcdir)/extfs/README $(DESTDIR)$(libdir)/extfs/README