From 0cab67ba63bda4d3f11b162e7130952cdc38ff1d Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Tue, 10 Jan 2006 16:34:09 +0000
Subject: Fix compilation against more recent ELK.

---
 textproc/unroff/distinfo         |  5 +++--
 textproc/unroff/patches/patch-aa | 25 +++++++++++++++++++------
 textproc/unroff/patches/patch-ad | 14 ++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)
 create mode 100644 textproc/unroff/patches/patch-ad

(limited to 'textproc/unroff')

diff --git a/textproc/unroff/distinfo b/textproc/unroff/distinfo
index 988702edb8e..20c03fac602 100644
--- a/textproc/unroff/distinfo
+++ b/textproc/unroff/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:48:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/01/10 16:34:09 joerg Exp $
 
 SHA1 (unroff/unroff-1.0.tar.gz) = bc8159ec7862de9f50666e79a538f46fdec4314c
 RMD160 (unroff/unroff-1.0.tar.gz) = 038567c4f767029dd2e6df8c33b5dad3309cb810
@@ -9,6 +9,7 @@ Size (unroff/me-misc-patch) = 39278 bytes
 SHA1 (unroff/misc-patch-2) = be14aea8569e30efdc25047f9c2497cb2c7ca96a
 RMD160 (unroff/misc-patch-2) = 394547f1d77b38c3cfd50101c70f796a0773de2f
 Size (unroff/misc-patch-2) = 78714 bytes
-SHA1 (patch-aa) = ad1fc9788742fdc04b1994778734358415ee23ea
+SHA1 (patch-aa) = 16c33c3df99779f5c6cfa8011a541281dad95409
 SHA1 (patch-ab) = 82eaf69d8df0098a1ae4fe64e533b34f0b51d3a6
 SHA1 (patch-ac) = a75301976655e2bfc928183b2f8168488c40c12e
+SHA1 (patch-ad) = 76276cb4f590ffaf835952eb6f2fae16358c0b90
diff --git a/textproc/unroff/patches/patch-aa b/textproc/unroff/patches/patch-aa
index 02162f9374c..806140569b6 100644
--- a/textproc/unroff/patches/patch-aa
+++ b/textproc/unroff/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2001/04/05 15:54:57 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2006/01/10 16:34:09 joerg Exp $
 
---- src/Makefile.orig	Wed Aug 23 14:12:48 1995
-+++ src/Makefile	Wed Dec  8 15:10:43 1999
-@@ -2,12 +2,12 @@
+--- src/Makefile.orig	1995-08-23 12:12:48.000000000 +0000
++++ src/Makefile
+@@ -2,16 +2,16 @@
  
  ###  You need a C compiler that compiles ANSI C code.
 -CC      = gcc
@@ -19,17 +19,30 @@ $NetBSD: patch-aa,v 1.1 2001/04/05 15:54:57 wiz Exp $
 +ELKDIR  = ${PREFIX}/lib/elk
  
  ###  Additional libraries.  You may want to insert the output of the
-@@ -19,5 +19,5 @@
+ ###  shell-script $(ELKDIR)/lib/ldflags here.
+-LIBS    = -lm
++LIBS    = ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lelk -lm
+ 
+ ###  The makedepend program (it's usually installed with the X11 binaries).
+@@ -19,5 +19,5 @@ MAKEDEP = makedepend
  
  ###  The directory under which you will install the Scheme files.
 -DIR = /usr/local/lib/unroff
 +DIR = ${PREFIX}/share/unroff
  
  ###  The default output format.
-@@ -31,5 +31,5 @@
+@@ -31,5 +31,5 @@ FORMAT = html
  
  SHELL   = /bin/sh
 -INCLUDE = -I$(ELKDIR)/include
 +INCLUDE = -I${PREFIX}/include/elk
  ELK     = $(ELKDIR)/lib/module.o
  DEFS    = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
+@@ -68,6 +68,5 @@ OBJECTS	= \
+ 	subst.o\
+ 	table.o\
+-	unroff.o\
+-	$(ELK)
++	unroff.o
+ 
+ ALL	= unroff
diff --git a/textproc/unroff/patches/patch-ad b/textproc/unroff/patches/patch-ad
new file mode 100644
index 00000000000..9a9fb066d3d
--- /dev/null
+++ b/textproc/unroff/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.1 2006/01/10 16:34:09 joerg Exp $
+
+--- src/error.h.orig	2006-01-10 16:20:51.000000000 +0000
++++ src/error.h
+@@ -12,9 +12,5 @@ void read_error(char *) NORETURN;
+ void write_error(char *) NORETURN;
+ void open_error(char *) NORETURN;
+ 
+-/* Redefined to add NORETURN
+- */
+-extern Primitive_Error() NORETURN;
+-
+ char *printable_string(char *, int);
+ char *printable_char(char);
-- 
cgit v1.2.3