update & fix for V4.1

4 files changed, 43 insertions, 74 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index 516031414d3..d34725b3483 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	mc
-# Version required:	4.0
-# Date created:		15 Jul 1995
-# Whom:			torstenb@FreeBSD.ORG
+# Version required:	4.1
+# Date created:		24 Oct 1997
+# Whom:			hubertf@netbsd.org
 #
-# $Id: Makefile,v 1.1.1.1 1997/10/11 21:54:31 hubertf Exp $
+# $Id: Makefile,v 1.2 1997/10/27 00:31:18 hubertf Exp $
 #
 
-DISTNAME=	mc-4.0
+DISTNAME=	mc-4.1
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file/managers/mc
diff --git a/sysutils/mc/files/md5 b/sysutils/mc/files/md5
index ca1f958db63..3a0b0d64db4 100644
--- a/sysutils/mc/files/md5
+++ b/sysutils/mc/files/md5
@@ -1 +1 @@
-MD5 (mc-4.0.tar.gz) = 1420c696eeff2678199144e38d0ee0aa
+MD5 (mc-4.1.tar.gz) = c779d89e1fdc3d24d1216fc812f0c4a9
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
index 418066cc6ad..556889a9f1d 100644
--- a/sysutils/mc/patches/patch-aa
+++ b/sysutils/mc/patches/patch-aa
@@ -1,22 +1,5 @@
 *** 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 ----
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index a34ba1805cb..f215f4777df 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -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	Tue Sep 16 23:53:51 1997
++++ vfs/Makefile.in	Sun Oct 26 01:32:05 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