Patches for mc-4.5.51

[Hubert Feyrer <hubert feyrer de>]

Hi!

below you will find some patches against mc-4.5.51 that are
currently part of the NetBSD Packages Collection, pkgsrc, to get your
software build properly on NetBSD and maybe some other platforms. We'd
be pleased if you could include as much of these patches into your next
release as possible, thanks!

FWIW, your software has a webpage at the NetBSD site, see

	http://www.NetBSD.org/packages/sysutils/mc/README.html

See http://www.NetBSD.org/Documentation/software/packages.html
to learn more about the NetBSD Packages Collection, to find out
more about the NetBSD operating system, see http://www.NetBSD.org/.


--- 8X --- 8X --- 8X --- 8X --- 8X --- 8X --- 8X --- 8X --- 8X --- 8X ---

$NetBSD: patch-aa,v 1.11 2002/10/08 17:27:20 wiz Exp $

--- configure.orig	Mon Jul  3 10:31:57 2000
+++ configure
@@ -3543,6 +3543,11 @@
 
 
 
+# Set DATADIRNAME to "${PKGLOCALEDIR}"
+DATADIRNAME="${PKGLOCALEDIR}"
+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
$NetBSD: patch-ab,v 1.10 2000/10/19 23:31:18 jlam Exp $

--- 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
 INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 AR = @AR@
 
 #
@@ -342,11 +343,11 @@
 	          $(DESTDIR)$(extfsdir)/$$I; \
 	done
 	for I in $(EXTFS_CONST) ; do \
-	    $(INSTALL_PROGRAM) $(srcdir)/extfs/$$I \
+	    $(INSTALL_SCRIPT) $(srcdir)/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)$(extfsdir)/$$I; \
 	done
 
$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)
$NetBSD: patch-ad,v 1.7 2002/10/23 08:49:07 bouyer Exp $

--- vfs/smbfs.c.orig	Mon Jul  3 16:31:59 2000
+++ vfs/smbfs.c	Tue Oct 22 22:29:12 2002
@@ -29,7 +29,9 @@
    confilcts with definitions in other includes */
 #undef HAVE_LIBREADLINE
 #define NO_CONFIG_H
+#ifndef SunOS
 #define BOOL_DEFINED
+#endif
 #include "samba/include/includes.h"
 
 #include <string.h>
@@ -375,7 +377,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;	*/
 
$NetBSD: patch-af,v 1.11 2000/10/19 23:31:18 jlam Exp $

--- 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 gtkedit edit src new_icons icons syntax @gnomecodedirs@
+unixdirs=intl $(codedirs) @gnomeunixdirs@ @POSUB@
 alldirs=$(unixdirs) $(foreigndirs) 
 subdirs=$(alldirs)
 
 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
-	$(INSTALL_PROGRAM) 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 $(mclibdir)"
$NetBSD: patch-ag,v 1.9 2002/07/24 04:30:16 hubertf Exp $

--- vfs/extfs/uzip.in.orig	Mon Jul  3 10:32:00 2000
+++ vfs/extfs/uzip.in
@@ -7,7 +7,7 @@
 #
 #
 
-DZIP=/usr/bin
+DZIP= LOCALBASE@/bin
 XZIP="$DZIP/zip -g"
 XDZIP="$DZIP/zip -d"
 XUNZIP="$DZIP/unzip"
$NetBSD: patch-ah,v 1.4 2002/07/24 04:30:16 hubertf Exp $

--- 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= LOCALBASE@/bin
 RAR=$DRAR/rar
 UNRAR=$DRAR/unrar # Prefer unrar (freeware)
 #
$NetBSD: patch-ae,v 1.7 2002/07/24 05:06:00 hubertf Exp $

--- vfs/extfs/ulha.in.orig	Wed Jul 24 06:52:24 2002
+++ vfs/extfs/ulha.in
@@ -34,11 +34,16 @@
 # Define your awk
 AWK= AWK@
 
-if ls -de . >& /dev/null;
+if ls -de . >/dev/null 2>&1 ;
 then
     LS_COMMAND="ls -le"
 else
-    LS_COMMAND="ls -l --full-time"
+    if ls -dT . >/dev/null 2>&1;		# BSD::ls -T == Linux::ls -e
+    then
+        LS_COMMAND="ls -lT"
+    else
+        LS_COMMAND="ls -l --full-time"
+    fi
 fi
 
 # Define which archiver you are using with appropriate options
$NetBSD: patch-ai,v 1.1 2002/10/08 17:27:20 wiz Exp $

--- vfs/samba/Makefile.in.orig	Tue Oct  8 19:13:16 2002
+++ vfs/samba/Makefile.in
@@ -518,8 +518,6 @@ $(srcdir)/include/config.h.in: $(srcdir)
 	@:
 
 $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in
-	cd $(srcdir) && $(AUTOHEADER)
-	@date -u > $@
 
 # automatic dependency tracking rules
 .deps/.dummy:
$NetBSD: patch-aj,v 1.1 2003/05/22 17:02:54 salo Exp $

--- slang/slang-mc.h.orig	2000-07-03 16:32:03.000000000 +0200
+++ slang/slang-mc.h	2003-05-22 18:43:06.000000000 +0200
@@ -25,6 +25,11 @@
 #  endif
 #endif /* __watcomc__ */
 
+#ifdef __NetBSD__
+#undef unix
+#define unix 1
+#endif
+
 #ifdef unix
 # ifndef __unix__
 #  define __unix__ 1