Update for NetBSD - correct the location of the elk files, correct the

filenames so that a -p1 arg to patch is no longer needed.

2 files changed, 41 insertions, 71 deletions

diff --git a/textproc/unroff/patches/patch-a b/textproc/unroff/patches/patch-a
index 0a5259af6f6..02d46e14653 100644
--- a/textproc/unroff/patches/patch-a
+++ b/textproc/unroff/patches/patch-a
@@ -1,68 +1,39 @@
-diff -cr unroff-1.0.orig/src/Makefile unroff-1.0/src/Makefile
-*** unroff-1.0.orig/src/Makefile	Wed Aug 23 14:12:48 1995
---- unroff-1.0/src/Makefile	Mon Feb 12 18:51:08 1996
-***************
-*** 1,14 ****
-  # $Revision: 1.1.1.1 $
-  
-  ###  You need a C compiler that compiles ANSI C code.
-! CC      = gcc
-! CFLAGS  = -Wall -pedantic -O
-  
-  ###  If you need additional linker flags add them here.
-! LDFLAGS =
-  
-  ###  The directory where the Elk installation resides on your system.
-! ELKDIR  = /usr/elk
-  
-  ###  Additional libraries.  You may want to insert the output of the
-  ###  shell-script $(ELKDIR)/lib/ldflags here.
---- 1,14 ----
-  # $Revision: 1.1.1.1 $
-  
-  ###  You need a C compiler that compiles ANSI C code.
-! #CC      = gcc
-! #CFLAGS  = -Wall -pedantic -O
-  
-  ###  If you need additional linker flags add them here.
-! LDFLAGS = -s
-  
-  ###  The directory where the Elk installation resides on your system.
-! ELKDIR  = ${PREFIX}/share/elk
-  
-  ###  Additional libraries.  You may want to insert the output of the
-  ###  shell-script $(ELKDIR)/lib/ldflags here.
-***************
-*** 18,24 ****
-  MAKEDEP = makedepend
-  
-  ###  The directory under which you will install the Scheme files.
-! DIR = /usr/local/lib/unroff
-  
-  ###  The default output format.
-  FORMAT = html
---- 18,24 ----
-  MAKEDEP = makedepend
-  
-  ###  The directory under which you will install the Scheme files.
-! DIR = ${PREFIX}/share/unroff
-  
-  ###  The default output format.
-  FORMAT = html
-***************
-*** 30,36 ****
-  ###  ------------------------------------------------------------------------- 
-  
-  SHELL   = /bin/sh
-! INCLUDE = -I$(ELKDIR)/include
-  ELK     = $(ELKDIR)/lib/module.o
-  DEFS    = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
-  CTAGS   = ctags -t -w
---- 30,36 ----
-  ###  ------------------------------------------------------------------------- 
-  
-  SHELL   = /bin/sh
-! INCLUDE = -I${PREFIX}/include/elk
-  ELK     = $(ELKDIR)/lib/module.o
-  DEFS    = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
-  CTAGS   = ctags -t -w
+*** src/Makefile	Wed Aug 23 14:12:48 1995
+--- src/Makefile	Mon Feb 12 18:51:08 1996
+@@ -1,14 +1,14 @@
+ # $Revision: 1.2 $
+ 
+ ###  You need a C compiler that compiles ANSI C code.
+-CC      = gcc
+-CFLAGS  = -Wall -pedantic -O
++#CC      = gcc
++#CFLAGS  = -Wall -pedantic -O
+ 
+ ###  If you need additional linker flags add them here.
+-LDFLAGS =
++LDFLAGS = -s
+ 
+ ###  The directory where the Elk installation resides on your system.
+-ELKDIR  = /usr/elk
++ELKDIR  = ${PREFIX}/lib/elk
+ 
+ ###  Additional libraries.  You may want to insert the output of the
+ ###  shell-script $(ELKDIR)/lib/ldflags here.
+@@ -18,7 +18,7 @@
+ 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.
+ FORMAT = html
+@@ -30,7 +30,7 @@
+ ###  ------------------------------------------------------------------------- 
+ 
+ SHELL   = /bin/sh
+-INCLUDE = -I$(ELKDIR)/include
++INCLUDE = -I${PREFIX}/include/elk
+ ELK     = $(ELKDIR)/lib/module.o
+ DEFS    = -DDEFAULT_DIR=\"$(DIR)\" -DDEFAULT_FORMAT=\"$(FORMAT)\"
+ CTAGS   = ctags -t -w
diff --git a/textproc/unroff/patches/patch-b b/textproc/unroff/patches/patch-b
index d846348ec27..11994397676 100644
--- a/textproc/unroff/patches/patch-b
+++ b/textproc/unroff/patches/patch-b
@@ -1,6 +1,5 @@
-diff -cr unroff-1.0.orig/src/error.c unroff-1.0/src/error.c
-*** unroff-1.0.orig/src/error.c	Fri Jun  2 15:16:00 1995
---- unroff-1.0/src/error.c	Mon Feb 12 18:53:17 1996
+*** src/error.c	Fri Jun  2 15:16:00 1995
+--- src/error.c	Mon Feb 12 18:53:17 1996
 ***************
 *** 39,45 ****
 --- 39,47 ----