Update {g,}mc to 0.4.51. This is a maintenance release from version 0.4.50

and has no list of changes.  Restructure packages to use a common Makefile
and patch directory.  Set the maintainer to me, as this is a non-trivial
change.  Compile in the samba vfs code.

12 files changed, 163 insertions, 121 deletions

diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index abd1caef5b8..176f088cf9f 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,35 +1,15 @@
-# $NetBSD: Makefile,v 1.39 2000/10/04 11:04:58 toshii Exp $
+# $NetBSD: Makefile,v 1.40 2000/10/19 23:31:17 jlam Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/11/30 19:37:48 vanilla Exp
 #
 
-DISTNAME=	mc-4.5.50
-CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/mc/}
+CONFIGURE_ARGS+=	--without-x
+CONFIGURE_ARGS+=	--without-tm-x-support
+CONFIGURE_ARGS+=	--without-gnome
 
-MAINTAINER=	tron@netbsd.org
-HOMEPAGE=	http://www.gnome.org/mc/
-
-DEPENDS+=	libslang-*:../../devel/libslang
-DEPENDS+=	glib-1.2.*:../../devel/glib
-
-CONFLICTS+=	gmc-*
-
-GNU_CONFIGURE=		YES
-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
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-PLIST_SUBST+=	LOCALEBASE=lib
-.else
-PLIST_SUBST+=	LOCALEBASE=share
-.endif
+# Remove unwanted directories in a non-GNOME installation.
+#
+post-install:
+	cd ${PREFIX}; ${RMDIR} -p share/idl 2>/dev/null || ${TRUE}
+	cd ${PREFIX}; ${RMDIR} -p share/pixmaps/mc 2>/dev/null || ${TRUE}
 
-.include "../../mk/bsd.pkg.mk"
+.include "../../sysutils/mc/Makefile.common"
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
new file mode 100644
index 00000000000..08e2f289974
--- /dev/null
+++ b/sysutils/mc/Makefile.common
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile.common,v 1.1 2000/10/19 23:31:17 jlam Exp $
+
+DISTNAME=		mc-4.5.51
+CATEGORIES+=		sysutils
+MASTER_SITES+=		${MASTER_SITE_GNOME:=stable/sources/mc/}
+
+MAINTAINER=		jlam@netbsd.org
+HOMEPAGE=		http://www.gnome.org/mc/
+
+DEPENDS+=		libslang-*:../../devel/libslang
+DEPENDS+=		glib>=1.2.0:../../devel/glib
+
+CONFLICTS+=		mc-* gmc-*
+
+FILESDIR=		${.CURDIR}/../../sysutils/mc/files
+PATCHDIR=		${.CURDIR}/../../sysutils/mc/patches
+
+PLIST_SUBST+=		LOCALEBASE=${LOCALEBASE}
+
+USE_GMAKE=		# defined
+
+GNU_CONFIGURE=		# defined
+CONFIGURE_ARGS+=	--without-included-gettext
+CONFIGURE_ARGS+=	--with-netrc --with-slang
+CONFIGURE_ARGS+=	--with-samba
+CONFIGURE_ARGS+=	--without-tk
+
+# Don't pick up readline if it's installed in the build environment.
+#
+CONFIGURE_ENV+=		ac_cv_header_history_h=no
+CONFIGURE_ENV+=		ac_cv_header_readline_h=no
+CONFIGURE_ENV+=		ac_cv_header_readline_history_h=no
+CONFIGURE_ENV+=		ac_cv_header_readline_readline_h=no
+
+CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
+CONFIGURE_ENV+=		LOCALEBASE="${LOCALEBASE}"
+CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		LIBS="${LIBS}"
+
+LIBS+=			-lm -ltermcap		# -lslang
+LIBS+=			-lintl			# check for gettext is broken
+CPPFLAGS+=		-I${LOCALBASE}/include	# slang.h
+
+.include "../../mk/bsd.prefs.mk"
+
+# The directory in which locale files are found is:
+#
+# 	${PREFIX}/${LOCALEBASE}/locale/<lang>/LC_MESSAGES
+#
+.if ${OPSYS} == "SunOS"
+LOCALEBASE=		lib
+.else
+LOCALEBASE=		share
+.endif
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc/files/md5 b/sysutils/mc/files/md5
index bd400dc7d99..dd17fcb9ba6 100644
--- a/sysutils/mc/files/md5
+++ b/sysutils/mc/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.14 2000/06/01 17:54:25 rh Exp $
+$NetBSD: md5,v 1.15 2000/10/19 23:31:17 jlam Exp $
 
