Update to 4.1.35, and clean up. Now uses libslang from the pkgsrc

collection, as well as catgets for internationalization.

10 files changed, 123 insertions, 491 deletions

diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index abeb73ed511..07ec3bb8fe5 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 1998/08/20 15:17:14 tsarna Exp $
+# $NetBSD: Makefile,v 1.12 1998/10/04 17:16:21 tv Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
-DISTNAME=		mc-4.1
+DISTNAME=		mc-4.1.35
 CATEGORIES=		misc
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/file/managers/mc
@@ -10,19 +10,15 @@ MASTER_SITE_SUBDIR=	utils/file/managers/mc
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnome.org/mc/
 
-DEPENDS+=		ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=		libslang-1.2.2:../../devel/libslang
 
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--with-ncurses --without-edit --without-subshell
+CONFIGURE_ARGS+=	--with-catgets --with-netrc --with-slang \
+			--without-x --without-gnome --without-tk
 
-pre-configure:
-	for f in `find ${WRKDIR}/. -type f -print|xargs ${GREP} -l '/usr/local'`; do \
-		${ECHO} patching $$f ; \
-		${CP} -p $$f $$f.tmp ; \
-		${SED} -e 's:/usr/local:'${PREFIX}':g' < $$f.tmp > $$f && ${MV} $$f.tmp $$f; \
-	done
-
-post-install:
-	@ ${RMDIR} ${PREFIX}/lib/mc/icons
+# Funny stuff to get this to use the system libslang.
+CONFIGURE_ENV+=		LIBS="-lm -ltermcap" CPPFLAGS="-I${LOCALBASE}/include"
+CFLAGS+=		-Dunix -I${LOCALBASE}/include
+LDFLAGS+=		-L${LOCALBASE}/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/mc/files/md5 b/misc/mc/files/md5
index 96ebef30ec7..8d7b9940829 100644
--- a/misc/mc/files/md5
+++ b/misc/mc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1998/08/07 13:25:07 agc Exp $
+$NetBSD: md5,v 1.4 1998/10/04 17:16:22 tv Exp $
 
-MD5 (mc-4.1.tar.gz) = c779d89e1fdc3d24d1216fc812f0c4a9
+MD5 (mc-4.1.35.tar.gz) = b563fdffb6b25b9f75bb019c2f9f70a2
diff --git a/misc/mc/patches/patch-aa b/misc/mc/patches/patch-aa
index 66cd2540fda..9386691ce0c 100644
--- a/misc/mc/patches/patch-aa
+++ b/misc/mc/patches/patch-aa
@@ -1,14 +1,19 @@
-$NetBSD: patch-aa,v 1.4 1998/08/07 11:10:25 agc Exp $
-
-*** configure.orig	Tue Jun 17 09:51:22 1997
---- configure	Fri Jun 20 00:03:50 1997
-*************** 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
+--- configure.orig	Mon May 25 06:16:04 1998
++++ configure	Sun Oct  4 13:10:51 1998
+@@ -3073,7 +3073,7 @@
+ 		 USE_INCLUDED_LIBINTL=yes
+ 		 CATOBJEXT=.cat
+ 		 INSTOBJEXT=.cat
+-		 DATADIRNAME=lib
++		 DATADIRNAME=share
+ 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
+ 		 INTLLIBS=$INTLDEPS
+ 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
+@@ -11280,6 +11280,7 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@PACKAGE@%$PACKAGE%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+ s%@CXXFLAGS@%$CXXFLAGS%g
diff --git a/misc/mc/patches/patch-ab b/misc/mc/patches/patch-ab
index 322c2af2e4a..a62b34eddec 100644
--- a/misc/mc/patches/patch-ab
+++ b/misc/mc/patches/patch-ab
@@ -1,23 +1,25 @@
-$NetBSD: patch-ab,v 1.3 1998/08/07 11:10:25 agc Exp $
-
---- 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 @@
+--- vfs/Makefile.in.orig	Mon May 25 06:16:04 1998
++++ vfs/Makefile.in	Sun Oct  4 09:07:34 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
  	$(INSTALL_DATA) $(srcdir)/extfs/extfs.ini $(DESTDIR)$(libdir)/extfs/extfs.ini
 -	$(INSTALL_PROGRAM) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
