Update "mc" package to version 4.5.40 included in GNOME 1.0.53 release.

7 files changed, 68 insertions, 26 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index c8dae53597f..cc50f8bb7c9 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,29 +1,27 @@
-# $NetBSD: Makefile,v 1.32 1999/10/22 23:40:31 tron Exp $
+# $NetBSD: Makefile,v 1.33 1999/10/23 11:52:05 tron Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
-DISTNAME=	mc-4.5.38
+DISTNAME=	mc-4.5.40
 CATEGORIES=	sysutils
 
-MAINTAINER=	packages@netbsd.org
+MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.gnome.org/mc/
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/mc/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=gnome-1.0.53/sources/}
 
-DEPENDS+=	libslang-1.3.9:../../devel/libslang
+DEPENDS+=	libslang-*:../../devel/libslang
 DEPENDS+=	glib-1.2.*:../../devel/glib
 
 CONFLICTS+=	gmc-*
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		yes
-# XXX the cat-id-tbl is not up to date, so the catgets is broken.
-CONFIGURE_ARGS+=	--without-catgets --with-netrc --with-slang \
-			--without-x --without-gnome --without-tk
+USE_GMAKE=		YES
+CONFIGURE_ARGS+=	--with-netrc --with-slang --without-x \
+			--without-gnome --without-tk
 
 # Funny stuff to get this to use the system libslang.
 CONFIGURE_ENV+=		LIBS="-lm -ltermcap" CPPFLAGS="-I${LOCALBASE}/include"
 CFLAGS+=		-Dunix -I${LOCALBASE}/include -DxBSD
 LDFLAGS+=		-L${LOCALBASE}/lib
-MAKE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/files/md5 b/sysutils/mc/files/md5
index 4a6293d59c2..2870722c8df 100644
--- a/sysutils/mc/files/md5
+++ b/sysutils/mc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.11 1999/09/03 19:44:35 tron Exp $
+$NetBSD: md5,v 1.12 1999/10/23 11:52:06 tron Exp $
 
-MD5 (mc-4.5.38.tar.gz) = 5c8fb9eb977b5581c14c5f795bcb24be
+MD5 (mc-4.5.40.tar.gz) = 83498d806f0823bcfa067c0d715fc5b5
diff --git a/sysutils/mc/files/patch-sum b/sysutils/mc/files/patch-sum
index e1d77a9ce12..297a62f8562 100644
--- a/sysutils/mc/files/patch-sum
+++ b/sysutils/mc/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.3 1999/09/03 19:44:35 tron Exp $
+$NetBSD: patch-sum,v 1.4 1999/10/23 11:52:06 tron Exp $
 
 MD5 (patch-aa) = 2892d6861d5fb067447401db2a0f594e
-MD5 (patch-ab) = 695edb9818a55bcd814aa42a35cc5d62
+MD5 (patch-ab) = 38eb63b2947645ec67c9010ffd7f9cf8
+MD5 (patch-ac) = 64c125193b94340f449cdcdff23170d5
 MD5 (patch-ad) = 990a7730d8115426662d2d678a99860e
-MD5 (patch-af) = 7458331ef80f633caab08bfeed47000a
+MD5 (patch-af) = 3eea71e3c84e0352e6b3989e1a6a415c
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index 1631b39b9c7..7d35765f0fe 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.8 1999/04/04 23:00:41 tron Exp $
+$NetBSD: patch-ab,v 1.9 1999/10/23 11:52:07 tron Exp $
 
---- 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 @@
+--- vfs/Make-mc.in.orig	Wed Sep 29 22:39:34 1999
++++ vfs/Make-mc.in	Sat Oct 23 13:36:10 1999
+@@ -16,6 +16,7 @@
+ INSTALL  = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ AR = @AR@
+ 
+ #
+@@ -336,11 +337,11 @@
  	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_CONST) ; do \
