mc-4.6.0-pre1 -- some (groff>=1.18 related) problems

[Peter Breitenlohner <peb mppmu mpg de>]

Hi,

I recently replaced our old mc version with mc-4.6.0-pre1 (on linux/gnu, no
distribution -- not that this matters much) and encountered the following
problems:

1. With groff >=1.18 nroff needs an additional option "-c", certainly
for mc's internal viewer and most probably equally for the external pager.

2. On our systems zip/unzip are installed in /usr/local/bin and not /usr/bin

I have fixed both of these problems in a brute foce way by the attached
patch mc-4.6.0-pre1-diffs, but of course both of these problems ought to be
properly handled by configure. (I just wanted to avoid using autoconf, which
often gets tedious whith differing autoconf versions).

Note in particular, that nroff from groff<1.18 does NOT accept "-c", so
this definitely must be tested by configure!

3. We always use --disable-nls since we don't care much for message
translations. (Please don't misunderstand me: I know they are important, we
just happen do not need them and therefore don't want to install them).

But even with --disable-nls, the translated manpages get installed. I really
think this should either be automatically disabled by --disable-nls or,
preferably, there should be a separate configure option (e.g.
--disable-nls-data or --disable-nls-man). Alternatively configure could detect the
presence or absence of the apropriate directories (per language?) and install
translated manpages to, say $(DESTDIR)/usr/man/ru/man1 if and only if
/usr/man/ru/man1 already exists. Hopefully automake/autoconf will sooner
or later find a standardized way to handle such questions, but for the
moment a more simplistic approch would suffice.

The attached patch mc-4.6.0-pre1-lang is my very limited and brute force
approach to this question.

regards
Peter Breitenlohner <peb mppmu mpg de>

diff -ur mc-4.6.0-pre1.orig/lib/mc.ext.in mc-4.6.0-pre1/lib/mc.ext.in
--- mc-4.6.0-pre1.orig/lib/mc.ext.in	2002-08-19 06:16:30.000000000 +0200
+++ mc-4.6.0-pre1/lib/mc.ext.in	2002-11-28 13:37:38.000000000 +0100
@@ -149,8 +149,8 @@
 	View=%view{ascii} file %f && nm %f
 
 regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|n)|\.man)$
-	Open=nroff @TROFFASCII@ @MANDOC@ %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ %f
+	Open=nroff -c TROFFASCII@ @MANDOC@ %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff -c TROFFASCII@ @MANDOC@ %f
 
 # Troff with me macros.
 # Exception - "read.me" is not a nroff file.
@@ -159,26 +159,26 @@
 	View=
 
 shell/.me
-	Open=nroff @TROFFASCII@ -me %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -me %f
+	Open=nroff -c TROFFASCII@ -me %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff -c TROFFASCII@ -me %f
 
 # Troff with ms macros.
 shell/.ms
-	Open=nroff @TROFFASCII@ -ms %f | %var{PAGER:more}
-	View=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f
+	Open=nroff -c TROFFASCII@ -ms %f | %var{PAGER:more}
+	View=%view{ascii,nroff} nroff -c TROFFASCII@ -ms %f
 
 # Manual page - compressed
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.g?[Zz]$
-	Open=gzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} gzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=gzip -dc %f | nroff -c TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} gzip -dc %f | nroff -c TROFFASCII@ @MANDOC@
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz$
-	Open=bzip -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} bzip -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=bzip -dc %f | nroff -c TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip -dc %f | nroff -c TROFFASCII@ @MANDOC@
 
 regex/([^0-9]|^[^\.]*)\.([1-9][a-z]?|n)\.bz2$
-	Open=bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@ | %var{PAGER:more}
-	View=%view{ascii,nroff} bzip2 -dc %f | nroff @TROFFASCII@ @MANDOC@
+	Open=bzip2 -dc %f | nroff -c TROFFASCII@ @MANDOC@ | %var{PAGER:more}
+	View=%view{ascii,nroff} bzip2 -dc %f | nroff -c TROFFASCII@ @MANDOC@
 
 
 ### Images ###
diff -ur mc-4.6.0-pre1.orig/vfs/extfs/uzip mc-4.6.0-pre1/vfs/extfs/uzip
--- mc-4.6.0-pre1.orig/vfs/extfs/uzip	2002-01-23 02:29:17.000000000 +0100
+++ mc-4.6.0-pre1/vfs/extfs/uzip	2002-11-22 13:17:08.000000000 +0100
@@ -15,9 +15,9 @@
 #
 
 # Location of the zip program
-my $app_zip = '/usr/bin/zip';
+my $app_zip = '/usr/local/bin/zip';
 # Location of the unzip program
-my $app_unzip = '/usr/bin/unzip';
+my $app_unzip = '/usr/local/bin/unzip';
 # Set this to 1 if zipinfo (unzip -Z) is to be used (recommended), otherwise 0.
 my $op_has_zipinfo = 1;
 

diff -ur mc-4.6.0-pre1.orig/doc/Makefile.am mc-4.6.0-pre1/doc/Makefile.am
--- mc-4.6.0-pre1.orig/doc/Makefile.am	2002-08-20 04:57:23.000000000 +0200
+++ mc-4.6.0-pre1/doc/Makefile.am	2002-11-22 13:11:07.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = es hu it ru
+SUBDIRS =
 
 if MCSERV_INSTALL
 man_MANS = mc.1 mcedit.1 mcserv.8
diff -ur mc-4.6.0-pre1.orig/doc/Makefile.in mc-4.6.0-pre1/doc/Makefile.in
--- mc-4.6.0-pre1.orig/doc/Makefile.in	2002-08-21 09:32:54.000000000 +0200
+++ mc-4.6.0-pre1/doc/Makefile.in	2002-11-22 13:11:08.000000000 +0100
@@ -132,7 +132,7 @@
 mcserv = @mcserv@
 smbfs = @smbfs@
 undelfs_o = @undelfs_o@
-SUBDIRS = es hu it ru
+SUBDIRS =
 
 @MCSERV_INSTALL_TRUE man_MANS = mc.1 mcedit.1 mcserv.8
 @MCSERV_INSTALL_FALSE man_MANS = mc.1 mcedit.1