diff options
| author | asau <asau@pkgsrc.org> | 2014-03-14 21:14:28 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2014-03-14 21:14:28 +0000 |
| commit | d0a31fec9cae5396348e72340d6b09d7ad54c885 (patch) | |
| tree | 96a40d98fd3c912b9fcc67a81bbdf13303ce3d1e /devel | |
| parent | 51fcc15708436b4d211bbb8868258949d915b7f9 (diff) | |
| download | pkgsrc-d0a31fec9cae5396348e72340d6b09d7ad54c885.tar.gz | |
"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 (limited to 'devel')
| -rw-r--r-- | devel/imake/Makefile | 3 | ||||
| -rw-r--r-- | devel/imake/distinfo | 4 | ||||
| -rw-r--r-- | devel/imake/patches/patch-imake.c | 15 |
3 files changed, 17 insertions, 5 deletions
diff --git a/devel/imake/Makefile b/devel/imake/Makefile index 1d9be72f16e..86c077119b4 100644 --- a/devel/imake/Makefile +++ b/devel/imake/Makefile @@ -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 --git a/devel/imake/distinfo b/devel/imake/distinfo index de7d17e39f4..32c5184b7a1 100644 --- a/devel/imake/distinfo +++ b/devel/imake/distinfo @@ -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 --git a/devel/imake/patches/patch-imake.c b/devel/imake/patches/patch-imake.c index 0a6abcd10de..de7e4fc95f9 100644 --- a/devel/imake/patches/patch-imake.c +++ b/devel/imake/patches/patch-imake.c @@ -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) { |