diff options
| -rw-r--r-- | mail/metamail/Makefile | 3 | ||||
| -rw-r--r-- | mail/metamail/distinfo | 4 | ||||
| -rw-r--r-- | mail/metamail/patches/patch-ab | 22 |
3 files changed, 17 insertions, 12 deletions
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile index 9d5f73e1158..140786856d0 100644 --- a/mail/metamail/Makefile +++ b/mail/metamail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2004/04/06 04:27:36 xtraeme Exp $ +# $NetBSD: Makefile,v 1.29 2004/06/10 15:31:47 minskim Exp $ DISTNAME= mm2.7 PKGNAME= metamail-2.7 @@ -19,6 +19,7 @@ USE_BUILDLINK3= YES USE_PKGINSTALL= YES CFLAGS+= -DPKG_SYSCONFDIR='\\\"${PKG_SYSCONFDIR}\\\"' +CFLAGS.Linux+= -DLINUX CFLAGS.SunOS+= -DSYSV MAKE_ENV+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} CHMOD=${CHMOD} SED=${SED} diff --git a/mail/metamail/distinfo b/mail/metamail/distinfo index 2da9d7e90dd..49cff8bf1c7 100644 --- a/mail/metamail/distinfo +++ b/mail/metamail/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2004/06/06 19:33:11 jschauma Exp $ +$NetBSD: distinfo,v 1.11 2004/06/10 15:31:47 minskim Exp $ SHA1 (mm2.7.tar.Z) = 8f213baec9b17c05bcb066f616977a561757d7a6 Size (mm2.7.tar.Z) = 262881 bytes SHA1 (patch-aa) = 9b3f6a9378d8c1a2a2542a2163dfb96d61df6ce3 -SHA1 (patch-ab) = 30b6f86d1fc5fca179922734260b8034cb440d2f +SHA1 (patch-ab) = d94e83bdd0c9a101f6a09c6ef4e5f8df7c74411d SHA1 (patch-ac) = f0b04f7d6b17fb5c71a09b4caaf4298acdcff64e SHA1 (patch-ad) = f5b8a3e04da86fb875ffe34b3f4cba5c7b4e4d94 SHA1 (patch-ae) = 7abed3b508779f354036a3634510d4c68c3670a8 diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab index bdcae5d1f95..9ba709ea970 100644 --- a/mail/metamail/patches/patch-ab +++ b/mail/metamail/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.6 2004/06/06 19:33:11 jschauma Exp $ +$NetBSD: patch-ab,v 1.7 2004/06/10 15:31:47 minskim Exp $ ---- config.h.orig 1993-11-24 10:36:07.000000000 -0500 -+++ config.h 2004-06-06 13:08:50.000000000 -0400 -@@ -40,7 +40,7 @@ +--- config.h.orig 1993-11-24 09:36:07.000000000 -0600 ++++ config.h +@@ -40,7 +40,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #define SYSV /* Linux is SysV */ #endif @@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.6 2004/06/06 19:33:11 jschauma Exp $ #ifndef SYSV /* Stupid SGI machines define SVR3 but not SYSV */ #define SYSV -@@ -65,6 +65,12 @@ +@@ -65,6 +65,12 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #endif #endif @@ -24,17 +24,21 @@ $NetBSD: patch-ab,v 1.6 2004/06/06 19:33:11 jschauma Exp $ /* NOTE: The RESET_PROGRAM resets the terminal to a "normal" state If you comment out the definition, all will be well except that metamail's -R switch won't work, and metamail-called programs might be more likely -@@ -100,7 +106,9 @@ +@@ -100,9 +106,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #endif #ifdef SYSV -+#if !(defined(__sun__) && defined(__svr4__)) ++#if !(defined(__sun__) && defined(__svr4__)) && !defined(LINUX) #define killpg(a, b) kill(-(a), (b)) +#endif #define bcopy(a, b, c) memcpy(b, a, c) ++#ifndef LINUX #define bzero(a, b) memset(a, 0, b) ++#endif #define bcmp memcmp -@@ -155,9 +163,13 @@ + #define index strchr + #define rindex strrchr +@@ -155,9 +165,13 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #ifdef NeXT #define sigtype void #else @@ -48,7 +52,7 @@ $NetBSD: patch-ab,v 1.6 2004/06/06 19:33:11 jschauma Exp $ #ifdef MSDOS #define PATH_SEPARATOR ';' -@@ -173,7 +185,7 @@ +@@ -173,7 +187,7 @@ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIE #else #define PATH_SEPARATOR ':' #ifndef STDPATH |