From 7689f075c5341773741b8dab61d015d89ed603e0 Mon Sep 17 00:00:00 2001
From: mycroft <mycroft@pkgsrc.org>
Date: Tue, 19 Feb 2002 00:02:28 +0000
Subject: Fix cpp problems on -current, by using USE_CC_E.

---
 net/tightvnc/distinfo         |  4 ++--
 net/tightvnc/patches/patch-ac | 28 +++++++++++++++++++++-------
 2 files changed, 23 insertions(+), 9 deletions(-)

(limited to 'net')

diff --git a/net/tightvnc/distinfo b/net/tightvnc/distinfo
index cf618183bf6..0a418712e56 100644
--- a/net/tightvnc/distinfo
+++ b/net/tightvnc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/02/12 07:11:29 martti Exp $
+$NetBSD: distinfo,v 1.4 2002/02/19 00:02:28 mycroft Exp $
 
 SHA1 (tightvnc-1.2.2_unixsrc.tar.bz2) = c764122d17bb54a78accdf658029b5097caaa4f1
 Size (tightvnc-1.2.2_unixsrc.tar.bz2) = 1720393 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) = 71f7dcf81e731263b2bc0b9ea87326d1da2ff1a9
 SHA1 (patch-ad) = a524db9a403428bd750819d25e6157d4c3cb96f7
 SHA1 (patch-ae) = 399ff1527ff75eee7d181dd4f90f95edab028bd7
 SHA1 (patch-af) = 369961aa3e089195653980da91e8fba53807fc53
diff --git a/net/tightvnc/patches/patch-ac b/net/tightvnc/patches/patch-ac
index cbeaf131c24..5af28c02d8c 100644
--- a/net/tightvnc/patches/patch-ac
+++ b/net/tightvnc/patches/patch-ac
@@ -1,16 +1,30 @@
-$NetBSD: patch-ac,v 1.1 2001/09/23 01:34:30 mycroft Exp $
+$NetBSD: patch-ac,v 1.2 2002/02/19 00:02:29 mycroft Exp $
 
---- Xvnc/config/imake/imakemdep.h.orig	Sun Jul 27 03:41:05 1997
-+++ Xvnc/config/imake/imakemdep.h
-@@ -287,6 +287,11 @@
+--- Xvnc/config/imake/imakemdep.h.orig	Sun Jun 11 12:00:51 2000
++++ Xvnc/config/imake/imakemdep.h	Tue Feb 19 00:00:15 2002
+@@ -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 */
-- 
cgit v1.2.3