| author | Vladimir Marek <Vladimir.Marek@oracle.com> |
| Wed, 28 May 2014 10:46:33 +0200 | |
| changeset 1926 | d37b02d5beee |
| parent 1883 | bb9b7c4fd9b7 |
| child 4121 | 3e66a10136ab |
| permissions | -rw-r--r-- |
|
1883
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
1 |
Make sure that this groffer sub-script uses the GNU version of soelim. |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
2 |
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
3 |
--- groff-1.22.2/contrib/groffer/perl/func.pl.orig 2013-11-20 13:51:20.387873317 -0800 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
4 |
+++ groff-1.22.2/contrib/groffer/perl/func.pl 2013-11-20 13:52:29.569174110 -0800 |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
5 |
@@ -271,7 +271,7 @@ |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
6 |
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
7 |
my $soelim_r = ''; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
8 |
$soelim_r = '-r' |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
9 |
- if ! system("echo -n '' | soelim -r 2>$main::Dev_Null >$main::Dev_Null");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
10 |
+ if ! system("echo -n '' | /usr/gnu/bin/soelim -r 2>$main::Dev_Null >$main::Dev_Null");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
11 |
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
12 |
########## |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
13 |
# to_tmp (<filename>) |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
14 |
@@ -410,7 +410,7 @@ |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
15 |
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
16 |
unlink $tmp_tmp if -e $tmp_tmp; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
17 |
rename $tmp_file, $tmp_tmp; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
18 |
- system("soelim -I$dir $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
19 |
+ system("/usr/gnu/bin/soelim -I$dir $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
20 |
unlink $tmp_tmp if -e $tmp_tmp; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
21 |
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
22 |
} else { # $Filespec_Is_Man is empty
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
23 |
@@ -421,9 +421,9 @@ |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
24 |
} |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
25 |
close $fh_tmp; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
26 |
if ($dir) {
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
27 |
- system("soelim -I$dir $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
28 |
+ system("/usr/gnu/bin/soelim -I$dir $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
29 |
} else {
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
30 |
- system("soelim $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
31 |
+ system("/usr/gnu/bin/soelim $soelim_r $tmp_tmp >$tmp_file");
|
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
32 |
} |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
33 |
unlink $tmp_tmp; |
|
bb9b7c4fd9b7
PSARC 2013/394 groff version 1.22.2
Rich Burridge <rich.burridge@oracle.com>
parents:
diff
changeset
|
34 |
} # if ($Filespec_Is_Man) |