man: update to 1.6d

This commit is contained in:
Juergen Daubert 2006-06-17 08:42:53 +00:00
parent ace2ba2bc0
commit febbaca121
4 changed files with 17 additions and 29 deletions

View File

@ -1,3 +1,3 @@
a5617e86e5fb22dc38e40e1cd5ef00a4 makewhatis
16396f5af7ef4e090949973fe6bb1066 man-1.6c.patch
ac1e7d60dfedb7d1c6f398ae5b038996 man-1.6c.tar.gz
c3c75a115b15dc70be216d8e7cee9a19 man-1.6d.patch
36d3f65bcc10f0754a3234e00d92ad6d man-1.6d.tar.gz

View File

@ -3,7 +3,7 @@
# Maintainer: Per Lidén, core-ports at crux dot nu
name=man
version=1.6c
version=1.6d
release=1
source=(http://primates.ximian.com/~flucifredi/man/$name-$version.tar.gz \
makewhatis $name-$version.patch)

View File

@ -1,26 +0,0 @@
diff -Nru man-1.6c.orig/src/makewhatis.sh man-1.6c/src/makewhatis.sh
--- man-1.6c.orig/src/makewhatis.sh 2006-02-18 10:27:49.000000000 +0100
+++ man-1.6c/src/makewhatis.sh 2006-02-18 10:29:07.000000000 +0100
@@ -258,7 +258,7 @@
$2 ~ /^N[ÉE]V/ || $2 ~ /^NAMA/ || $2 ~ /^̾Á°/ ||
$2 ~ /^̾¾Î/ || $2 ~ /^À̸§/ || $2 ~ /^NAZWA/ ||
$2 ~ /^îáú÷áîéå/ || $2 ~ /^Ãû³Æ/ || $2 ~ /^¦WºÙ/ ||
- $2 ~ /^NOME/ || $2 ~ /^NAAM/) || $2 ~ /^ÈÌÅ/)) ||
+ $2 ~ /^NOME/ || $2 ~ /^NAAM/ || $2 ~ /^ÈÌÅ/)) ||
(pages == "cat" && $1 ~ /^NAME/)) {
if (!insh) {
insh = 1;
diff -Nru man-1.6c.orig/src/man.c man-1.6c/src/man.c
--- man-1.6c.orig/src/man.c 2006-02-18 10:27:49.000000000 +0100
+++ man-1.6c/src/man.c 2006-02-18 10:28:16.000000000 +0100
@@ -573,7 +573,9 @@
* .ev 1; .lt ...; .ev helps for my version of groff.
* The LL assignment is needed by the mandoc macros.
*/
- sprintf(eos(bufh), "echo \".ll %d.%di\"; ", ll/10, ll%10);
+ /* use the LL register instead of .ll to keep up with
+ * changes in the groff-1.18 series */
+ sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
#if 0
sprintf(eos(bufh), "echo \".lt %d.%di\"; ", ll/10, ll%10);

14
man/man-1.6d.patch Normal file
View File

@ -0,0 +1,14 @@
diff -Nru man-1.6d.orig/src/man.c man-1.6d/src/man.c
--- man-1.6d.orig/src/man.c 2006-06-17 10:33:32.000000000 +0200
+++ man-1.6d/src/man.c 2006-06-17 10:33:51.000000000 +0200
@@ -576,7 +576,9 @@
* .ev 1; .lt ...; .ev helps for my version of groff.
* The LL assignment is needed by the mandoc macros.
*/
- sprintf(eos(bufh), "echo \".ll %d.%di\"; ", ll/10, ll%10);
+ /* use the LL register instead of .ll to keep up with
+ * changes in the groff-1.18 series */
+ sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
sprintf(eos(bufh), "echo \".nr LL %d.%di\"; ", ll/10, ll%10);
#if 0
sprintf(eos(bufh), "echo \".lt %d.%di\"; ", ll/10, ll%10);