SOURCES: man-manpaths.patch, man-nls-priority.patch, man-roff.patc...

[arekm]

Author: arekm                        Date: Mon Jan 28 09:38:58 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- update

---- Files affected:
SOURCES:
   man-manpaths.patch (1.11 -> 1.12) , man-nls-priority.patch (1.6 -> 1.7) , man-roff.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/man-manpaths.patch
diff -u SOURCES/man-manpaths.patch:1.11 SOURCES/man-manpaths.patch:1.12
--- SOURCES/man-manpaths.patch:1.11	Wed Mar  9 23:07:01 2005
+++ SOURCES/man-manpaths.patch	Mon Jan 28 10:38:52 2008
@@ -19,18 +19,21 @@
  do
      if [ -d $d ]; then
  	if [ x$dc = x ]; then dc=$d; else dc=$dc:$d; fi
-@@ -393,13 +393,7 @@
+
+--- man-1.6f/src/makewhatis.sh~	2008-01-28 10:29:04.000000000 +0100
++++ man-1.6f/src/makewhatis.sh	2008-01-28 10:30:27.277670692 +0100
+@@ -185,13 +185,7 @@
+ 	echo "about to enter $mandir" > /dev/stderr
+      fi
  
-        cd $here
+-     # kludge for Slackware's /usr/man/preformat
+-     if [ $mandir = /usr/man/preformat ]
+-     then
+-	mandir1=/usr/man
+-     else
+-	mandir1=$mandir
+-     fi
++     mandir1=$mandir
  
--       # kludge for Slackware's /usr/man/preformat
--       if [ $mandir = /usr/man/preformat ]
--       then
--	 mandir1=/usr/man
--       else
--	 mandir1=$mandir
--       fi
-+       mandir1=$mandir
- 
-        if [ -f ${mandir1}/whatis ]
-        then
+      # if $mandir is on a readonly partition, and the whatis file
+      # is not a symlink, then let's skip trying to update it

================================================================
Index: SOURCES/man-nls-priority.patch
diff -u SOURCES/man-nls-priority.patch:1.6 SOURCES/man-nls-priority.patch:1.7
--- SOURCES/man-nls-priority.patch:1.6	Wed Mar  9 22:51:56 2005
+++ SOURCES/man-nls-priority.patch	Mon Jan 28 10:38:52 2008
@@ -32,7 +32,7 @@
  
 --- man-1.5p/src/gripes.c.orig	2005-01-08 09:01:21.000000000 +0100
 +++ man-1.5p/src/gripes.c	2005-03-09 22:43:31.254314432 +0100
-@@ -49,12 +49,12 @@
+@@ -49,11 +49,11 @@
  	     */
  	    char *s, *lg;
  	    s = getenv("NLSPATH");
@@ -42,12 +42,10 @@
  		    lg = getenv("LC_MESSAGES");
  	    if (!lg)
 -		    lg = getenv("LC_ALL");
--	    if (lg && strncmp(lg, "en", 2) && strcmp(lg, "C")) {
 +		    lg = getenv("LANG");
-+	    if (lg && strncmp(lg, "en", 2) && strcmp(lg, "C") && strcmp(lg, "POSIX")) {
+ 	    if (lg && strncmp(lg, "en", 2) && strcmp(lg, "C") && strcmp(lg, "POSIX")) {
  		fprintf(stderr,
  		  "Cannot open the message catalog \"%s\" for locale \"%s\"\n"
- 		  "(NLSPATH=\"%s\")\n\n",
 diff -Nur man-1.5k.orig/src/man.c man-1.5k/src/man.c
 --- man-1.5k.orig/src/man.c	Sun Oct 14 11:05:49 2001
 +++ man-1.5k/src/man.c	Sun Oct 14 11:06:00 2001

================================================================
Index: SOURCES/man-roff.patch
diff -u SOURCES/man-roff.patch:1.4 SOURCES/man-roff.patch:1.5
--- SOURCES/man-roff.patch:1.4	Sun Aug 10 13:50:50 2003
+++ SOURCES/man-roff.patch	Mon Jan 28 10:38:53 2008
@@ -1,17 +1,17 @@
 diff -urN man-1.5h1.org/src/man.c man-1.5h1/src/man.c
 --- man-1.5h1.org/src/man.c	Tue Mar 13 21:03:10 2001
 +++ man-1.5h1/src/man.c	Tue Mar 13 21:04:24 2001
-@@ -307,7 +307,9 @@
+@@ -345,7 +345,9 @@
  	       gripe (EXPANSION_FAILED, command);
  	       return (NULL);
  	  }
 -	  fgr = fgets (buf, sizeof(buf), fp);
 +	  do {
-+	       fgr = fgets (buf, sizeof(buf), fp);
++		  fgr = fgets (buf, sizeof(buf), fp);
 +	  } while (fgr != NULL && (buf[0] == '\n' || !strncmp(buf,".\\\"",3)));
- 	  pclose (fp);
- 	  expfl = 1;
-      } else {
+ 
+           #ifdef __APPLE__
+           /* Man 1.5x randomly freezes under Mac OS X 10.4.7 when the 
 @@ -334,7 +336,9 @@
  	       gripe (OPEN_ERROR, name);
  	       return (NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/man-manpaths.patch?r1=1.11&r2=1.12&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/man-nls-priority.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/man-roff.patch?r1=1.4&r2=1.5&f=u