Remove LIBC hack, shouldn't be needed anymore.

Express interest in nroff via USE_TOOLS.
Expect sys/types.h to provide size_t.
Fix errno.
Don't define prototypes for ISO C / POSIX functions.
short gets promoted to int, float to double, so use va_arg with the
promoted types.

7 files changed, 133 insertions, 8 deletions

diff --git a/mail/elm/Makefile b/mail/elm/Makefile
index 21067d0d2bd..a1ac1d1613f 100644
--- a/mail/elm/Makefile
+++ b/mail/elm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2006/01/19 14:51:38 tron Exp $
+# $NetBSD: Makefile,v 1.38 2006/01/24 22:47:13 joerg Exp $
 
 DISTNAME=		elm2.5.8
 PKGNAME=		elm-2.5.8
@@ -17,15 +17,10 @@ CONFLICTS+=		elm-me-[0-9]*
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	./Configure
 CONFIGURE_ARGS+=	-d
+USE_TOOLS=		nroff
 
 .include "../../mk/bsd.prefs.mk"
 
-.if (${OPSYS} == Darwin)
-LIBC=			/usr/lib/libSystem.dylib
-.else
-LIBC=			/usr/lib/libc.so
-.endif
-
 pre-configure:
 	${CP} ${FILESDIR}/config.sh ${WRKSRC}/config.sh.orig
 	${SED} -e 's:PREFIX:${PREFIX}:g' \
diff --git a/mail/elm/distinfo b/mail/elm/distinfo
index 4f2f9f57ff5..f690698e28f 100644
--- a/mail/elm/distinfo
+++ b/mail/elm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2006/01/19 14:51:38 tron Exp $
+$NetBSD: distinfo,v 1.10 2006/01/24 22:47:13 joerg Exp $
 
 SHA1 (elm2.5.8.tar.gz) = bf09df75d0dc9097a1e69591bfb4872f860e00c7
 RMD160 (elm2.5.8.tar.gz) = c12dbefd0bf9d47ee4438673507a4693c4a6808c
@@ -10,3 +10,8 @@ SHA1 (patch-ad) = de6e99072ad6379126bb1e6d798bc2cd851a92ed
 SHA1 (patch-ae) = 1d3fa90fbe037cc8f81202b6a1ad779b74298c4d
 SHA1 (patch-af) = 7e08a1595ff31bcb1f45433d20693b4e0c5bf824
 SHA1 (patch-ag) = e7bb5d94736a7a1dd8616a7e8f88c4c5c64059d1
