Fix build on -current, and add missing -Wl,-R (should fix bulk build problem).

5 files changed, 54 insertions, 6 deletions

diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab
index 24cac62a8aa..69f668d6048 100644
--- a/cad/magic/patches/patch-ab
+++ b/cad/magic/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.6 2006/01/06 18:14:06 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2006/02/16 18:06:46 wiz Exp $
 
---- scripts/config.orig	2005-12-20 16:59:05.000000000 +0000
+--- scripts/config.orig	2006-02-16 11:01:27.000000000 +0000
 +++ scripts/config
 @@ -52,7 +52,7 @@ Magic works with the following window co
  CAT_EOF
@@ -52,7 +52,7 @@ $NetBSD: patch-ab,v 1.6 2006/01/06 18:14:06 joerg Exp $
 -    endif
 +    set have_readline="yes"
 +    set dflags=($dflags -DHAVE_READLINE)
-+    set rl_libs=($rl_libs -lreadline -ltermcap)
++    set rl_libs=($rl_libs '-Wl,-R${LOCALBASE}/lib' -lreadline -ltermcap)
 +    set dflags=($dflags -DREADLINE_4_DOT_2_PLUS)
      if ($?compileIRIX) then
         echo "NOTE:  Must compile with GNU make (gmake), not the IRIX make"
diff --git a/cad/magic/patches/patch-aq b/cad/magic/patches/patch-aq
index 20924488811..b44137b0aaf 100644
--- a/cad/magic/patches/patch-aq
+++ b/cad/magic/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1 2004/09/17 09:36:02 he Exp $
+$NetBSD: patch-aq,v 1.2 2006/02/16 18:06:46 wiz Exp $
 
---- ./readline/readline/rltty.c.orig	Mon Apr  3 18:10:33 2000
-+++ ./readline/readline/rltty.c
+--- readline/readline/rltty.c.orig	2000-04-03 16:10:33.000000000 +0000
++++ readline/readline/rltty.c
 @@ -190,7 +190,7 @@ save_tty_chars (tiop)
        _rl_tty_chars.t_intr = tiop->tchars.t_intrc;
        _rl_tty_chars.t_quit = tiop->tchars.t_quitc;
diff --git a/cad/magic/patches/patch-ba b/cad/magic/patches/patch-ba
new file mode 100644
index 00000000000..d1c455155ff
--- /dev/null
+++ b/cad/magic/patches/patch-ba
@@ -0,0 +1,22 @@
+$NetBSD: patch-ba,v 1.1 2006/02/16 18:06:46 wiz Exp $
+
+--- database/DBmain.c.orig	2001-09-21 15:15:31.000000000 +0000
++++ database/DBmain.c
+@@ -81,7 +81,7 @@ void dbMainDummyClient();
+ DBMainInit(techName)
+     char *techName;
+ {
+-#if !defined(SYSV) && !defined(CYGWIN)
++#if !defined(SYSV) && !defined(CYGWIN) && !defined(__NetBSD__)
+     static struct sigvec vec = {0, 0, 0};
+ #endif
+     SectionID sec_tech, sec_planes, sec_types;
+@@ -96,7 +96,7 @@ DBMainInit(techName)
+     DBVerbose = FALSE;
+ 
+     /* Handle termination (mainly for case where we run out of memory) */
+-#if defined(SYSV) || defined(CYGWIN)
++#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__)
+     signal(SIGTERM,dbMainOnTerm);
+ #else
+     vec.sv_handler = dbMainOnTerm;
diff --git a/cad/magic/patches/patch-bb b/cad/magic/patches/patch-bb
new file mode 100644
index 00000000000..597d37f19ec
--- /dev/null
+++ b/cad/magic/patches/patch-bb
@@ -0,0 +1,13 @@
+$NetBSD: patch-bb,v 1.1 2006/02/16 18:06:46 wiz Exp $
+
+--- signals/signals.c.orig	2001-10-25 19:02:44.000000000 +0000
++++ signals/signals.c
+@@ -539,7 +539,7 @@ SigInit()
+ void
+ sigSetAction(int signo, sigRetVal (*handler)(int))
+ {
+-#if defined(SYSV) || defined(CYGWIN)
++#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__)
+   struct sigaction sa;
+ 
+   sa.sa_handler = handler;
diff --git a/cad/magic/patches/patch-bc b/cad/magic/patches/patch-bc
new file mode 100644
index 00000000000..d45bdac8043
--- /dev/null
+++ b/cad/magic/patches/patch-bc
@@ -0,0 +1,13 @@
+$NetBSD: patch-bc,v 1.1 2006/02/16 18:06:46 wiz Exp $
+
+--- graphics/X11Helper.c.orig	2001-09-21 15:15:41.000000000 +0000
++++ graphics/X11Helper.c
+@@ -296,7 +296,7 @@ MapWindow(int signo)
+ void
+ sigSetAction(int signo, sigRetVal (*handler)(int))
+ {
+-#if defined(SYSV) || defined(CYGWIN)
++#if defined(SYSV) || defined(CYGWIN) || defined(__NetBSD__)
+   struct sigaction sa;
+ 
+   sa.sa_handler = handler;