+-	$(INSTALL_PROGRAM) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
 -	$(INSTALL_PROGRAM) $(srcdir)/extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
+-	$(INSTALL_PROGRAM) $(srcdir)/extfs/hp48  $(DESTDIR)$(libdir)/extfs/hp48
 +	$(INSTALL_DATA) $(srcdir)/extfs/a $(DESTDIR)$(libdir)/extfs/a
++	$(INSTALL_DATA) $(srcdir)/extfs/arfs $(DESTDIR)$(libdir)/extfs/arfs
 +	$(INSTALL_DATA) $(srcdir)/extfs/rpm  $(DESTDIR)$(libdir)/extfs/rpm
- 
++	$(INSTALL_DATA) $(srcdir)/extfs/hp48  $(DESTDIR)$(libdir)/extfs/hp48
+ 	
 -	$(INSTALL_PROGRAM) extfs/cpio $(DESTDIR)$(libdir)/extfs/cpio
 -	$(INSTALL_PROGRAM) extfs/deb  $(DESTDIR)$(libdir)/extfs/deb
 -	$(INSTALL_PROGRAM) extfs/ftplist $(DESTDIR)$(libdir)/extfs/ftplist
diff --git a/misc/mc/patches/patch-ac b/misc/mc/patches/patch-ac
index cdf384f4242..4b35fb11ed9 100644
--- a/misc/mc/patches/patch-ac
+++ b/misc/mc/patches/patch-ac
@@ -1,31 +1,19 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 11:10:26 agc Exp $
-
-*** 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	Mon May 25 06:16:04 1998
++++ Make.common.in	Sun Oct  4 09:09:45 1998
+@@ -17,6 +17,7 @@
+ 
+ builddir   = @builddir@
+ bindir     = $(exec_prefix)/bin
++sbindir    = $(exec_prefix)/sbin
+ libdir     = $(exec_prefix)/lib/mc
+ suppbindir = $(libdir)/bin
+ tidir      = $(libdir)/term
+@@ -51,7 +52,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) -DLOCALEDIR=\""$(localedir)/"\" 
++XCPPFLAGS = @CPPFLAGS@ -I.. -DSBINDIR=\""$(sbindir)/"\" -DBINDIR=\""$(bindir)/"\" -DLIBDIR=\""$(libdir)/"\" -DICONDIR=\""$(icondir)/"\" $(XINC) -DLOCALEDIR=\""$(localedir)/"\" 
+ XLDFLAGS = @LDFLAGS@
+ XDEFS = @DEFS@
+ XLIBS = @LIBS@
diff --git a/misc/mc/patches/patch-ad b/misc/mc/patches/patch-ad
index c86dfc190d8..7ddef989be1 100644
--- a/misc/mc/patches/patch-ad
+++ b/misc/mc/patches/patch-ad
@@ -1,363 +1,30 @@
-$NetBSD: patch-ad,v 1.3 1998/08/07 11:10:26 agc Exp $
+$NetBSD: patch-ad,v 1.4 1998/10/04 17:16:22 tv Exp $
 
