pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/elm Remove LIBC hack, shouldn't be needed anymore.
details: https://anonhg.NetBSD.org/pkgsrc/rev/ec82be24e56c
branches: trunk
changeset: 507005:ec82be24e56c
user: joerg <joerg%pkgsrc.org@localhost>
date: Tue Jan 24 22:47:13 2006 +0000
description:
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.
diffstat:
mail/elm/Makefile | 9 ++-------
mail/elm/distinfo | 7 ++++++-
mail/elm/patches/patch-ah | 16 ++++++++++++++++
mail/elm/patches/patch-ai | 14 ++++++++++++++
mail/elm/patches/patch-aj | 44 ++++++++++++++++++++++++++++++++++++++++++++
mail/elm/patches/patch-ak | 22 ++++++++++++++++++++++
mail/elm/patches/patch-al | 29 +++++++++++++++++++++++++++++
7 files changed, 133 insertions(+), 8 deletions(-)
diffs (189 lines):
diff -r 19c7d7818608 -r ec82be24e56c mail/elm/Makefile
--- a/mail/elm/Makefile Tue Jan 24 22:46:48 2006 +0000
+++ b/mail/elm/Makefile Tue Jan 24 22:47:13 2006 +0000
@@ -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 @@
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 -r 19c7d7818608 -r ec82be24e56c mail/elm/distinfo
--- a/mail/elm/distinfo Tue Jan 24 22:46:48 2006 +0000
+++ b/mail/elm/distinfo Tue Jan 24 22:47:13 2006 +0000
@@ -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-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 -r 19c7d7818608 -r ec82be24e56c mail/elm/patches/patch-ah
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm/patches/patch-ah Tue Jan 24 22:47:13 2006 +0000
@@ -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 -r 19c7d7818608 -r ec82be24e56c mail/elm/patches/patch-ai
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm/patches/patch-ai Tue Jan 24 22:47:13 2006 +0000
@@ -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 -r 19c7d7818608 -r ec82be24e56c mail/elm/patches/patch-aj
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm/patches/patch-aj Tue Jan 24 22:47:13 2006 +0000
@@ -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 -r 19c7d7818608 -r ec82be24e56c mail/elm/patches/patch-ak
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm/patches/patch-ak Tue Jan 24 22:47:13 2006 +0000
@@ -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 -r 19c7d7818608 -r ec82be24e56c mail/elm/patches/patch-al
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/elm/patches/patch-al Tue Jan 24 22:47:13 2006 +0000
@@ -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)
Home |
Main Index |
Thread Index |
Old Index