diff options
| author | dmcmahill <dmcmahill> | 2002-07-14 03:47:46 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill> | 2002-07-14 03:47:46 +0000 |
| commit | 263ce5cb322973c4968c72ea04c838b7fbaba9e3 (patch) | |
| tree | b28df666658cd50911f5490a82189a6fe50113b5 /cad/magic | |
| parent | 85a6af241550a35ca21febe940d344964173eeb8 (diff) | |
| download | pkgsrc-263ce5cb322973c4968c72ea04c838b7fbaba9e3.tar.gz | |
in the config script that comes with magic, check for /usr/libexec/cpp
and if that doesn't exist look for /usr/libexec/cpp0. While here,
use ${X11BASE}/include instead of /usr/X11R6/include.
Should fix recently noted bulk build problems on 1.6 systems.
Diffstat (limited to 'cad/magic')
| -rw-r--r-- | cad/magic/distinfo | 4 | ||||
| -rw-r--r-- | cad/magic/patches/patch-ab | 29 |
2 files changed, 26 insertions, 7 deletions
diff --git a/cad/magic/distinfo b/cad/magic/distinfo index 91222dd3b50..49a03b7b99c 100644 --- a/cad/magic/distinfo +++ b/cad/magic/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/04/06 21:37:28 dmcmahill Exp $ +$NetBSD: distinfo,v 1.2 2002/07/14 03:47:46 dmcmahill Exp $ SHA1 (magic-7.1.tar.gz) = 176eb4c6a0ff33c6e265e61360c02da4f454f101 Size (magic-7.1.tar.gz) = 3860487 bytes SHA1 (patch-aa) = bb18e6672441e404b0969cd1f5cb387ef4f97386 -SHA1 (patch-ab) = fab0d76781c186f0f74a37be856c957c7e8be648 +SHA1 (patch-ab) = c4b516d71ec012593f0559e8d0d1b5bad69d736a diff --git a/cad/magic/patches/patch-ab b/cad/magic/patches/patch-ab index 24f52266f8d..52a5c7b4022 100644 --- a/cad/magic/patches/patch-ab +++ b/cad/magic/patches/patch-ab @@ -1,11 +1,30 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/04/06 21:37:29 dmcmahill Exp $ +$NetBSD: patch-ab,v 1.2 2002/07/14 03:47:46 dmcmahill Exp $ ---- scripts/config.orig Mon Feb 4 12:53:10 2002 -+++ scripts/config Wed Mar 13 13:03:53 2002 -@@ -200,5 +200,5 @@ +--- scripts/config.orig Sat Jul 13 23:25:57 2002 ++++ scripts/config +@@ -191,15 +191,22 @@ + breaksw + case "2": + echo "NetBSD 1.x selected" +- set cpp = "/usr/libexec/cpp -P -traditional" ++ if (-f /usr/libexec/cpp) then ++ set cpp = "/usr/libexec/cpp -P -traditional" ++ else if (-f /usr/libexec/cpp0) then ++ set cpp = "/usr/libexec/cpp0 -P -traditional" ++ else ++ echo "I am not able to figure out where cpp is on your system" ++ exit 1 ++ endif + if ($?usingX11) then + echo "NOTE: Since you are running NetBSD using X11, we're assuming" + echo " that you want to get the X11 library from either the normal" + echo " library area or from the directory /usr/X11R6/lib. If this" + echo " is not correct, edit the defs.mak file by hand after this" echo " script completes." - set gr_cflags=("$gr_cflags" -I/usr/X11R6/include) +- set gr_cflags=("$gr_cflags" -I/usr/X11R6/include) - set gr_libs=(-L/usr/X11R6/lib "$gr_libs") ++ set gr_cflags=("$gr_cflags" -I${X11BASE}/include) + set gr_libs=(-L${X11BASE}/lib -R${X11BASE}/lib "$gr_libs") endif breaksw + case "3": |