Update "mc" package to version 4.5.29.

5 files changed, 50 insertions, 29 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index e064e55a17e..c95202585a5 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.17 1999/03/22 22:43:42 agc Exp $
+# $NetBSD: Makefile,v 1.18 1999/04/04 23:00:40 tron Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
-DISTNAME=	mc-4.5.25
+DISTNAME=	mc-4.5.29
 CATEGORIES=	systuils
 MASTER_SITES=	ftp://ftp.gnome.org/pub/GNOME/gnome-1.0/sources/ \
 		ftp://ftp.jimpick.com/pub/mirrors/gnome/gnome-1.0/sources/ \
diff --git a/sysutils/mc/files/md5 b/sysutils/mc/files/md5
index e1852c2dc61..d9f03d51d98 100644
--- a/sysutils/mc/files/md5
+++ b/sysutils/mc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.6 1999/03/14 23:07:55 tron Exp $
+$NetBSD: md5,v 1.7 1999/04/04 23:00:40 tron Exp $
 
-MD5 (mc-4.5.25.tar.gz) = b3462d5e33a3fb5e21ac64769dfc172b
+MD5 (mc-4.5.29.tar.gz) = 0400e3ae0879c944c6c145af24ac59ae
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index 976d58e921a..1631b39b9c7 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -1,18 +1,18 @@
-$NetBSD: patch-ab,v 1.7 1999/03/14 23:07:55 tron Exp $
+$NetBSD: patch-ab,v 1.8 1999/04/04 23:00:41 tron Exp $
 
---- vfs/Make-mc.in.orig	Sat Mar 13 03:02:30 1999
-+++ vfs/Make-mc.in	Sun Mar 14 23:25:48 1999
-@@ -192,11 +192,11 @@
- 	          $(DESTDIR)$(libdir)/extfs/$$I; \
+--- vfs/Make-mc.in.orig	Tue Mar 30 08:34:34 1999
++++ vfs/Make-mc.in	Mon Apr  5 00:41:09 1999
+@@ -194,11 +194,11 @@
+ 	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_CONST) ; do \
 -	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
 +	    $(INSTALL_SCRIPT) $(srcdir)/extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_OUT) ; do \
 -	    $(INSTALL_PROGRAM) $(builddir)/vfs/extfs/$$I \
 +	    $(INSTALL_SCRIPT) $(builddir)/vfs/extfs/$$I \
- 	             $(DESTDIR)$(libdir)/extfs/$$I; \
+ 	             $(DESTDIR)$(extfsdir)/$$I; \
  	done
  
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
index e23ef1f65ea..de75c9202e1 100644
--- a/sysutils/mc/patches/patch-af
+++ b/sysutils/mc/patches/patch-af
@@ -1,33 +1,33 @@
-$NetBSD: patch-af,v 1.6 1999/03/14 23:07:55 tron Exp $
+$NetBSD: patch-af,v 1.7 1999/04/04 23:00:41 tron Exp $
 
---- Makefile.in.orig	Sun Mar 14 23:55:56 1999
-+++ Makefile.in	Sun Mar 14 23:56:19 1999
+--- Makefile.in.orig	Tue Mar 30 08:34:33 1999
++++ Makefile.in	Mon Apr  5 00:47:35 1999
 @@ -5,7 +5,7 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
--codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl
-+codedirs=vfs lib doc slang gtkedit edit src new_icons icons
+-codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
++codedirs=vfs lib doc slang gtkedit edit src new_icons icons syntax
  unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
 @@ -46,7 +46,7 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
- 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ
+ 	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
 -	$(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
-+	$(INSTALL_DATA) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install
++	$(INSTALL_SCRIPT) 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)"
+ 	@echo "set in the mc.ext file in $(mclibdir)"
 @@ -58,9 +58,8 @@
  installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir)
++	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir) $(DESTDIR)$(syntaxdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(idldir)
+-	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
  
  mcfninstall:
  	-/bin/sh ./mcfn_install
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index 9262e9f0bac..14a1046ee00 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 1999/03/14 23:07:55 tron Exp $
+@comment $NetBSD: PLIST,v 1.7 1999/04/04 23:00:41 tron Exp $
 bin/mc
 bin/mcmfmt
 bin/mcedit
@@ -25,12 +25,7 @@ lib/mc/extfs/uzoo
 lib/mc/extfs/uar
 lib/mc/extfs/ulha
 lib/mc/extfs/uzip
-lib/mc/mc-gnome.ext
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
+lib/mc/extfs/uha
 lib/mc/term/README.xterm
 lib/mc/term/ansi.ti
 lib/mc/term/linux.ti
@@ -38,6 +33,30 @@ lib/mc/term/vt100.ti
 lib/mc/term/xterm.ad
 lib/mc/term/xterm.tcap
 lib/mc/term/xterm.ti
+lib/mc/syntax/c.syntax
+lib/mc/syntax/changelog.syntax
+lib/mc/syntax/diff.syntax
+lib/mc/syntax/diffc.syntax
+lib/mc/syntax/html.syntax
+lib/mc/syntax/java.syntax
+lib/mc/syntax/latex.syntax
+lib/mc/syntax/lsm.syntax
+lib/mc/syntax/makefile.syntax
+lib/mc/syntax/ml.syntax
+lib/mc/syntax/nroff.syntax
+lib/mc/syntax/pascal.syntax
+lib/mc/syntax/perl.syntax
+lib/mc/syntax/python.syntax
+lib/mc/syntax/sh.syntax
+lib/mc/syntax/smalltalk.syntax
+lib/mc/desktop-scripts/startup.links
+lib/mc/desktop-scripts/README.desktop
+lib/mc/mc-gnome.ext
+lib/mc/mc.ext
+lib/mc/mc.hint
+lib/mc/mc.hlp
+lib/mc/mc.lib
+lib/mc/mc.menu
 man/man1/mc.1
 man/man1/mcedit.1
 man/man8/mcserv.8
@@ -53,6 +72,8 @@ share/locale/ko/LC_MESSAGES/mc.mo
 share/locale/no/LC_MESSAGES/mc.mo
 share/locale/ro/LC_MESSAGES/mc.mo
 @dirrm lib/mc/bin
+@dirrm lib/mc/desktop-scripts
 @dirrm lib/mc/extfs
+@dirrm lib/mc/syntax
 @dirrm lib/mc/term
 @dirrm lib/mc