[Groff-commit] groff/contrib/groffer version.sh perl/groffer.p...

[Bernd Warken]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Bernd Warken <bwarken>  11/01/26 23:20:54

Modified files:
        contrib/groffer: version.sh 
        contrib/groffer/perl: groffer.pl man.pl 

Log message:
        Bug fix by James Budiono.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/version.sh?cvsroot=groff&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/groffer.pl?cvsroot=groff&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/man.pl?cvsroot=groff&r1=1.3&r2=1.4

Patches:
Index: version.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/version.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- version.sh  5 Jan 2009 20:10:39 -0000       1.17
+++ version.sh  26 Jan 2011 23:20:53 -0000      1.18
@@ -5,7 +5,7 @@
 # Source file position: <groff-source>/contrib/groffer/version.sh
 # Installed position: <prefix>/lib/groff/groffer/version.sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2011
 #   Free Software Foundation, Inc.
 # Written by Bernd Warken
 
@@ -29,10 +29,10 @@
 export _PROGRAM_VERSION;
 export _LAST_UPDATE;
 
-_PROGRAM_VERSION='1.1.1';
-_LAST_UPDATE='03 Jan 2009';
+_PROGRAM_VERSION='1.1.2';
+_LAST_UPDATE='26 Jan 2011';
 
 # this setting of the groff version is only used before make is run,
 # otherwise @VERSION@ will set it, see groffer.sh.
 export _GROFF_VERSION_PRESET;
-_GROFF_VERSION_PRESET='1.20preset';
+_GROFF_VERSION_PRESET='1.21';

Index: perl/groffer.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/perl/groffer.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- perl/groffer.pl     5 Jan 2009 20:10:40 -0000       1.8
+++ perl/groffer.pl     26 Jan 2011 23:20:53 -0000      1.9
@@ -5,10 +5,10 @@
 # Source file position: <groff-source>/contrib/groffer/perl/groffer.pl
 # Installed position: <prefix>/bin/groffer
 
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 5 Jan 2009
+# Last update: 26 Jan 2011
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -193,9 +193,9 @@
               'HTML' => ['konqueror', 'epiphany'. 'mozilla-firefox',
                          'firefox', 'mozilla', 'netscape', 'galeon', 'opera',
                          'amaya','arena', 'mosaic'],
-              'PDF' => ['kpdf', 'acroread', 'evince', 'xpdf -z 150', 'gpdf',
+              'PDF' => ['okular', 'kpdf', 'acroread', 'evince', 'xpdf -z 150', 
'gpdf',
                         'kghostview --scale 1.45', 'ggv'],
-              'PS' => ['kpdf', 'kghostview --scale 1.45', 'evince', 'ggv',
+              'PS' => ['okular', 'kpdf', 'kghostview --scale 1.45', 'evince', 
'ggv',
                        'gv', 'ghostview', 'gs_x11', 'gs'],
               'TTY' => ['xless'],
               'X' => ['gxditview', 'xditview'],
@@ -1323,8 +1323,8 @@
     if (%prog) {
       $Display{'PROG'} = $prog{'fullname'};
       $Display{'ARGS'} = $prog{'args'};
+      return 1;  # james bug fix
     }
-    return 1;
   }
   return 0;
 } # _get_first_prog() of main_set_mode()

Index: perl/man.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/perl/man.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- perl/man.pl 5 Jan 2009 20:10:40 -0000       1.3
+++ perl/man.pl 26 Jan 2011 23:20:54 -0000      1.4
@@ -5,10 +5,10 @@
 # Source file position: <groff-source>/contrib/groffer/perl/man.pl
 # Installed position: <prefix>/lib/groff/groffer/man.pl
 
-# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 # Written by Bernd Warken.
 
-# Last update: 5 Jan 2009
+# Last update: 26 Jan 2011
 
 # This file is part of `groffer', which is part of `groff'.
 
@@ -522,7 +522,8 @@
   my @path =
     qw( /usr/local /usr /usr/X11R6 /usr/openwin /opt /opt/gnome /opt/kde );
   # get a basic man path from $ENV{PATH}
-  foreach (@main::Path) {
+  my @path2 = @main::Path; # james bug fix
+  foreach (@path2) { # james bug fix
     s#bin/*$##;
     push @path, $_;
   }