Always use tradcpp for preprocessing. Bump revision.

4 files changed, 169 insertions, 28 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 16c42dcb5f8..7875c8de7b1 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2012/10/31 11:17:06 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/07/02 12:12:48 joerg Exp $
 
 DISTNAME=		imake-1.0.5
+PKGREVISION=		1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,25 +13,16 @@ COMMENT=		Imake and other utilities from modular X.org
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config makedepend:run
 
+DEPENDS+=		tradcpp-[0-9]*:../../devel/tradcpp
 DEPENDS+=		xorg-cf-files>=1.0.3:../../x11/xorg-cf-files
 
 CONFIGURE_ENV+=		APP_MAN_SUFFIX=1
 CONFIGURE_ENV+=		HAS_PERL=no
+CONFIGURE_ENV+=		RAWCPP=${PREFIX}/bin/tradcpp
+CPPFLAGS+=		-DRAWCPP=\"${PREFIX}/bin/tradcpp\"
 
 REPLACE_SH+=		mkhtmlindex.sh
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-# clang's cpp destroys whitespace, particularly hard tabs in makefiles,
-# which is fatal for imake.
-DEPENDS+=ucpp-[0-9]*:../../devel/ucpp
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="ucpp -s"
-
-.elif empty(PKGSRC_COMPILER:Mgcc)
-CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
-
-.endif
-
 # This required with some C preprocessors and not others,
 # but is harmless when not required.
 SUBST_CLASSES+=		xmkmf
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index a6ee1eea95b..ab52fd08117 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2012/05/29 14:22:27 wiz Exp $
+$NetBSD: distinfo,v 1.5 2013/07/02 12:12:48 joerg 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-imakemdep.h) = 9238bdaa7095056b20d96bd0387474d416c533ba
+SHA1 (patch-imake.c) = e66ad9c4001eb4dc36ef8285159927dbb5316620
+SHA1 (patch-imakemdep.h) = 39ba14819dbbcd1a370a0dce0fb9fcaef8bf6e50
diff --git a/devel/imake/patches/patch-imake.c b/devel/imake/patches/patch-imake.c
new file mode 100644
index 00000000000..2599a7bc62d
--- /dev/null
+++ b/devel/imake/patches/patch-imake.c
@@ -0,0 +1,61 @@
+$NetBSD: patch-imake.c,v 1.1 2013/07/02 12:12:48 joerg Exp $
+
+--- imake.c.orig	2013-06-13 22:21:17.000000000 +0000
++++ imake.c
+@@ -1336,54 +1336,8 @@ get_gcc_version(FILE *inFile, char *name
+ static boolean
+ get_gcc(char *cmd)
+ {
+-  struct stat sb;
+-    static const char* gcc_path[] = {
+-#if defined(linux) || \
+-     defined(__NetBSD__) || \
+-     defined(__OpenBSD__) || \
+-     defined(__FreeBSD__) || \
+-     defined(__DragonFly__) || \
+-     defined(__APPLE__) || \
+-     defined(__CYGWIN__) || \
+-     defined(__MINGW32__) || \
+-     defined(__GNU__) || \
+-     defined(__GLIBC__)
+-	"/usr/bin/cc",	/* for Linux PostIncDir */
+-#endif
+-	"/usr/local/bin/gcc",
+-	"/opt/gnu/bin/gcc",
+-	"/usr/pkg/bin/gcc"
+-    };
+-
+-#ifdef CROSSCOMPILE
+-    static const char* cross_cc_name[] = {
+-	"cc",
+-	"gcc"
+-    };
+-
+-    if (CrossCompiling) {
+-	int i;
+-	for (i = 0; i < sizeof (cross_cc_name) / sizeof cross_cc_name[0]; i++){
+-	    strcpy (cmd, CrossCompileDir);
+-	    strcat (cmd, "/");
+-	    strcat (cmd, cross_cc_name[i]);
+-	    if (lstat (cmd, &sb) == 0) {
+-		return TRUE;
+-		break;
+-	    }
+-	}
+-    } else
+-#endif
+-      {
+-	int i;
+-	for (i = 0; i < sizeof (gcc_path) / sizeof gcc_path[0]; i++) {
+-	    if (lstat (gcc_path[i], &sb) == 0) {
+-		strcpy (cmd, gcc_path[i]);
+-		return TRUE;
+-	    }
+-	}
+-      }
+-    return FALSE;
++	strcpy(cmd, "gcc");
++	return TRUE;
+ }
+ 
+ #if defined CROSSCOMPILE || !defined __UNIXOS2__
diff --git a/devel/imake/patches/patch-imakemdep.h b/devel/imake/patches/patch-imakemdep.h
index 0aef9b4a12b..88b4a39fcbe 100644
--- a/devel/imake/patches/patch-imakemdep.h
+++ b/devel/imake/patches/patch-imakemdep.h
@@ -1,15 +1,102 @@
-$NetBSD: patch-imakemdep.h,v 1.1 2012/02/10 16:33:40 bsiegert Exp $
+$NetBSD: patch-imakemdep.h,v 1.2 2013/07/02 12:12:48 joerg Exp $
 
---- imakemdep.h.orig	Thu Oct 13 18:50:30 2011
+--- imakemdep.h.orig	2012-03-08 05:47:32.000000000 +0000
 +++ imakemdep.h
-@@ -318,6 +318,10 @@ in this Software without prior written a
- #   if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
- #    define USE_CC_E
- #   endif
-+#   ifdef __MirBSD__
-+#    define USE_CC_E
-+#    define DEFAULT_CC "mgcc"
-+#   endif
- #   if defined(__sgi) && defined(__ANSI_CPP__)
- #    define USE_CC_E
- #   endif
+@@ -265,87 +265,7 @@ in this Software without prior written a
+  *     If the cpp you need is not in /lib/cpp, define DEFAULT_CPP.
+  */
+ #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
+-
+-#   if defined(__APPLE__)
+-#    define DEFAULT_CPP "/usr/bin/cpp"
+-#    define DEFAULT_CC "cc"
+-#   endif
+-#   if defined(Lynx) || defined(__Lynx__)
+-#    define DEFAULT_CC "gcc"
+-#    define USE_CC_E
+-#   endif
+-#   ifdef hpux
+-#    define USE_CC_E
+-#   endif
+-#   ifdef WIN32
+-#    define USE_CC_E
+-#    ifdef __GNUC__
+-#     define DEFAULT_CC "gcc"
+-#    else
+-#     define DEFAULT_CC "cl"
+-#    endif
+-#   endif
+-#   ifdef apollo
+-#    define DEFAULT_CPP "/usr/lib/cpp"
+-#   endif
+-#   if defined(clipper) || defined(__clipper__)
+-#    define DEFAULT_CPP "/usr/lib/cpp"
+-#   endif
+-#   if defined(_IBMR2) && !defined(DEFAULT_CPP)
+-#    define DEFAULT_CPP "/usr/ccs/lib/cpp"
+-#   endif
+-#   if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__))
+-#    define DEFAULT_CPP "/usr/ccs/lib/cpp"
+-#   endif
+-#   ifdef __bsdi__
+-#    define DEFAULT_CPP "/usr/bin/cpp"
+-#   endif
+-#   ifdef __uxp__
+-#    define DEFAULT_CPP "/usr/ccs/lib/cpp"
+-#   endif
+-#   ifdef __sxg__
+-#    define DEFAULT_CPP "/usr/lib/cpp"
+-#   endif
+-#   ifdef _CRAY
+-#    define DEFAULT_CPP "/lib/pcpp"
+-#   endif
+-#   if defined(__386BSD__)
+-#    define DEFAULT_CPP "/usr/libexec/cpp"
+-#   endif
+-#   if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+-#    define USE_CC_E
+-#   endif
+-#   if defined(__sgi) && defined(__ANSI_CPP__)
+-#    define USE_CC_E
+-#   endif
+-#   if defined(MACH) && !defined(__GNU__)
+-#    define USE_CC_E
+-#   endif
+-#   ifdef __minix_vmd
+-#    define DEFAULT_CPP "/usr/lib/cpp"
+-#   endif
+-#   if defined(__UNIXOS2__)
+-/* expects cpp in PATH */
+-#    define DEFAULT_CPP "cpp"
+-#   endif
+-#   ifdef __CYGWIN__
+-#    define DEFAULT_CC "gcc"
+-#    define DEFAULT_CPP "/usr/bin/cpp"
+-#   endif
+-#   if defined (__QNX__)
+-#    ifdef __QNXNTO__
+-#     define DEFAULT_CPP "/usr/bin/cpp"
+-#    else
+-#     define DEFAULT_CPP "/usr/X11R6/bin/cpp"
+-#    endif
+-#   endif
+-#   if defined(__GNUC__) && !defined(USE_CC_E)
+-#    define USE_CC_E
+-#    ifndef DEFAULT_CC
+-#     define DEFAULT_CC "gcc"
+-#    endif
+-#   endif
+-
++#    define DEFAULT_CPP RAWCPP
+ #  endif /* !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP) */
+ /*
+  * Step 5:  cpp_argv
+@@ -367,7 +287,7 @@ in this Software without prior written a
+ #  define	ARGUMENTS 50	/* number of arguments in various arrays */
+ #  if !defined (CROSSCOMPILE) || defined (CROSSCOMPILE_CPP)
+ const char *cpp_argv[ARGUMENTS] = {
+-	"cc",		/* replaced by the actual program to exec */
++	"cpp",		/* replaced by the actual program to exec */
+ 	"-I.",		/* add current directory to include path */
+ #   if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000
+ #    ifdef unix