+SHA1 (patch-ah) = 142735922d6d58f08823dbc68540e6c9faf1eac9
+SHA1 (patch-ai) = 0564267f91fa54405c900f0d51f0f64ecc9e0277
+SHA1 (patch-aj) = e129e633f8def8cd529b03014d6818b1eb59d220
+SHA1 (patch-ak) = 2169bc9d28077d8c5e6cd298b3891731f0b611b8
+SHA1 (patch-al) = fe79a8d235c815728398e8052005755ea44c257a
diff --git a/mail/elm/patches/patch-ah b/mail/elm/patches/patch-ah
new file mode 100644
index 00000000000..f3a8858d849
--- /dev/null
+++ b/mail/elm/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2006/01/24 22:47:13 joerg Exp $
+
+--- hdrs/elm_defs.h.orig	2006-01-24 19:52:27.000000000 +0000
++++ hdrs/elm_defs.h
+@@ -103,11 +103,6 @@
+ # define FALSE		0
+ #endif
+ 
+-#ifndef _SIZE_T  /* not the greatest, but should work until I make Configure figure it out */
+-#define _SIZE_T
+-typedef unsigned long size_t;
+-#endif
+-
+ #define KLICK		32	/* increment for alias and mssg lists	    */
+ 
+ #define TLEN		10	/* super short (tiny) strings		    */
diff --git a/mail/elm/patches/patch-ai b/mail/elm/patches/patch-ai
new file mode 100644
index 00000000000..c557a6aa216
--- /dev/null
+++ b/mail/elm/patches/patch-ai
@@ -0,0 +1,14 @@
+$NetBSD: patch-ai,v 1.1 2006/01/24 22:47:13 joerg Exp $
+
+--- hdrs/elm_lib.h.orig	2006-01-24 19:53:20.000000000 +0000
++++ hdrs/elm_lib.h
+@@ -67,8 +67,8 @@ int elm_access P_((const char *, int));
+ 
+ 
+ /* errno.c */
++#include <errno.h>
+ 
+-extern int errno;
+ #ifndef STRERROR
+ char *strerror P_((int));
+ #endif
diff --git a/mail/elm/patches/patch-aj b/mail/elm/patches/patch-aj
new file mode 100644
index 00000000000..5f3b224a000
--- /dev/null
+++ b/mail/elm/patches/patch-aj
@@ -0,0 +1,44 @@
+$NetBSD: patch-aj,v 1.1 2006/01/24 22:47:13 joerg Exp $
+
+--- config.h.SH.orig	2005-08-18 12:49:24.000000000 +0000
++++ config.h.SH
+@@ -40,34 +40,34 @@ sed <<!GROK!THIS! >config.h -e 's!^#unde
+ /* GETOPT:
+  *	This symbol, if defined, indicates that the getopt() routine exists.
+  */
+-#$d_getopt	GETOPT		/**/
++#define	GETOPT		/**/
+ 
+ /* MEMCPY:
+  *	This symbol, if defined, indicates that the memcpy routine is available
+  *	to copy blocks of memory.  Otherwise you should probably use bcopy().
+  *	If neither is defined, roll your own.
+  */
+-#$d_memcpy	MEMCPY		/**/
++#define	MEMCPY		/**/
+ 
+ /* MKDIR:
+  *	This symbol, if defined, indicates that the mkdir routine is available
+  *	to create directories.  Otherwise you should fork off a new process to
+  *	exec /bin/mkdir.
+  */
+-#$d_mkdir	MKDIR		/**/
++#define	MKDIR		/**/
+ 
+ /* RENAME:
+  *	This symbol, if defined, indicates that the rename routine is available
+  *	to rename files.  Otherwise you should do the unlink(), link(), unlink()
+  *	trick.
+  */
+-#$d_rename	RENAME		/**/
++#define RENAME		/**/
+ 
+ /* SYMLINK:
+  *	This symbol, if defined, indicates that the symlink routine is available
+  *	to create symbolic links.
+  */
+-#$d_symlink	SYMLINK		/**/
++#define	SYMLINK		/**/
+ 
+ /* WHOAMI:
+  *	This symbol, if defined, indicates that the program may include
diff --git a/mail/elm/patches/patch-ak b/mail/elm/patches/patch-ak
new file mode 100644
index 00000000000..fdef9d8546b
--- /dev/null
+++ b/mail/elm/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1 2006/01/24 22:47:13 joerg Exp $
+
+--- hdrs/mcprtlib.h.orig	2006-01-24 21:26:45.000000000 +0000
++++ hdrs/mcprtlib.h
+@@ -145,7 +145,7 @@ typedef struct {
+     for (i = 0; i < typeCnt; ++i) {					      \
+ 	switch (typeList[i].type) {					      \
+ 	  case MCShortType:						      \
+-	    typeList[i].u.shortV = va_arg(vl, short);			      \
++	    typeList[i].u.shortV = va_arg(vl, int);			      \
+ 	    break;							      \
+ 	  case MCLongType:						      \
+ 	    typeList[i].u.longV = va_arg(vl, long);			      \
+@@ -159,7 +159,7 @@ typedef struct {
+ 	    break;							      \
+ #endif*/								      \
+ 	  case MCFloatType:						      \
+-	    typeList[i].u.floatV = va_arg(vl, float);			      \
++	    typeList[i].u.floatV = va_arg(vl, double);			      \
+ 	    break;							      \
+ 	  case MCStringType:						      \
+ 	    typeList[i].u.charPV = va_arg(vl, char *);			      \
diff --git a/mail/elm/patches/patch-al b/mail/elm/patches/patch-al
new file mode 100644
index 00000000000..c70e10cfc64
--- /dev/null
+++ b/mail/elm/patches/patch-al
@@ -0,0 +1,29 @@
+$NetBSD: patch-al,v 1.1 2006/01/24 22:47:13 joerg Exp $
+
+--- utils/newmail.c.orig	2006-01-24 22:37:59.000000000 +0000
++++ utils/newmail.c
+@@ -88,6 +88,7 @@ static char rcsid[] = "@(#)$Id: newmail.
+ #include "s_newmail.h"
+ #include "port_stat.h"
+ 
++#include <errno.h>
+ #ifdef I_TIME
+ #  include <time.h>
+ #endif
+@@ -160,8 +161,6 @@ FILE	*fd = NULL;		/* fd to use to read f
+ int  parent_pid;		/* See if sucide should be attempt  */
+ #endif /* PIDCHECK */
+ 
+-extern int errno;
+-
+ #if defined(BSD) && !defined(UTIMBUF)
+         time_t utime_buffer[2];         /* utime command */
+ #else
+@@ -700,7 +699,6 @@ char *name;
+ 	    is to check to see if new mail has arrived....  **/
+ 
+ 	int ok = 1;
+-	extern int errno;	/* system error number! */
+ 	struct stat buffer;
+ 
+ 	if (stat(name, &buffer) != 0)