Update to 1.31.18. PR: ports/41224 after very long maintainer timeout.

4 files changed, 12 insertions, 107 deletions

diff --git a/textproc/yodl/files/patch-aa b/textproc/yodl/files/patch-aa
deleted file mode 100644
index 2c9c8c4..0000000
--- a/textproc/yodl/files/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile	Thu Apr 22 17:49:36 1999
-+++ Makefile.new	Thu Jun  8 21:21:07 2000
-@@ -6,16 +6,17 @@
- 
- # A `lib' directory under which ...../yodl will be attached, as the
- # system-wide include directory for macros of the yodl program?
--LIBDIR=/usr/local/lib
-+LOCALBASE?=/usr/local
-+LIBDIR=${LOCALBASE}/lib
- 
- # To what directory are the yodl program and all shell scripts installed?
--BINDIR = /usr/local/bin
-+BINDIR = ${LOCALBASE}/bin
- 
- # Where do your man pages go? MANPREFIX is where the subdirs man1, man2 etc.
- # are located, CATPREFIX is where subdirs cat1, cat2 etc. are, that's
- # where formatted pages go.
--MANPREFIX=/usr/local/man
--CATPREFIX=/usr/local/man
-+MANPREFIX=${LOCALBASE}/man
-+CATPREFIX=${LOCALBASE}/man
- 
- # What's your LaTeX command? The shellscript "yodl2dvi" will run "yodl2tex" and
- # your LaTeX-er for you, creating the .dvi file. LaTeX is also used in
-@@ -37,13 +38,13 @@
- 
- # What's your pager, a-la "less"? Will be used in the "yodl2manless"
- # and "yodl2msless" scripts that show groff output in ASCII via a pager.
--LESS = less
-+LESS = more
- 
- # The C compiler?
--CC = cc
-+CC ?= cc
- 
- # Compiler flags?
--CFLAGS = -c -O2 -Kalloca
-+CFLAGS += -c
- 
- # Installation program? If you don't have install, make sure that you state
- # something that also strips executables.
-@@ -81,7 +82,7 @@
- # shell will do too, but I suggest that you get bash if you don't have it
- # yet. I have it installed as /bin/sh, lucky me.
- # Define the path of your bash below:
--BASH = /bin/bash
-+BASH = /bin/sh
- 
- # Some systems seem to lack the function strerror() (I've heard of SunOS 4.1.4
- # with GCC 2.6). If that's the case, uncomment the following:
diff --git a/textproc/yodl/files/patch-ab b/textproc/yodl/files/patch-ab
deleted file mode 100644
index ccde70d..0000000
--- a/textproc/yodl/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/yodlfixlabels/yodlfixlabels.h	Wed Oct 16 03:38:41 1996
-+++ src/yodlfixlabels/yodlfixlabels.h.new	Thu Jun  8 21:23:20 2000
-@@ -1,7 +1,6 @@
- 
- /* required standard includes */
- #include <ctype.h>
--#include <malloc.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
diff --git a/textproc/yodl/files/patch-ac b/textproc/yodl/files/patch-ac
deleted file mode 100644
index de1d6ae..0000000
--- a/textproc/yodl/files/patch-ac
+++ /dev/null
@@ -1,47 +0,0 @@
---- manpages/Makefile.in.orig	Fri Jan 24 05:42:52 1997
-+++ manpages/Makefile.in	Fri Mar  3 10:01:20 2000
-@@ -7,4 +7,2 @@
- 
--SHELL=__BASH__
--
- man1=$(MANPREFIX)/man1
-@@ -24,6 +22,6 @@
- yodl.man: yodl.yo ../Makefile
--	yodl2man $<
-+	yodl2man yodl.yo
- 
- $(man1)/yodl.1: yodl.man
--	cp $< $@
-+	cp yodl.man $@
-         
-@@ -34,6 +32,6 @@
- yodlconverters.man: yodlconverters.yo ../Makefile
--	yodl2man $<
-+	yodl2man yodlconverters.yo
- 
- $(man1)/yodlconverters.1: yodlconverters.man
--	cp $< $@
-+	cp yodlconverters.man $@
-         
-@@ -48,3 +46,3 @@
- $(man7)/yodlmacros.7: yodlmacros.man
--	cp $< $@
-+	cp yodlmacros.man $@
-         
-@@ -55,6 +53,6 @@
- yodlmanpage.man: yodlmanpage.yo ../Makefile
--	yodl2man $<
-+	yodl2man yodlmanpage.yo
- 
- $(man7)/yodlmanpage.7: yodlmanpage.man
--	cp $< $@
-+	cp yodlmanpage.man $@
- 
-@@ -65,6 +63,6 @@
- striproff.man: striproff.yo ../Makefile
--	yodl2man $<
-+	yodl2man striproff.yo
- 
- $(man1)/striproff.1: striproff.man
--	cp $< $@
-+	cp striproff.man $@
diff --git a/textproc/yodl/files/patch-src.lib.lib.h b/textproc/yodl/files/patch-src.lib.lib.h
new file mode 100644
index 0000000..7f4b962
--- /dev/null
+++ b/textproc/yodl/files/patch-src.lib.lib.h
@@ -0,0 +1,12 @@
+--- src/lib/lib.h.orig	Wed Jul 31 23:08:06 2002
++++ src/lib/lib.h	Wed Jul 31 23:08:35 2002
+@@ -16,7 +16,7 @@
+ 
+ #if HAVE_MALLOC_H
+ #   include <malloc.h>
+-#elif defined STDC_HEADERS
++#elif defined STDC_HEADERS && !defined __FreeBSD__
+     extern void free PARAMS ((char *));
+     extern char *malloc PARAMS ((int));
+     extern char *realloc PARAMS ((char*, int));
+--- patch-src.lib.lib.h ends here ---