-MD5 (mc-4.5.50.tar.gz) = a9808074a863e564264719632ecc1c97
+MD5 (mc-4.5.51.tar.gz) = c604292554887e9e6baba0828081b963
diff --git a/sysutils/mc/files/patch-sum b/sysutils/mc/files/patch-sum
index 36d588c73c6..4b878803f9d 100644
--- a/sysutils/mc/files/patch-sum
+++ b/sysutils/mc/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.6 2000/03/03 23:56:40 tron Exp $
+$NetBSD: patch-sum,v 1.7 2000/10/19 23:31:17 jlam Exp $
 
-MD5 (patch-aa) = 2892d6861d5fb067447401db2a0f594e
-MD5 (patch-ab) = 38eb63b2947645ec67c9010ffd7f9cf8
+MD5 (patch-aa) = 5ba726c4ff8367f20a3d0d1052adbe74
+MD5 (patch-ab) = 3718e815b0fb883df598f2abbc6c5340
 MD5 (patch-ac) = 64c125193b94340f449cdcdff23170d5
-MD5 (patch-ad) = 990a7730d8115426662d2d678a99860e
-MD5 (patch-af) = 3eea71e3c84e0352e6b3989e1a6a415c
-MD5 (patch-ag) = c4f09410d5b2bc581feec64762f30c39
-MD5 (patch-ah) = fd65533286dd3c9468b668d11b0ddebc
+MD5 (patch-ad) = 62f27e7e3f9eefbe5ef00829913b2508
+MD5 (patch-af) = 21dcdded4d98079cbf1d0e2fa8718d59
+MD5 (patch-ag) = a6afd6816eca5ae23e56057e1ccd2227
+MD5 (patch-ah) = 5bf2e219c2fe895220f0c83654e86dde
diff --git a/sysutils/mc/patches/patch-aa b/sysutils/mc/patches/patch-aa
index 7cca71d21ca..f3104db9d20 100644
--- a/sysutils/mc/patches/patch-aa
+++ b/sysutils/mc/patches/patch-aa
@@ -1,13 +1,49 @@
-$NetBSD: patch-aa,v 1.8 1999/03/14 23:07:55 tron Exp $
+$NetBSD: patch-aa,v 1.9 2000/10/19 23:31:18 jlam Exp $
 
---- 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//'`
+--- configure.orig	Mon Jul  3 10:31:57 2000
++++ configure
+@@ -3543,6 +3543,11 @@
+ 
+ 
+ 
++# Set DATADIRNAME to "${LOCALEBASE}"
++DATADIRNAME="${LOCALEBASE}"
++INTLDEPS=
++INTLLIBS="-lintl"
++
+ cc_uses_g=yes
+ if test x$GCC = xyes; then
+     if test x$ac_cv_prog_gcc_g = xyes; then
+@@ -9409,11 +9414,15 @@
+ 
+ 
+ 	# Check whether --with-gnome or --without-gnome was given.
++gnomecodedirs=
++gnomeunixdirs=
+ if test "${with_gnome+set}" = set; then
+   withval="$with_gnome"
+   if test x$withval = xyes; then
+ 	    		want_gnome=yes
+ 	    						    		
++	gnomecodedirs='gnome idl'
++	gnomeunixdirs='doc-gnome'
+ 	mx=mx
+  	gmcdep=gmcdep
+ 	libgtkedit="libgtkedit.a"
+@@ -11891,6 +11900,7 @@
+  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+ $ac_vpsub
+ $extrasub
++s%@LOCALBASE@%$LOCALBASE%g
+ s%@SHELL@%$SHELL%g
+ s%@CFLAGS@%$CFLAGS%g
+ s%@CPPFLAGS@%$CPPFLAGS%g
+@@ -12019,6 +12029,8 @@
+ s%@GNOME_DOCKLETS_LIBS@%$GNOME_DOCKLETS_LIBS%g
+ s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g
+ s%@gnomeicondir@%$gnomeicondir%g
++s%@gnomecodedirs@%$gnomecodedirs%g
++s%@gnomeunixdirs@%$gnomeunixdirs%g
+ s%@mx@%$mx%g
+ s%@gmcdep@%$gmcdep%g
+ s%@libgtkedit@%$libgtkedit%g
diff --git a/sysutils/mc/patches/patch-ab b/sysutils/mc/patches/patch-ab
index 7d35765f0fe..7cf94ceb285 100644
--- a/sysutils/mc/patches/patch-ab
+++ b/sysutils/mc/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.9 1999/10/23 11:52:07 tron Exp $
+$NetBSD: patch-ab,v 1.10 2000/10/19 23:31:18 jlam Exp $
 