-*** vfs/local.c.orig	Thu Jun 19 23:25:13 1997
---- vfs/local.c	Thu Jun 19 23:25:53 1997
-***************
-*** 1,7 ****
-  #include <config.h>
-  #include <errno.h>
-  #include <sys/types.h>
-! #include <malloc.h>
-  #include <unistd.h>
-  #include <stdio.h>
-  #include <string.h>
---- 1,7 ----
-  #include <config.h>
-  #include <errno.h>
-  #include <sys/types.h>
-! #include <stdlib.h>
-  #include <unistd.h>
-  #include <stdio.h>
-  #include <string.h>
-*** vfs/vfs.c.orig	Thu Jun 19 23:25:45 1997
---- vfs/vfs.c	Thu Jun 19 23:27:37 1997
-***************
-*** 25,31 ****
-  #include <string.h>
-  #include <errno.h>
-  #include <sys/types.h>
-! #include <malloc.h>
-  #include <fcntl.h>
-  #include <signal.h>
-  #ifdef SCO_FLAVOR
---- 25,31 ----
-  #include <string.h>
-  #include <errno.h>
-  #include <sys/types.h>
-! /* #include <malloc.h> */
-  #include <fcntl.h>
-  #include <signal.h>
-  #ifdef SCO_FLAVOR
-*** vfs/tcputil.c.orig	Thu Jun 19 23:25:27 1997
---- vfs/tcputil.c	Thu Jun 19 23:26:31 1997
-***************
-*** 28,34 ****
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-! #include <malloc.h>
-  
-  #ifdef HAVE_PMAP_SET
-  #include <rpc/rpc.h>
---- 28,34 ----
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-! /* #include <malloc.h> */
-  
-  #ifdef HAVE_PMAP_SET
-  #include <rpc/rpc.h>
-*** vfs/utilvfs.c.orig	Thu Jun 19 23:29:28 1997
---- vfs/utilvfs.c	Thu Jun 19 23:27:22 1997
-***************
-*** 32,38 ****
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-! #include <malloc.h>
-  #ifdef USE_TERMNET
-  #include <termnet.h>
-  #endif
---- 32,38 ----
-  #include <sys/socket.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-! /* #include <malloc.h> */
-  #ifdef USE_TERMNET
-  #include <termnet.h>
-  #endif
-*** src/key.c.orig	Thu Jun 19 23:31:27 1997
---- src/key.c	Thu Jun 19 23:36:48 1997
-***************
-*** 38,44 ****
-  #include "tty.h"
-  #include <ctype.h>
-  #include <errno.h>
-! #include <malloc.h> 
-  #include "util.h"		/* For xmalloc prototype */
-  #include "mad.h"		/* The memory debugger */
-  #include "global.h"
---- 38,44 ----
-  #include "tty.h"
-  #include <ctype.h>
-  #include <errno.h>
-! #include <stdlib.h> 
-  #include "util.h"		/* For xmalloc prototype */
-  #include "mad.h"		/* The memory debugger */
-  #include "global.h"
-*** src/menu.c.orig	Thu Jun 19 23:31:33 1997
---- src/menu.c	Thu Jun 19 23:37:01 1997
-***************
-*** 21,27 ****
-  #include <stdarg.h>
-  #include <sys/types.h>
-  #include <ctype.h>
-! #include <malloc.h>
-  #include "mad.h"
-  #include "util.h"
-  #include "menu.h"
---- 21,27 ----
-  #include <stdarg.h>
-  #include <sys/types.h>
-  #include <ctype.h>
-! #include <stdlib.h>
-  #include "mad.h"
-  #include "util.h"
-  #include "menu.h"
-*** src/file.c.orig	Thu Jun 19 23:31:06 1997
---- src/file.c	Thu Jun 19 23:35:43 1997
-***************
-*** 68,74 ****
-  #include <errno.h>
-  #include "tty.h"
-  #include <ctype.h>
-! #include <malloc.h>
-  #include <string.h>
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
---- 68,74 ----
-  #include <errno.h>
-  #include "tty.h"
-  #include <ctype.h>
-! #include <stdlib.h>
-  #include <string.h>
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
-*** src/help.c.orig	Thu Jun 19 23:31:18 1997
---- src/help.c	Thu Jun 19 23:36:21 1997
-***************
-*** 41,47 ****
-  #include <stdio.h>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-! #include <malloc.h>
-  #include <errno.h>
-  #include "mad.h"
-  #include "color.h"
---- 41,47 ----
-  #include <stdio.h>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-! #include <stdlib.h>
-  #include <errno.h>
-  #include "mad.h"
-  #include "color.h"
-*** src/find.c.orig	Thu Jun 19 23:31:11 1997
---- src/find.c	Thu Jun 19 23:36:05 1997
-***************
-*** 27,33 ****
-  #    include <direct.h>
-  #endif
-  
-! #include <malloc.h>	/* For free() */
-  #include <sys/types.h>
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
---- 27,33 ----
-  #    include <direct.h>
-  #endif
-  
-! #include <stdlib.h>	/* For free() */
-  #include <sys/types.h>
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
-*** src/view.c.orig	Thu Jun 19 23:31:42 1997
---- src/view.c	Thu Jun 19 23:37:30 1997
-***************
-*** 42,48 ****
-  #include <unistd.h>
-  #include <ctype.h>	/* For toupper() */
-  #include <stdlib.h>	/* atoi() */
-! #include <malloc.h>
-  #include <errno.h>
-  #include <limits.h>
-  #include <sys/param.h>
---- 42,48 ----
-  #include <unistd.h>
-  #include <ctype.h>	/* For toupper() */
-  #include <stdlib.h>	/* atoi() */
-! /* #include <malloc.h> */
-  #include <errno.h>
-  #include <limits.h>
-  #include <sys/param.h>
-*** src/ext.c.orig	Thu Jun 19 23:31:01 1997
---- src/ext.c	Thu Jun 19 23:34:41 1997
-***************
-*** 29,35 ****
-  #include <unistd.h>
-  #endif
-  #include <fcntl.h>
-! #include <malloc.h>
-  #include <string.h>
-  #include <errno.h>
-  #include "mad.h"
---- 29,35 ----
-  #include <unistd.h>
-  #endif
-  #include <fcntl.h>
-! #include <stdlib.h>
-  #include <string.h>
-  #include <errno.h>
-  #include "mad.h"
-*** src/mouse.c.orig	Thu Jun 19 23:31:38 1997
---- src/mouse.c	Thu Jun 19 23:37:14 1997
-***************
-*** 30,36 ****
-  #if (!defined(__IBMC__) && !defined(__IBMCPP__))
-  #    include <termios.h>
-  #endif
-! #include <malloc.h>
-  #include <stdio.h>
-  
-  #include "mad.h"
---- 30,36 ----
-  #if (!defined(__IBMC__) && !defined(__IBMCPP__))
-  #    include <termios.h>
-  #endif
-! #include <stdlib.h>
-  #include <stdio.h>
-  
-  #include "mad.h"
-*** src/widget.c.orig	Thu Jun 19 23:31:50 1997
---- src/widget.c	Thu Jun 19 23:37:42 1997
-***************
-*** 27,33 ****
-  #include <config.h>
-  #include <string.h>
-  #include <stdio.h>
-! #include <malloc.h>
-  #include "tty.h"
-  #include <ctype.h>
-  #include "mad.h"
---- 27,33 ----
-  #include <config.h>
-  #include <string.h>
-  #include <stdio.h>
-! #include <stdlib.h>
-  #include "tty.h"
-  #include <ctype.h>
-  #include "mad.h"
-*** src/wtools.c.orig	Thu Jun 19 23:31:57 1997
---- src/wtools.c	Thu Jun 19 23:37:53 1997
-***************
-*** 34,40 ****
-  #include <config.h>
-  #include <string.h>
-  #include <stdio.h>
-! #include <malloc.h>
-  #include "tty.h"
-  #include <stdarg.h>
-  #include "mad.h"
---- 34,40 ----
-  #include <config.h>
-  #include <string.h>
-  #include <stdio.h>
-! #include <stdlib.h>
-  #include "tty.h"
-  #include <stdarg.h>
-  #include "mad.h"
-*** src/info.c.orig	Thu Jun 19 23:31:21 1997
---- src/info.c	Thu Jun 19 23:36:33 1997
-***************
-*** 21,27 ****
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/param.h>
-! #include <malloc.h>
-  #include "mad.h"
-  #include "util.h"		/* statfs calls */
-  #include "mouse.h"		/* Gpm_Event */
---- 21,27 ----
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/param.h>
-! #include <stdlib.h>
-  #include "mad.h"
-  #include "util.h"		/* statfs calls */
-  #include "mouse.h"		/* Gpm_Event */
-*** src/boxes.c.orig	Thu Jun 19 23:30:20 1997
---- src/boxes.c	Thu Jun 19 23:32:23 1997
-***************
-*** 26,32 ****
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/param.h>
-! #include <malloc.h>
-  #include <signal.h>
-  #include "global.h"
-  #include "mad.h"		/* The great mad */
---- 26,32 ----
-  #include <sys/types.h>
-  #include <sys/stat.h>
-  #include <sys/param.h>
-! #include <stdlib.h>
-  #include <signal.h>
-  #include "global.h"
-  #include "mad.h"		/* The great mad */
-*** src/complete.c.orig	Thu Jun 19 23:30:35 1997
---- src/complete.c	Thu Jun 19 23:33:43 1997
-***************
-*** 24,30 ****
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-! #include <malloc.h>
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
-  #endif
---- 24,30 ----
-  #include <stdio.h>
-  #include <stdlib.h>
-  #include <string.h>
-! /* #include <malloc.h> */
-  #ifdef HAVE_UNISTD_H
-  #   include <unistd.h>
-  #endif
-*** src/command.c.orig	Thu Jun 19 23:30:26 1997
---- src/command.c	Thu Jun 19 23:33:30 1997
-***************
-*** 25,31 ****
-  #include <errno.h>
-  #include "tty.h"
-  #include "fs.h"
-! #include <malloc.h>
-  #include <string.h>
-  #include <stdlib.h>
-  #include "mad.h"
---- 25,31 ----
-  #include <errno.h>
-  #include "tty.h"
-  #include "fs.h"
-! /* #include <malloc.h> */
-  #include <string.h>
-  #include <stdlib.h>
-  #include "mad.h"
-*** src/cmd.c.orig	Thu Jun 19 23:32:40 1997
---- src/cmd.c	Thu Jun 19 23:33:08 1997
-***************
-*** 34,40 ****
-  #include <sys/param.h>
-  #include <sys/stat.h>
-  #include <sys/time.h>
-! #include <malloc.h>
-  #include <string.h>
-  #include <fcntl.h>		/* open, O_RDWR */
-  #include <errno.h>
---- 34,40 ----
-  #include <sys/param.h>
-  #include <sys/stat.h>
-  #include <sys/time.h>
-! /* #include <malloc.h> */
-  #include <string.h>
-  #include <fcntl.h>		/* open, O_RDWR */
-  #include <errno.h>
+--- intl/xopen-msg.sed.orig	Thu Jun 18 13:21:49 1998
++++ intl/xopen-msg.sed	Thu Jun 18 13:32:08 1998
+@@ -81,6 +81,8 @@
+   G
+   s/^[^\n]*$/& /
+   s/\(.*\)\n\([0-9]*\)/\2 \1/
++# Change escaped quotes into regular quotes.
++  s/\\"/"/g
+ # Clear flag from last substitution.
+   tb
+ # Append the next line.
+@@ -90,12 +92,16 @@
+   s/\(.*\n\)"\(.*\)"/\1\2/
+ # Yes, then branch.
+   ta
++# Comment out if no message exists.
++  s/^\([0-9]* *\n\)/$ \1/
+   P
+   D
+ # Note that `D' includes a jump to the start!!
+ # We found a continuation line.  But before printing insert '\'.
+   :a
+   s/\(.*\)\(\n.*\)/\1\\\2/
++# Change escaped quotes into regular quotes.
++  s/\\"/"/g
+   P
+ # We cannot use the sed command `D' here
+   s/.*\n\(.*\)/\1/
diff --git a/misc/mc/patches/patch-ae b/misc/mc/patches/patch-ae
index a1ec870a157..4af76822c51 100644
--- a/misc/mc/patches/patch-ae
+++ b/misc/mc/patches/patch-ae
@@ -1,15 +1,8 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:10:26 agc Exp $
-
-*** mcfn_install.in.orig	Thu Jun 19 23:17:04 1997
---- mcfn_install.in	Thu Jun 19 23:17:12 1997
-***************
-*** 1,4 ****
-! #/bin/sh
-  #
-  prefix=@prefix@
-  if test -n `echo $prefix | grep prefix`; then
---- 1,4 ----
-! #!/bin/sh
-  #
-  prefix=@prefix@
-  if test -n `echo $prefix | grep prefix`; then
+--- mcfn_install.in.orig	Mon May 25 06:16:04 1998
++++ mcfn_install.in	Sun Oct  4 09:11:40 1998
+@@ -1,4 +1,4 @@
+-#/bin/sh
++#!/bin/sh
+ #
+ prefix=@prefix@
+ if test -n `echo $prefix | grep prefix`; then
diff --git a/misc/mc/patches/patch-af b/misc/mc/patches/patch-af
index ae2bb21807e..8cda9a31311 100644
--- a/misc/mc/patches/patch-af
+++ b/misc/mc/patches/patch-af
@@ -1,21 +1,11 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:10:27 agc Exp $
-
-*** 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	Mon May 25 06:16:04 1998
++++ Makefile.in	Sun Oct  4 09:11:43 1998
+@@ -43,7 +43,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)"
diff --git a/misc/mc/patches/patch-ag b/misc/mc/patches/patch-ag
deleted file mode 100644
index 711bc168145..00000000000
--- a/misc/mc/patches/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ag,v 1.4 1998/08/07 11:10:27 agc Exp $
-
---- src/dlg.c.orig      Tue Sep 16 23:54:31 1997
-+++ src/dlg.c   Sat Jan 24 17:08:46 1998
-@@ -21,5 +21,5 @@
- #include <string.h>
- #include <stdio.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include "tty.h"
- #include <stdarg.h>
diff --git a/misc/mc/pkg/PLIST b/misc/mc/pkg/PLIST
index 1a8c35483bc..4990cc8211c 100644
--- a/misc/mc/pkg/PLIST
+++ b/misc/mc/pkg/PLIST
@@ -1,29 +1,27 @@
-@comment $NetBSD: PLIST,v 1.2 1997/11/06 10:02:20 agc Exp $
+@comment $NetBSD: PLIST,v 1.3 1998/10/04 17:16:23 tv Exp $
 bin/mc
 bin/mcmfmt
