Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 490-504)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 161-163)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-130

2 files changed, 7 insertions, 2 deletions

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 206ff55c854..c4bfddfbe5b 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -138,5 +138,10 @@
 
 #define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS
 
+/* Use sigprocmask and friends instead of sigblock;
+   sigblock is considered obsolete on NetBSD.  */
+
+#define POSIX_SIGNALS   1
+
 /* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
    (do not change this comment) */
diff --git a/src/s/openbsd.h b/src/s/openbsd.h
index 39e48da39a7..baba95a2b4b 100644
--- a/src/s/openbsd.h
+++ b/src/s/openbsd.h
@@ -23,11 +23,11 @@
 
 /*  Han Boetes <han@mijncomputer.nl> says this
     is necessary,  otherwise Emacs dumps core on elf systems.  */
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Z
+#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -Z -L/usr/pkg/lib -L/usr/local/lib
 
 #else
 
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp
+#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_tmp -L/usr/pkg/lib -L/usr/local/lib
 
 #endif