Update to 1.0.6:

This release provides some fixes for static analysis warnings and other code
maintenance cleanups.

Alan Coopersmith (6):
      Avoid closing inFile twice in CheckImakefileC if LogFatal returns
      Ensure inFile is always closed on error in cppit()
      Let configure pick cpp path on Solaris, instead of hardcoding in imakemdep.h
      unifdef -U__UNIXOS2__
      config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
      imake 1.0.6

Eric S. Raymond (1):
      Avoid use of low-level troff markup that can't be lifted structurally.

4 files changed, 20 insertions, 29 deletions

diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index 3b4cf517c7e..1d9be72f16e 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2013/07/18 08:01:30 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2013/07/23 06:48:21 wiz Exp $
 
-DISTNAME=		imake-1.0.5
-PKGREVISION=		3
+DISTNAME=		imake-1.0.6
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/imake/distinfo b/devel/imake/distinfo
index e356a42aa06..de7d17e39f4 100644
--- a/devel/imake/distinfo
+++ b/devel/imake/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2013/07/18 08:01:30 dholland Exp $
+$NetBSD: distinfo,v 1.9 2013/07/23 06:48:21 wiz 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) = b3ceede0de22273f1adafc2348d4f9b96e1fbfba
+SHA1 (imake-1.0.6.tar.bz2) = a54c025d7ac9894b6bc919d13454c6adb12ae140
+RMD160 (imake-1.0.6.tar.bz2) = b849f906af932ef8f76ae36ff96ac77a570dde15
+Size (imake-1.0.6.tar.bz2) = 155571 bytes
+SHA1 (patch-imake.c) = fe1b56c248c74df4dc3e7181c279b9b0ac16fdae
+SHA1 (patch-imakemdep.h) = a8aa1adff501da7eb22d695ff93f0517ce146269
diff --git a/devel/imake/patches/patch-imake.c b/devel/imake/patches/patch-imake.c
index b44722be21e..0a6abcd10de 100644
--- a/devel/imake/patches/patch-imake.c
+++ b/devel/imake/patches/patch-imake.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-imake.c,v 1.3 2013/07/13 07:43:59 obache Exp $
+$NetBSD: patch-imake.c,v 1.4 2013/07/23 06:48:21 wiz Exp $
 
---- imake.c.orig	2013-06-13 22:21:17.000000000 +0000
+--- imake.c.orig	2013-07-23 04:53:04.000000000 +0000
 +++ imake.c
-@@ -1336,54 +1336,8 @@ get_gcc_version(FILE *inFile, char *name
+@@ -1337,54 +1337,8 @@ get_gcc_version(FILE *inFile, char *name
  static boolean
  get_gcc(char *cmd)
  {
@@ -58,4 +58,4 @@ $NetBSD: patch-imake.c,v 1.3 2013/07/13 07:43:59 obache Exp $
 +	return TRUE;
  }
  
- #if defined CROSSCOMPILE || !defined __UNIXOS2__
+ #ifdef CROSSCOMPILE
diff --git a/devel/imake/patches/patch-imakemdep.h b/devel/imake/patches/patch-imakemdep.h
index 15cc4849426..c3fc8bc434e 100644
--- a/devel/imake/patches/patch-imakemdep.h
+++ b/devel/imake/patches/patch-imakemdep.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-imakemdep.h,v 1.4 2013/07/18 08:01:30 dholland Exp $
+$NetBSD: patch-imakemdep.h,v 1.5 2013/07/23 06:48:21 wiz Exp $
 
  - Configure for pkgsrc: never set FIXUP_CPP_WHITESPACE as pkgsrc now
 always uses a whitespace-preserving cpp and fixing it twice causes
@@ -12,18 +12,18 @@ via RAWCPP defined on the command line.
  - 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.orig	2013-07-23 04:53:04.000000000 +0000
 +++ imakemdep.h
-@@ -237,7 +237,7 @@ in this Software without prior written a
+@@ -229,7 +229,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 defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || defined(__SCO__) || (defined(AMOEBA) && defined(CROSS_COMPILE)) || defined(__QNX__) || defined(__sgi) || defined(__UNIXWARE__)
 +#  if 0
  #   define FIXUP_CPP_WHITESPACE
  #  endif
  #  ifdef WIN32
-@@ -265,87 +265,7 @@ in this Software without prior written a
+@@ -257,79 +257,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)
@@ -56,9 +56,6 @@ reasonable thing to do.
 -#   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
@@ -86,10 +83,6 @@ reasonable thing to do.
 -#   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"
@@ -107,12 +100,11 @@ reasonable thing to do.
 -#     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
+@@ -352,7 +280,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] = {
@@ -121,7 +113,7 @@ reasonable thing to do.
  	"-I.",		/* add current directory to include path */
  #   if !defined(__NetBSD_Version__) || __NetBSD_Version__ < 103080000
  #    ifdef unix
-@@ -380,9 +300,6 @@ const char *cpp_argv[ARGUMENTS] = {
+@@ -365,9 +293,6 @@ const char *cpp_argv[ARGUMENTS] = {
      defined(__GNUC__) || defined(__GLIBC__)
  #    ifdef __i386__
  	"-D__i386__",