summaryrefslogtreecommitdiff
path: root/mail/metamail
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1997-11-19 13:10:09 +0000
committeragc <agc@pkgsrc.org>1997-11-19 13:10:09 +0000
commitd368057967150951a24e75eee2a447c3fe84a539 (patch)
treec9c6e370de60c77f2161427b8553a403c6cf3837 /mail/metamail
parent49637b69dadffffdb5e33ecb194514a42d5a0c21 (diff)
downloadpkgsrc-d368057967150951a24e75eee2a447c3fe84a539.tar.gz
Check for 4.4BSD-derived systems properly.
Diffstat (limited to 'mail/metamail')
-rw-r--r--mail/metamail/patches/patch-ab60
1 files changed, 27 insertions, 33 deletions
diff --git a/mail/metamail/patches/patch-ab b/mail/metamail/patches/patch-ab
index 87f0b6b6f1c..7f5067bd3c1 100644
--- a/mail/metamail/patches/patch-ab
+++ b/mail/metamail/patches/patch-ab
@@ -1,33 +1,27 @@
-*** config.h.orig Mon Oct 17 21:06:22 1994
---- config.h Mon Oct 17 21:08:13 1994
-***************
-*** 73,79 ****
- #ifdef SYSV
- #define RESET_PROGRAM "tput clear"
- #else
-! #ifdef __BSD_4_4__
- #define RESET_PROGRAM "/usr/bin/reset"
- #else
- #define RESET_PROGRAM "/usr/ucb/reset"
---- 73,79 ----
- #ifdef SYSV
- #define RESET_PROGRAM "tput clear"
- #else
-! #if defined(__BSD_4_4__) || defined(__FreeBSD__)
- #define RESET_PROGRAM "/usr/bin/reset"
- #else
- #define RESET_PROGRAM "/usr/ucb/reset"
-***************
-*** 155,161 ****
---- 155,165 ----
- #ifdef NeXT
- #define sigtype void
- #else
-+ #ifdef __FreeBSD__
-+ #define sigtype void
-+ #else
- #define sigtype int
-+ #endif
- #endif
- #endif
-
+--- config.h.orig Wed Nov 24 15:36:07 1993
++++ config.h Wed Nov 19 12:58:17 1997
+@@ -65,6 +65,12 @@
+ #endif
+ #endif
+
++/* agc - test for 4.4 BSD-derived systems properly */
++#include <sys/param.h>
++#if (defined(BSD) && BSD >= 199306)
++#define __BSD_4_4__
++#endif
++
+ /* 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
+@@ -155,7 +161,11 @@
+ #ifdef NeXT
+ #define sigtype void
+ #else
++#if defined(__BSD_4_4__)
++#define sigtype void
++#else
+ #define sigtype int
++#endif
+ #endif
+ #endif
+