[pkgsrc/trunk]: pkgsrc/devel/imake Disable the FIXUP_CPP_WHITESPACE hack as p...

[dholland <dholland%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5263608f399e
branches:  trunk
changeset: 621812:5263608f399e
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Thu Jul 18 08:01:30 2013 +0000

description:
Disable the FIXUP_CPP_WHITESPACE hack as pkgsrc uses a whitespace-preserving
cpp with imake and "fixing" the whitespace again causes bizarre lossage.
Affects mostly svr4-based platforms, including Solaris.
PKGREVISION -> 3.

diffstat:

 devel/imake/Makefile                  |   4 ++--
 devel/imake/distinfo                  |   4 ++--
 devel/imake/patches/patch-imakemdep.h |  23 ++++++++++++++++++++++-
 3 files changed, 26 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r caed3e92deef -r 5263608f399e devel/imake/Makefile
--- a/devel/imake/Makefile      Thu Jul 18 07:59:38 2013 +0000
+++ b/devel/imake/Makefile      Thu Jul 18 08:01:30 2013 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2013/07/13 07:42:51 obache Exp $
+# $NetBSD: Makefile,v 1.18 2013/07/18 08:01:30 dholland Exp $
 
 DISTNAME=              imake-1.0.5
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2
diff -r caed3e92deef -r 5263608f399e devel/imake/distinfo
--- a/devel/imake/distinfo      Thu Jul 18 07:59:38 2013 +0000
+++ b/devel/imake/distinfo      Thu Jul 18 08:01:30 2013 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2013/07/13 07:43:59 obache Exp $
+$NetBSD: distinfo,v 1.8 2013/07/18 08:01:30 dholland Exp $
 
 SHA1 (imake-1.0.5.tar.bz2) = 1fd3dca267d125ad86583d7f9663b6ff532cddd1
 RMD160 (imake-1.0.5.tar.bz2) = 0d29d2168b737c7fbe3420933625b4a883e1173f
 Size (imake-1.0.5.tar.bz2) = 148503 bytes
 SHA1 (patch-imake.c) = e66ad9c4001eb4dc36ef8285159927dbb5316620
-SHA1 (patch-imakemdep.h) = 38a23728979dc3cf4bd483c827f902f86d0e9c7c
+SHA1 (patch-imakemdep.h) = b3ceede0de22273f1adafc2348d4f9b96e1fbfba
diff -r caed3e92deef -r 5263608f399e devel/imake/patches/patch-imakemdep.h
--- a/devel/imake/patches/patch-imakemdep.h     Thu Jul 18 07:59:38 2013 +0000
+++ b/devel/imake/patches/patch-imakemdep.h     Thu Jul 18 08:01:30 2013 +0000
@@ -1,7 +1,28 @@
-$NetBSD: patch-imakemdep.h,v 1.3 2013/07/13 07:42:52 obache Exp $
+$NetBSD: patch-imakemdep.h,v 1.4 2013/07/18 08:01:30 dholland Exp $
+
+ - Configure for pkgsrc: never set FIXUP_CPP_WHITESPACE as pkgsrc now
+always uses a whitespace-preserving cpp and fixing it twice causes
+bizarre lossage.
+
+ - Remove all the "logic" for guessing how to invoke cpp, and get it
+via RAWCPP defined on the command line.
+
+ - Make argv[0] for invoking cpp "cpp" by default.
+
+ - Do not pass -m32 to cpp; it is not portable, valid, or even a
+reasonable thing to do.
 
 --- imakemdep.h.orig   2012-03-08 05:47:32.000000000 +0000
 +++ imakemdep.h
+@@ -237,7 +237,7 @@ in this Software without prior written a
+  *     all colons).  One way to tell if you need this is to see whether or not
+  *     your Makefiles have no tabs in them and lots of @@ strings.
+  */
+-#  if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || 
defined(__UNIXOS2__) || defined(__UNIXWARE__)
++#  if 0
+ #   define FIXUP_CPP_WHITESPACE
+ #  endif
+ #  ifdef WIN32
 @@ -265,87 +265,7 @@ in this Software without prior written a
   *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
   */