[pkgsrc/trunk]: pkgsrc/devel/imake "objformat" was removed in FreeBSD 7 or ar...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/af0a5be76ad3
branches:  trunk
changeset: 632053:af0a5be76ad3
user:      asau <asau%pkgsrc.org@localhost>
date:      Fri Mar 14 21:14:28 2014 +0000

description:
"objformat" was removed in FreeBSD 7 or around.
Ever since about FreeBSD 4 or 5 one should assume ELF
when "objformat" is not found.
Change the test to default to ELF for FreeBSD 6 and later.

Bump package revision.

diffstat:

 devel/imake/Makefile              |   3 ++-
 devel/imake/distinfo              |   4 ++--
 devel/imake/patches/patch-imake.c |  15 +++++++++++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diffs (50 lines):

diff -r dc78413ca9d8 -r af0a5be76ad3 devel/imake/Makefile
--- a/devel/imake/Makefile      Fri Mar 14 20:50:14 2014 +0000
+++ b/devel/imake/Makefile      Fri Mar 14 21:14:28 2014 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2013/07/23 06:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2014/03/14 21:14:28 asau Exp $
 
 DISTNAME=              imake-1.0.6
+PKGREVISION=           1
 CATEGORIES=            x11 devel
 MASTER_SITES=          ${MASTER_SITE_XORG:=util/}
 EXTRACT_SUFX=          .tar.bz2
diff -r dc78413ca9d8 -r af0a5be76ad3 devel/imake/distinfo
--- a/devel/imake/distinfo      Fri Mar 14 20:50:14 2014 +0000
+++ b/devel/imake/distinfo      Fri Mar 14 21:14:28 2014 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2013/07/23 06:48:21 wiz Exp $
+$NetBSD: distinfo,v 1.10 2014/03/14 21:14:28 asau Exp $
 
 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-imake.c) = ae55d0ed6321c1723c3e8cbbca88611a42bf15bf
 SHA1 (patch-imakemdep.h) = a8aa1adff501da7eb22d695ff93f0517ce146269
diff -r dc78413ca9d8 -r af0a5be76ad3 devel/imake/patches/patch-imake.c
--- a/devel/imake/patches/patch-imake.c Fri Mar 14 20:50:14 2014 +0000
+++ b/devel/imake/patches/patch-imake.c Fri Mar 14 21:14:28 2014 +0000
@@ -1,8 +1,19 @@
-$NetBSD: patch-imake.c,v 1.4 2013/07/23 06:48:21 wiz Exp $
+$NetBSD: patch-imake.c,v 1.5 2014/03/14 21:14:28 asau Exp $
 
 --- imake.c.orig       2013-07-23 04:53:04.000000000 +0000
 +++ imake.c
-@@ -1337,54 +1337,8 @@ get_gcc_version(FILE *inFile, char *name
+@@ -1158,7 +1158,9 @@ get_binary_format(FILE *inFile)
+   } else
+       strcpy (cmd, "objformat");
+ 
+-  if (osrel >= 300004 &&
++  if (osrel >= 600000)
++    iself = 1;
++  else if (osrel >= 300004 &&
+       (objprog = popen(cmd, "r")) != NULL &&
+       fgets(buf, sizeof(buf), objprog) != NULL &&
+       strncmp(buf, "elf", 3) == 0)
+@@ -1337,54 +1339,8 @@ get_gcc_version(FILE *inFile, char *name
  static boolean
  get_gcc(char *cmd)
  {