---- vfs/Make-mc.in.orig	Wed Sep 29 22:39:34 1999
-+++ vfs/Make-mc.in	Sat Oct 23 13:36:10 1999
+--- vfs/Make-mc.in.orig	Mon Jul  3 10:31:58 2000
++++ vfs/Make-mc.in
 @@ -16,6 +16,7 @@
  INSTALL  = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.9 1999/10/23 11:52:07 tron Exp $
  AR = @AR@
  
  #
-@@ -336,11 +337,11 @@
+@@ -342,11 +343,11 @@
  	          $(DESTDIR)$(extfsdir)/$$I; \
  	done
  	for I in $(EXTFS_CONST) ; do \
diff --git a/sysutils/mc/patches/patch-ad b/sysutils/mc/patches/patch-ad
index 04a7ea2f68d..cd0bfee2974 100644
--- a/sysutils/mc/patches/patch-ad
+++ b/sysutils/mc/patches/patch-ad
@@ -1,30 +1,14 @@
-$NetBSD: patch-ad,v 1.5 1999/03/14 20:59:42 tron Exp $
+$NetBSD: patch-ad,v 1.6 2000/10/19 23:31:18 jlam Exp $
 
---- 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/
+--- vfs/smbfs.c.orig	Mon Jul  3 10:31:59 2000
++++ vfs/smbfs.c
+@@ -375,7 +375,8 @@
+ static int
+ smbfs_init(vfs *me)
+ {
+-	char *servicesf = "/etc/smb.conf";
++	/* This must match what net/samba uses. */
++	char *servicesf = "/etc/samba/smb.conf";
+ 
+ /*	DEBUGLEVEL = 4;	*/
+ 
diff --git a/sysutils/mc/patches/patch-af b/sysutils/mc/patches/patch-af
index 464a475b7db..d046fdabccb 100644
--- a/sysutils/mc/patches/patch-af
+++ b/sysutils/mc/patches/patch-af
@@ -1,15 +1,15 @@
-$NetBSD: patch-af,v 1.10 1999/10/23 11:52:07 tron Exp $
+$NetBSD: patch-af,v 1.11 2000/10/19 23:31:18 jlam Exp $
 
---- Makefile.in.orig	Wed Sep 29 22:39:33 1999
-+++ Makefile.in	Sat Oct 23 13:25:35 1999
+--- Makefile.in.orig	Mon Jul  3 10:31:57 2000
++++ Makefile.in
 @@ -5,14 +5,15 @@
  @MCFGR@@MCF@
  
  foreigndirs=pc
 -codedirs=vfs lib doc slang gtkedit edit src gnome new_icons icons idl syntax
 -unixdirs=intl $(codedirs) doc-gnome @POSUB@
-+codedirs=vfs lib doc slang edit src new_icons icons syntax
-+unixdirs=intl $(codedirs) @POSUB@
++codedirs=vfs lib doc slang gtkedit edit src new_icons icons syntax @gnomecodedirs@
++unixdirs=intl $(codedirs) @gnomeunixdirs@ @POSUB@
  alldirs=$(unixdirs) $(foreigndirs) 
  subdirs=$(alldirs)
  
@@ -29,14 +29,3 @@ $NetBSD: patch-af,v 1.10 1999/10/23 11:52:07 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 +58,8 @@
- installdirs:
- 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir) $(DESTDIR)$(mclibdir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(mandir) $(DESTDIR)$(man8dir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(icondir) $(DESTDIR)$(suppbindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(suppbindir) $(DESTDIR)$(syntaxdir)
- 	$(MKINSTALLDIRS) $(DESTDIR)$(tidir) $(DESTDIR)$(extfsdir)
--	$(MKINSTALLDIRS) $(DESTDIR)$(idldir) $(DESTDIR)$(syntaxdir)
- 
- mcfninstall:
- 	-/bin/sh ./mcfn_install
diff --git a/sysutils/mc/patches/patch-ag b/sysutils/mc/patches/patch-ag
index 1a199e4cd77..20120497898 100644
--- a/sysutils/mc/patches/patch-ag
+++ b/sysutils/mc/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.7 2000/03/03 23:56:42 tron Exp $
+$NetBSD: patch-ag,v 1.8 2000/10/19 23:31:18 jlam Exp $
 
---- vfs/extfs/uzip.in.orig	Tue Dec  7 00:49:56 1999
-+++ vfs/extfs/uzip.in	Thu Mar  2 22:25:30 2000
+--- vfs/extfs/uzip.in.orig	Mon Jul  3 10:32:00 2000
++++ vfs/extfs/uzip.in
 @@ -7,7 +7,7 @@
  #
  #
  
 -DZIP=/usr/bin
-+DZIP=@prefix@/bin
++DZIP=@LOCALBASE@
  XZIP="$DZIP/zip -g"
  XDZIP="$DZIP/zip -d"
  XUNZIP="$DZIP/unzip"
diff --git a/sysutils/mc/patches/patch-ah b/sysutils/mc/patches/patch-ah
index adb5da80f13..07ebe57587d 100644
--- a/sysutils/mc/patches/patch-ah
+++ b/sysutils/mc/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.2 2000/03/03 23:56:42 tron Exp $
+$NetBSD: patch-ah,v 1.3 2000/10/19 23:31:18 jlam Exp $
 
---- vfs/extfs/urar.in.orig	Tue Dec  7 00:49:56 1999
-+++ vfs/extfs/urar.in	Thu Mar  2 22:29:44 2000
+--- vfs/extfs/urar.in.orig	Mon Jul  3 10:32:00 2000
++++ vfs/extfs/urar.in
 @@ -5,7 +5,7 @@
  # Updated by christian.gennerat@alcatel.fr 1999
  # beta version 2.0
  #
 -DRAR=/usr/bin
-+DRAR=@prefix@/bin
++DRAR=@LOCALBASE@
  RAR=$DRAR/rar
  UNRAR=$DRAR/unrar # Prefer unrar (freeware)
  #
diff --git a/sysutils/mc/pkg/DESCR b/sysutils/mc/pkg/DESCR
index 12099f8ac3f..68a677db993 100644
--- a/sysutils/mc/pkg/DESCR
+++ b/sysutils/mc/pkg/DESCR
@@ -1,8 +1,4 @@
-This is version 4.5.25 of the Midnight Commander, a free Norton Commander
-Clone with many useful features. The Midnight Commander comes with
-mouse support on xterms.
-
-The Midnight Commander is a directory browsing tool which bears a
-certain remote resemblance to John Socha's Norton Commander for DOS.
-The Midnight Commander doesn't have all the bells and whistles of its
-DOS counterpart, but was written in much less time.
+Midnight Commander is a visual shell much like a file manager, only with way
+more features.  It is text mode, but also includes mouse support if you are
+running GPM.  Its coolest feature is the ability to ftp, view tar, zip
+files, and poke into RPMs for specific files.
diff --git a/sysutils/mc/pkg/PLIST b/sysutils/mc/pkg/PLIST
index e56bc8a98cd..b743e8c221f 100644
--- a/sysutils/mc/pkg/PLIST
+++ b/sysutils/mc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2000/06/01 17:54:26 rh Exp $
+@comment $NetBSD: PLIST,v 1.16 2000/10/19 23:31:18 jlam Exp $
 bin/mc
 bin/mcedit
 bin/mcmfmt
@@ -94,13 +94,14 @@ ${LOCALEBASE}/locale/pl/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/pt_BR/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/ro/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/ru/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/sv/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/wa/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/uk/LC_MESSAGES/mc.mo
-${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/sk/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/sl/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/sv/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/tr/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/uk/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/wa/LC_MESSAGES/mc.mo
 ${LOCALEBASE}/locale/zh_CN.GB2312/LC_MESSAGES/mc.mo
+${LOCALEBASE}/locale/zh_TW.Big5/LC_MESSAGES/mc.mo
 @dirrm lib/mc/term
 @dirrm lib/mc/syntax
 @dirrm lib/mc/extfs