-sbin/mcserv
 lib/mc/FAQ
-lib/mc/gd.tcl
-lib/mc/gui.tcl
-lib/mc/mc.ext
-lib/mc/mc.hint
-lib/mc/mc.hlp
-lib/mc/mc.lib
-lib/mc/mc.menu
-lib/mc/mc.tcl
 lib/mc/bin/mcfn_install
 lib/mc/extfs/README
 lib/mc/extfs/a
+lib/mc/extfs/arfs
 lib/mc/extfs/cpio
 lib/mc/extfs/deb
 lib/mc/extfs/extfs.ini
 lib/mc/extfs/ftplist
+lib/mc/extfs/hp48
 lib/mc/extfs/lha
 lib/mc/extfs/lslR
 lib/mc/extfs/rar
 lib/mc/extfs/rpm
 lib/mc/extfs/zip
 lib/mc/extfs/zoo
+lib/mc/mc.ext
+lib/mc/mc.hint
+lib/mc/mc.hlp
+lib/mc/mc.lib
+lib/mc/mc.menu
 lib/mc/term/README.xterm
 lib/mc/term/ansi.ti
 lib/mc/term/linux.ti
@@ -31,9 +29,13 @@ lib/mc/term/vt100.ti
 lib/mc/term/xterm.ad
 lib/mc/term/xterm.tcap
 lib/mc/term/xterm.ti
-man/man1/mc.1.gz
-man/man1/mcedit.1.gz
-man/man8/mcserv.8.gz
+man/man1/mc.1
+man/man1/mcedit.1
+man/man8/mcserv.8
+sbin/mcserv
+share/locale/es/LC_MESSAGES/mc.cat
+share/locale/fr/LC_MESSAGES/mc.cat
+share/locale/ru/LC_MESSAGES/mc.cat
 @dirrm lib/mc/bin
 @dirrm lib/mc/extfs
 @dirrm lib/mc/term