From f6d2debcf5748517af7db0a8961a73520f94ab5e Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 2 Aug 2004 16:14:24 +0000
Subject: Add two patches: . build fix for sparc64 . bug fix to make xorg-docs
 build Both from official groff CVS via Werner Lemberg.

Bump PKGREVISION.
---
 textproc/groff/Makefile         |  3 ++-
 textproc/groff/distinfo         |  4 +++-
 textproc/groff/patches/patch-ba | 47 +++++++++++++++++++++++++++++++++++++++++
 textproc/groff/patches/patch-bb | 20 ++++++++++++++++++
 4 files changed, 72 insertions(+), 2 deletions(-)
 create mode 100644 textproc/groff/patches/patch-ba
 create mode 100644 textproc/groff/patches/patch-bb

(limited to 'textproc/groff')

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 1c19b026bc0..302208dd51b 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/07/11 13:40:05 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2004/08/02 16:14:24 wiz Exp $
 #
 
 DISTNAME=	groff-1.19.1
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU:=groff/}
 
diff --git a/textproc/groff/distinfo b/textproc/groff/distinfo
index 10c8856b079..149ae38b0e5 100644
--- a/textproc/groff/distinfo
+++ b/textproc/groff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2004/07/11 13:40:05 wiz Exp $
+$NetBSD: distinfo,v 1.8 2004/08/02 16:14:24 wiz Exp $
 
 SHA1 (groff-1.19.1.tar.gz) = 82ba1b29b01c36bf41149ce8813cea712e3e6cbf
 Size (groff-1.19.1.tar.gz) = 2629152 bytes
@@ -6,3 +6,5 @@ SHA1 (patch-aa) = d0d1f387fefbb376eeec8ba824365cab2c1667fd
 SHA1 (patch-ab) = 3c50a8b758cf3ad9d31e449864bf07c09b396b92
 SHA1 (patch-ac) = 38f75d8261ca39aff8a37771a283c99ad39142bd
 SHA1 (patch-ae) = 18d553fe99ca6915d42de5f6edf74fc56e2fc650
+SHA1 (patch-ba) = cdafeefbde9490d0ed599a118fd34c06afac0f96
+SHA1 (patch-bb) = ddd9ef807a09eaaf7b09a3c05be3443945c67379
diff --git a/textproc/groff/patches/patch-ba b/textproc/groff/patches/patch-ba
new file mode 100644
index 00000000000..5e986260c18
--- /dev/null
+++ b/textproc/groff/patches/patch-ba
@@ -0,0 +1,47 @@
+$NetBSD: patch-ba,v 1.1 2004/08/02 16:14:24 wiz Exp $
+
+--- src/utils/hpftodit/hpftodit.cpp.orig	2004-04-07 18:25:21.000000000 +0200
++++ src/utils/hpftodit/hpftodit.cpp
+@@ -548,7 +548,8 @@ output_font_name(File &f)
+       *p++ = f.get_byte();
+   }
+   else			// value contains the string
+-    sprintf(font_name, "%.*s", count, (char*)(tag_info(font_name_tag).value));
++    sprintf(font_name, "%.*s",
++	    count, (char*)&(tag_info(font_name_tag).value));
+ 
+   // remove any trailing space
+   p = font_name + count - 1;
+@@ -717,13 +718,17 @@ read_and_output_pcltypeface(File &f)
+ {
+   printf("pcltypeface ");
+   require_tag(typeface_tag);
+-  f.seek(tag_info(typeface_tag).value);
+-  for (uint32 i = 0; i < tag_info(typeface_tag).count; i++) {
+-    unsigned char c = f.get_byte();
+-    if (c == '\0')
+-      break;
+-    putchar(c);
++  if (tag_info(typeface_tag).count > 4) {
++    f.seek(tag_info(typeface_tag).value);
++    for (uint32 i = 0; i < tag_info(typeface_tag).count; i++) {
++      unsigned char c = f.get_byte();
++      if (c == '\0')
++	break;
++      putchar(c);
++    }
+   }
++  else
++    printf("%.4s", (char *)&(tag_info(typeface_tag).value));
+   printf("\n");
+ }
+ 
+@@ -1168,7 +1173,7 @@ dump_ascii(File &f, tag_type t)
+       printf("%c", f.get_byte());
+   }
+   else
+-    printf("%.4s", (char*)(tag_info(t).value));
++    printf("%.4s", (char*)&(tag_info(t).value));
+   putchar('"');
+ }
+ 
diff --git a/textproc/groff/patches/patch-bb b/textproc/groff/patches/patch-bb
new file mode 100644
index 00000000000..47c78d7595c
--- /dev/null
+++ b/textproc/groff/patches/patch-bb
@@ -0,0 +1,20 @@
+$NetBSD: patch-bb,v 1.1 2004/08/02 16:14:24 wiz Exp $
+
+--- tmac/s.tmac.orig	2004-04-16 06:34:21.000000000 +0200
++++ tmac/s.tmac
+@@ -873,7 +873,6 @@ Foundation, 59 Temple Place - Suite 330,
+ .ds*end!\\n[\\n[.ev]:ds-type]
+ .nr \\n[.ev]:ds-type 0
+ ..
+-.als De DE
+ .de ds@auto-end
+ .if \\n[\\n[.ev]:ds-type] \{\
+ .	@error automatically terminating display
+@@ -951,7 +950,6 @@ Foundation, 59 Temple Place - Suite 330,
+ .	nr \\n[.ev]:ds-type 3
+ .\}
+ ..
+-.als Ds DS
+ .de ds@need
+ .if '\\n(.z'' \{\
+ .	while \\n[.t]<=(\\$1)&(\\n[nl]>\\n[pg@header-bottom]) \{\
-- 
cgit v1.2.3