Make sure proper prototypes are used for xmalloc() and the like so the

package actually works on PPC and other architectures where this matters.
Bump PKGREVISION.
This closes PR pkg/17377 by Andrew Cagney <cagney@mac.com>

4 files changed, 73 insertions, 3 deletions

diff --git a/devel/gtexinfo/Makefile b/devel/gtexinfo/Makefile
index 42f08b266cd..92c53b8534b 100644
--- a/devel/gtexinfo/Makefile
+++ b/devel/gtexinfo/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2002/04/04 11:10:21 seb Exp $
+# $NetBSD: Makefile,v 1.28 2002/08/10 23:22:02 rh Exp $
 #
 
 DISTNAME=		texinfo-4.0
-PKGNAME=		gtexinfo-4.0
+PKGNAME=		g${DISTNAME}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		${MASTER_SITE_GNU:=texinfo/}
 
diff --git a/devel/gtexinfo/distinfo b/devel/gtexinfo/distinfo
index f6fc0936382..6a72b1b01b3 100644
--- a/devel/gtexinfo/distinfo
+++ b/devel/gtexinfo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/01/05 18:42:55 tron Exp $
+$NetBSD: distinfo,v 1.6 2002/08/10 23:22:02 rh Exp $
 
 SHA1 (texinfo-4.0.tar.gz) = 09e944520672fcd8384f7b9fa96a20d9ec2b54c9
 Size (texinfo-4.0.tar.gz) = 1133487 bytes
@@ -9,3 +9,5 @@ SHA1 (patch-ad) = 26cd8dca34b816dc8cff224021e818225eedb716
 SHA1 (patch-ae) = 5b81d7eee82a745f297ce890940e99a591512461
 SHA1 (patch-af) = aaf33281da19658906eee6a922397968a200f186
 SHA1 (patch-ag) = 986c7172e0f71f1d107a59e89f0a74330d91cd40
+SHA1 (patch-ah) = 3dd7525fec5f9db2708c59a775a367cbd030c3c4
+SHA1 (patch-ai) = 8a1e92497d3a6cd5dec50ec9e9cf35046d214c8c
diff --git a/devel/gtexinfo/patches/patch-ah b/devel/gtexinfo/patches/patch-ah
new file mode 100644
index 00000000000..53d3639cdeb
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-ah
@@ -0,0 +1,19 @@
+$NetBSD: patch-ah,v 1.1 2002/08/10 23:22:02 rh Exp $
+
+--- lib/system.h.orig	Sun Jul 18 07:11:34 1999
++++ lib/system.h
+@@ -192,10 +192,10 @@
+ struct passwd *getpwnam ();
+ 
+ /* Our library routines not included in any system library.  */
+-extern void *xmalloc (), *xrealloc ();
+-extern char *xstrdup ();
+-extern void xexit ();
+-extern char *substring ();
++extern void *xmalloc (unsigned), *xrealloc (void *, unsigned);
++extern char *xstrdup (char *);
++extern void xexit (int);
++extern char *substring (char *, char *);
+ 
+ /* For convenience.  */
+ #define STREQ(s1,s2) (strcmp (s1, s2) == 0)
diff --git a/devel/gtexinfo/patches/patch-ai b/devel/gtexinfo/patches/patch-ai
new file mode 100644
index 00000000000..54c226a7c58
--- /dev/null
+++ b/devel/gtexinfo/patches/patch-ai
@@ -0,0 +1,48 @@
+$NetBSD: patch-ai,v 1.1 2002/08/10 23:22:02 rh Exp $
+
+--- lib/xmalloc.c.orig	Tue Jun 20 06:06:31 1995
++++ lib/xmalloc.c
+@@ -27,10 +27,11 @@
+ 
+ #if !defined (ALREADY_HAVE_XMALLOC)
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <sys/types.h>
+ 
+ extern void *malloc (), *realloc ();
+-static void memory_error_and_abort ();
++static void memory_error_and_abort (const char *);
+ 
+ /* **************************************************************** */
+ /*								    */
+@@ -42,8 +43,7 @@
+    to hold BYTES number of bytes.  If the memory cannot be allocated,
+    print an error message and abort. */
+ void *
+-xmalloc (bytes)
+-     int bytes;
++xmalloc (unsigned bytes)
+ {
+   void *temp = malloc (bytes);
+ 
+@@ -53,9 +53,7 @@
+ }
+ 
+ void *
+-xrealloc (pointer, bytes)
+-     void *pointer;
+-     int bytes;
++xrealloc (void *pointer, unsigned bytes)
+ {
+   void *temp;
+ 
+@@ -71,8 +69,7 @@
+ }
+ 
+ static void
+-memory_error_and_abort (fname)
+-     char *fname;
++memory_error_and_abort (const char *fname)
+ {
+   fprintf (stderr, "%s: Out of virtual memory!\n", fname);
+   abort ();