diff --git a/sysutils/mc/patches/patch-ac b/sysutils/mc/patches/patch-ac
new file mode 100644
index 00000000000..4012d167e12
--- /dev/null
+++ b/sysutils/mc/patches/patch-ac
@@ -0,0 +1,21 @@
+$NetBSD: patch-ac,v 1.7 1999/10/23 11:54:35 tron Exp $
+
+--- lib/Makefile.in.orig	Wed Sep 29 22:39:38 1999
++++ lib/Makefile.in	Sat Oct 23 13:29:19 1999
+@@ -7,6 +7,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ #
+ # Distribution variables
+@@ -62,7 +63,7 @@
+ 	for I in $(LIBFILES_OUT); \
+ 	do $(INSTALL_DATA) $(builddir)/lib/$$I $(DESTDIR)$(mclibdir)/$$I; done
+ 	for I in $(SUPPBIN_OUT); \
+-	do $(INSTALL_PROGRAM) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
++	do $(INSTALL_SCRIPT) -m 755 $(builddir)/lib/$$I $(DESTDIR)$(suppbindir)//$$I; done
+ 	for I in $(TIFILES); \
+ 	do $(INSTALL_DATA) $(srcdir)/$$I $(DESTDIR)$(tidir)/$$I; done
+ 	$(MKINSTALLDIRS) $(DESTDIR)$(confdir)
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
index 60ce1849d18..464a475b7db 100644
--- a/sysutils/mc/patches/patch-af
+++ b/sysutils/mc/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.9 1999/09/03 19:44:36 tron Exp $
+$NetBSD: patch-af,v 1.10 1999/10/23 11:52:07 tron Exp $
 
---- Makefile.in.orig	Thu Sep  2 18:49:35 1999
-+++ Makefile.in	Fri Sep  3 18:48:19 1999
-@@ -5,7 +5,7 @@
+--- Makefile.in.orig	Wed Sep 29 22:39:33 1999
++++ Makefile.in	Sat Oct 23 13:25:35 1999
+@@ -5,14 +5,15 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
@@ -12,7 +12,15 @@ $NetBSD: patch-af,v 1.9 1999/09/03 19:44:36 tron Exp $
 +unixdirs=intl $(codedirs) @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
-@@ -45,7 +45,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ 
+ DISTMAIN =	configure configure.in NEWS README INSTALL INSTALL.FAST \
+ 		Makefile.in FAQ COPYING create_vcs install-sh \
+@@ -45,7 +46,7 @@
  install: installdirs
  	@for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done
  	$(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(mclibdir)/FAQ
@@ -21,7 +29,7 @@ $NetBSD: patch-af,v 1.9 1999/09/03 19:44:36 tron Exp $
  	chmod +x $(DESTDIR)$(suppbindir)/mcfn_install
  	@echo "Please verify that the configuration values are correctly"
  	@echo "set in the mc.ext file in $(mclibdir)"
-@@ -57,9 +57,8 @@
+@@ -57,9 +58,8 @@
  installdirs:
  	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
  	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index d3901d9dd1a..b57683e7637 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST,v 1.11 1999/09/03 19:44:36 tron Exp $
+@comment $NetBSD: PLIST,v 1.12 1999/10/23 11:52:07 tron Exp $
 bin/mc
 bin/mcedit
 bin/mcmfmt
 bin/mcserv
 etc/mc.global
 lib/mc/FAQ
+lib/mc/bin/mc.csh
+lib/mc/bin/mc.sh
 lib/mc/bin/mcfn_install
 lib/mc/desktop-scripts/README.desktop
 lib/mc/desktop-scripts/startup.links
@@ -31,12 +33,14 @@ lib/mc/extfs/urar
 lib/mc/extfs/uzip
 lib/mc/extfs/uzoo
 lib/mc/mc-gnome.ext
+lib/mc/mc.csh
 lib/mc/mc.ext
 lib/mc/mc.hint
 lib/mc/mc.hint.es
 lib/mc/mc.hlp
 lib/mc/mc.lib
 lib/mc/mc.menu
+lib/mc/mc.sh
 lib/mc/syntax/ada95.syntax
 lib/mc/syntax/c.syntax
 lib/mc/syntax/changelog.syntax
@@ -81,8 +85,10 @@ share/locale/hu/LC_MESSAGES/mc.mo
 share/locale/it/LC_MESSAGES/mc.mo
 share/locale/ja/LC_MESSAGES/mc.mo
 share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/nl/LC_MESSAGES/mc.mo
 share/locale/no/LC_MESSAGES/mc.mo
 share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/pt_BR/LC_MESSAGES/mc.mo
 share/locale/ro/LC_MESSAGES/mc.mo
 share/locale/ru/LC_MESSAGES/mc.mo
 share/locale/sv/LC_MESSAGES/mc.mo