diff options
author | markd <markd@pkgsrc.org> | 2002-01-31 09:49:19 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2002-01-31 09:49:19 +0000 |
commit | 05529b0901331b160a6388f4f377a7306d446db7 (patch) | |
tree | 25301046991dc6d88ecf1cda9bc72a4f7b9c154c /net/vnc | |
parent | da6108d16054f1d197905def7fb08db7fc9549e9 (diff) | |
download | pkgsrc-05529b0901331b160a6388f4f377a7306d446db7.tar.gz |
Fix cpp handling in vnc's private imake to deal with change of cpp location
as per same change made to Xfree86's imake recently.
Diffstat (limited to 'net/vnc')
-rw-r--r-- | net/vnc/distinfo | 4 | ||||
-rw-r--r-- | net/vnc/patches/patch-ac | 24 |
2 files changed, 21 insertions, 7 deletions
diff --git a/net/vnc/distinfo b/net/vnc/distinfo index 75c5cf0e2a2..b962ced22a3 100644 --- a/net/vnc/distinfo +++ b/net/vnc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/09/22 18:07:15 mycroft Exp $ +$NetBSD: distinfo,v 1.4 2002/01/31 09:49:20 markd Exp $ SHA1 (vnc-3.3.3r2_unixsrc.tgz) = 98e9d2e2c2d0f4f9cb9cafee22d21a868189b176 Size (vnc-3.3.3r2_unixsrc.tgz) = 2072772 bytes @@ -6,7 +6,7 @@ SHA1 (vnc-3.3.2r2_doc.tgz) = 857b05c4d8de8b00bfd1ab06a408d9d9a5bb4a6b Size (vnc-3.3.2r2_doc.tgz) = 1009890 bytes SHA1 (patch-aa) = c642605b62bccc7fca23eda3d00654015bf3b8ab SHA1 (patch-ab) = f31282e99502dc50b53c660472aa297ef25e0772 -SHA1 (patch-ac) = 3b551e6c749ca793a165f49a21d10bb4437d00f7 +SHA1 (patch-ac) = 78afbdab02d08a292db7790e9d9db2fb719620bc SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7 SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7 SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53 diff --git a/net/vnc/patches/patch-ac b/net/vnc/patches/patch-ac index 9364e27eefe..6a56aa3f88f 100644 --- a/net/vnc/patches/patch-ac +++ b/net/vnc/patches/patch-ac @@ -1,16 +1,30 @@ -$NetBSD: patch-ac,v 1.6 2000/11/13 14:34:41 abs Exp $ +$NetBSD: patch-ac,v 1.7 2002/01/31 09:49:19 markd Exp $ --- Xvnc/config/imake/imakemdep.h.orig Sun Jul 27 03:41:05 1997 +++ Xvnc/config/imake/imakemdep.h -@@ -287,6 +287,11 @@ +@@ -253,9 +253,12 @@ + #ifdef _CRAY + #define DEFAULT_CPP "/lib/pcpp" + #endif +-#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) ++#if defined(__386BSD__) + #define DEFAULT_CPP "/usr/libexec/cpp" + #endif ++#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) ++#define USE_CC_E ++#endif + #if defined(__sgi) && defined(__ANSI_CPP__) + #define USE_CC_E + #endif +@@ -286,6 +289,11 @@ + * Note that you may define more than one symbol (useful for platforms * that support multiple operating systems). */ - ++ +#ifdef __NetBSD__ +#undef unix +#define unix 42 +#endif -+ + #define ARGUMENTS 50 /* number of arguments in various arrays */ char *cpp_argv[ARGUMENTS] = { - "cc", /* replaced by the actual program to exec */ |