6 files changed, 39 insertions, 6 deletions

diff --git a/devel/elfkickers/Makefile b/devel/elfkickers/Makefile
index ec591acce66b..5d82ee1f3f21 100644
--- a/devel/elfkickers/Makefile
+++ b/devel/elfkickers/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	elfkickers
 PORTVERSION=	3.0
+PORTREVISION=	1
 CATEGORIES=	devel sysutils
 MASTER_SITES=	http://www.muppetlabs.com/~breadbox/pub/software/
 DISTNAME=	ELFkickers-${PORTVERSION}
diff --git a/devel/elfkickers/files/patch-elfrw__elfrw.h b/devel/elfkickers/files/patch-elfrw__elfrw.h
index 8c847b400178..59b1a6050998 100644
--- a/devel/elfkickers/files/patch-elfrw__elfrw.h
+++ b/devel/elfkickers/files/patch-elfrw__elfrw.h
@@ -1,6 +1,6 @@
 --- ./elfrw/elfrw.h.orig	2011-05-31 01:47:08.000000000 +0200
-+++ ./elfrw/elfrw.h	2011-06-01 17:13:31.000000000 +0200
-@@ -10,6 +10,17 @@
++++ ./elfrw/elfrw.h	2011-06-08 12:16:37.000000000 +0200
+@@ -10,6 +10,24 @@
  #include <stdio.h>
  #include <elf.h>
  
@@ -10,6 +10,13 @@
 +#define PT_GNU_STACK	0x6474e551
 +#define PT_GNU_RELRO	0x6474e552
 +
++#if  __FreeBSD_version < 700022
++#define SHT_GNU_HASH	0x6ffffff6
++#define EM_CRIS		76
++#define EM_M32R		88
++#define EM_MN10300	89
++#endif
++
 +#define ELFCLASSNUM 3
 +#define ELFDATANUM  3
 +#define EV_NUM      2
diff --git a/devel/elfkickers/files/patch-elftoc__mknames.c b/devel/elfkickers/files/patch-elftoc__mknames.c
new file mode 100644
index 000000000000..8d23072b3eb5
--- /dev/null
+++ b/devel/elfkickers/files/patch-elftoc__mknames.c
@@ -0,0 +1,25 @@
+--- ./elftoc/mknames.c.orig	2011-06-08 12:17:12.000000000 +0200
++++ ./elftoc/mknames.c	2011-06-08 12:20:02.000000000 +0200
+@@ -108,17 +108,19 @@
+     _("68K_", EM_68K),
+     _("ALPHA_", EM_ALPHA),
+     _("ARM_", EM_ARM),
+-    _("CRIS_", EM_CRIS),
+     __("HP_", "PARISC_", EM_PARISC),
+     __("IA_64_", "IA64_", EM_IA_64),
+-    _("M32R_", EM_M32R),
+     _("MIPS_", EM_MIPS),
+-    _("MN10300_", EM_MN10300),
+     _("PPC_", EM_PPC),
+     _("PPC64_", EM_PPC64),
+     _("SH_", EM_SH),
+     _("SPARC_", EM_SPARC),
+     _("X86_64_", EM_X86_64),
++#if __FreeBSD_cc_version_ > 700022
++    _("CRIS_", EM_CRIS),
++    _("M32R_", EM_M32R),
++    _("MN10300_", EM_MN10300)
++#endif
+ };
+ 
+ #define machineidcount ((int)(sizeof machineids / sizeof *machineids))
diff --git a/devel/elfkickers/files/patch-elftoc__outbase.h b/devel/elfkickers/files/patch-elftoc__outbase.h
index 8afe3130a9a8..12d0e0cd37e4 100644
--- a/devel/elfkickers/files/patch-elftoc__outbase.h
+++ b/devel/elfkickers/files/patch-elftoc__outbase.h
@@ -1,5 +1,5 @@
---- ./elftoc/outbase.h.orig	2011-06-01 17:16:31.000000000 +0200
-+++ ./elftoc/outbase.h	2011-06-01 17:14:57.000000000 +0200
+--- ./elftoc/outbase.h.orig	2011-05-22 20:46:29.000000000 +0200
++++ ./elftoc/outbase.h	2011-06-08 12:16:37.000000000 +0200
 @@ -7,6 +7,10 @@
  #ifndef _outbase_h_
  #define _outbase_h_
diff --git a/devel/elfkickers/files/patch-elftoc__pieces.c b/devel/elfkickers/files/patch-elftoc__pieces.c
index 4c9e8542b096..cd0a109372a6 100644
--- a/devel/elfkickers/files/patch-elftoc__pieces.c
+++ b/devel/elfkickers/files/patch-elftoc__pieces.c
@@ -1,5 +1,5 @@
 --- ./elftoc/pieces.c.orig	2011-05-26 03:25:14.000000000 +0200
-+++ ./elftoc/pieces.c	2011-06-01 17:13:31.000000000 +0200
++++ ./elftoc/pieces.c	2011-06-08 12:16:37.000000000 +0200
 @@ -16,6 +16,10 @@
  #include "out.h"
  #include "pieces.h"
diff --git a/devel/elfkickers/files/patch-elftoc__readelf.h b/devel/elfkickers/files/patch-elftoc__readelf.h
index 75c96d43d70e..8655c83ab6d8 100644
--- a/devel/elfkickers/files/patch-elftoc__readelf.h
+++ b/devel/elfkickers/files/patch-elftoc__readelf.h
@@ -1,5 +1,5 @@
 --- ./elftoc/readelf.h.orig	2011-05-22 20:46:29.000000000 +0200
-+++ ./elftoc/readelf.h	2011-06-01 17:13:31.000000000 +0200
++++ ./elftoc/readelf.h	2011-06-08 12:16:37.000000000 +0200
 @@ -7,6 +7,12 @@
  #ifndef	_readelf_h_
  #define	_readelf_h_