From eb0c65f2246372128236ab39d7f17373d5593a0d Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 16 Feb 2006 18:06:46 +0000 Subject: Fix build on -current, and add missing -Wl,-R (should fix bulk build problem). --- cad/magic/distinfo | 9 ++++++--- cad/magic/patches/patch-ab | 6 +++--- cad/magic/patches/patch-aq | 6 +++--- cad/magic/patches/patch-ba | 22 ++++++++++++++++++++++ cad/magic/patches/patch-bb | 13 +++++++++++++ cad/magic/patches/patch-bc | 13 +++++++++++++ 6 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 cad/magic/patches/patch-ba create mode 100644 cad/magic/patches/patch-bb create mode 100644 cad/magic/patches/patch-bc diff --git a/cad/magic/distinfo b/cad/magic/distinfo index 9870396e4cd..384564ffd6a 100644 --- a/cad/magic/distinfo +++ b/cad/magic/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2006/02/03 02:19:42 rillig Exp $ +$NetBSD: distinfo,v 1.11 2006/02/16 18:06:46 wiz Exp $ SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101 RMD160 (magic-7.1.tar.gz) = 7ab03ba23243817b168254f8c6f7a50d8ea2a4db Size (magic-7.1.tar.gz) = 3860487 bytes SHA1 (patch-aa) = 30eb68f2cd768345d6b91359cdd4c7d23bdf892f -SHA1 (patch-ab) = d4d6d370dabac47c3e41a54329913d2ebabc8477 +SHA1 (patch-ab) = 7edbc90a01fdee0569733cad965f9b397e684547 SHA1 (patch-ac) = 270cbb68cb3b1ff5e635490ac1dfe13e3dcfc0d0 SHA1 (patch-ad) = e9db83580fc1b34906d9f5e151479e46f7da444a SHA1 (patch-ae) = 27555db8f06d1f8a7a6f002e7dfccf14a4db2765 @@ -19,7 +19,7 @@ SHA1 (patch-am) = c4e695c370db01775b321970a327ea0851fdf437 SHA1 (patch-an) = 83e9e5242b483f398962a6237551b860749e70f0 SHA1 (patch-ao) = 747c18b5e997d652054d17acbdb1fee0748d77a8 SHA1 (patch-ap) = b2b9e1c45dbefd1d93205bcc15ea713c38181598 -SHA1 (patch-aq) = 8ca051b61a8d79988838be4c1bc4dca3eed6bcaa +SHA1 (patch-aq) = e21eebcb604f26f1669237c752f39d77f3dec100 SHA1 (patch-ar) = 1d9b4c63dd6156fc02dfcbdd946ecca3d44847f2 SHA1 (patch-as) = 5ddeac5797f34b6e951241e4d891efd0aea5f15d SHA1 (patch-at) = 6caeb2a9c455792b4ec0930b199df4880f42ce47 @@ -29,3 +29,6 @@ SHA1 (patch-aw) = 557bf1993732183b6738ec12539736ebd9aaa900 SHA1 (patch-ax) = 8bc1938b4435d7724a666ad283c0aef93abdabf1 SHA1 (patch-ay) = 8555fe87e07468bdefd0b1e6c0855d9d0572f843 SHA1 (patch-az) = 59373bad51817333b3c82b0a35e34e39dc60ea21 +SHA1 (patch-ba) = 330dcb13dde5ef871d5d807f40915b2e14842808 +SHA1 (patch-bb) = ca5366ffdd343ce2e15a2636aadca803e7a1d46e +SHA1 (patch-bc) = 7d02f22aa3507b2c5573b3fc655da76eca34cea5 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; -- cgit v1.2.3