From db0e4dba1eaf6913f250728dfffe8e58c6bdba35 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Thu, 11 Feb 2010 13:08:59 +0000 Subject: [PATCH] Upgrade to 20100204. PR: ports/139344 Submitted by: Pedro Giffuni --- devel/dwarfdump/Makefile | 2 +- devel/dwarfdump/distinfo | 6 +++--- devel/dwarfdump/files/patch-configure | 14 +++++++------- devel/dwarfdump/files/patch-print_reloc.c | 11 ----------- devel/libdwarf/Makefile | 4 ++-- devel/libdwarf/distinfo | 6 +++--- devel/libdwarf/files/patch-configure | 12 ++++++------ devel/libdwarf/files/patch-dwarf_error.c | 11 ----------- devel/libdwarf/files/patch-libdwarf.h | 11 ----------- 9 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 devel/dwarfdump/files/patch-print_reloc.c delete mode 100644 devel/libdwarf/files/patch-dwarf_error.c delete mode 100644 devel/libdwarf/files/patch-libdwarf.h diff --git a/devel/dwarfdump/Makefile b/devel/dwarfdump/Makefile index 5fada8b60fbc..f456e8d4f93e 100644 --- a/devel/dwarfdump/Makefile +++ b/devel/dwarfdump/Makefile @@ -6,7 +6,7 @@ # PORTNAME= dwarfdump -PORTVERSION= 20080615 +PORTVERSION= 20100204 CATEGORIES= devel MASTER_SITES= http://reality.sgiweb.org/davea/ DISTNAME= libdwarf-${PORTVERSION} diff --git a/devel/dwarfdump/distinfo b/devel/dwarfdump/distinfo index 6bca632a1efd..bf9237797be9 100644 --- a/devel/dwarfdump/distinfo +++ b/devel/dwarfdump/distinfo @@ -1,3 +1,3 @@ -MD5 (libdwarf-20080615.tar.gz) = 4ee8f6bcc5d7dfd58373dea387a9b957 -SHA256 (libdwarf-20080615.tar.gz) = f787bb48ecebdaadbfd3ebc5d01121decaaf00c11125d9c7636376ecf1daa988 -SIZE (libdwarf-20080615.tar.gz) = 1092542 +MD5 (libdwarf-20100204.tar.gz) = 0d9d0f315f6ec335b57f29c081ca792f +SHA256 (libdwarf-20100204.tar.gz) = b517d083a9b066b252922df722e7a9eaac4ea5a8a2d6a66e2419829563901a86 +SIZE (libdwarf-20100204.tar.gz) = 1286741 diff --git a/devel/dwarfdump/files/patch-configure b/devel/dwarfdump/files/patch-configure index 7a2206dedd3f..58b484916923 100644 --- a/devel/dwarfdump/files/patch-configure +++ b/devel/dwarfdump/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Mon Nov 22 19:20:33 2004 -+++ configure Sat Feb 12 22:55:06 2005 -@@ -3029,7 +3029,7 @@ - +--- configure.orig 2010-02-04 22:00:43.000000000 +0000 ++++ configure 2010-02-08 13:36:07.000000000 +0000 +@@ -3508,7 +3508,7 @@ + done -for ac_header in elf.h getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h +for ac_header in getopt.h libelf.h libelf/libelf.h sgidefs.h sys/types.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/devel/dwarfdump/files/patch-print_reloc.c b/devel/dwarfdump/files/patch-print_reloc.c deleted file mode 100644 index 8d91589e8017..000000000000 --- a/devel/dwarfdump/files/patch-print_reloc.c +++ /dev/null @@ -1,11 +0,0 @@ ---- print_reloc.c.orig 2008-08-30 21:13:43.000000000 -0500 -+++ print_reloc.c 2008-08-30 21:18:48.000000000 -0500 -@@ -409,7 +409,7 @@ - } - } else if (sym_data_64) { - size_t index = ELF64_R_SYM(p->r_info) - 1; -- if(index < sym_data_entry_count) { -+ if(index < sym_data_64_entry_count) { - name = sym_data_64[index].name; - } - } diff --git a/devel/libdwarf/Makefile b/devel/libdwarf/Makefile index e613b021bd64..676354802377 100644 --- a/devel/libdwarf/Makefile +++ b/devel/libdwarf/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libdwarf -PORTVERSION= 20080615 +PORTVERSION= 20100204 CATEGORIES= devel MASTER_SITES= http://reality.sgiweb.org/davea/ @@ -22,7 +22,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libelf.so.0:${PORTSDIR}/devel/libelf WRKSRC= ${WRKDIR}/dwarf-${PORTVERSION}/libdwarf GNU_CONFIGURE= yes -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ +CONFIGURE_ENV+= CFLAGS="${CFLAGS} -I. -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" USE_DOS2UNIX= *.h diff --git a/devel/libdwarf/distinfo b/devel/libdwarf/distinfo index 6bca632a1efd..bf9237797be9 100644 --- a/devel/libdwarf/distinfo +++ b/devel/libdwarf/distinfo @@ -1,3 +1,3 @@ -MD5 (libdwarf-20080615.tar.gz) = 4ee8f6bcc5d7dfd58373dea387a9b957 -SHA256 (libdwarf-20080615.tar.gz) = f787bb48ecebdaadbfd3ebc5d01121decaaf00c11125d9c7636376ecf1daa988 -SIZE (libdwarf-20080615.tar.gz) = 1092542 +MD5 (libdwarf-20100204.tar.gz) = 0d9d0f315f6ec335b57f29c081ca792f +SHA256 (libdwarf-20100204.tar.gz) = b517d083a9b066b252922df722e7a9eaac4ea5a8a2d6a66e2419829563901a86 +SIZE (libdwarf-20100204.tar.gz) = 1286741 diff --git a/devel/libdwarf/files/patch-configure b/devel/libdwarf/files/patch-configure index 031bf18233d5..dca8a50474bc 100644 --- a/devel/libdwarf/files/patch-configure +++ b/devel/libdwarf/files/patch-configure @@ -1,11 +1,11 @@ ---- configure.orig Mon Nov 22 19:20:35 2004 -+++ configure Sat Feb 12 22:06:36 2005 -@@ -3255,7 +3255,7 @@ +--- configure.orig 2010-02-04 22:00:43.000000000 +0000 ++++ configure 2010-02-08 13:25:55.000000000 +0000 +@@ -3749,7 +3749,7 @@ -for ac_header in alloca.h elf.h elfaccess.h libelf.h libelf/libelf.h sys/types.h sys/ia64/elf.h +for ac_header in alloca.h elfaccess.h libelf.h libelf/libelf.h sys/types.h sys/ia64/elf.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/devel/libdwarf/files/patch-dwarf_error.c b/devel/libdwarf/files/patch-dwarf_error.c deleted file mode 100644 index 30be6ee0a10b..000000000000 --- a/devel/libdwarf/files/patch-dwarf_error.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dwarf_error.c.orig 2008-08-30 20:32:21.000000000 -0500 -+++ dwarf_error.c 2008-08-30 20:33:23.000000000 -0500 -@@ -281,7 +281,7 @@ - "DW_DLE_DF_FRAME_DECODING_ERROR(193)", - "DW_DLE_DEBUG_LOC_SECTION_SHORT(194)", - "DW_DLE_FRAME_AUGMENTATION_UNKNOWN(195)", -- "DW_DLA_PUBTYPE_CONTEXT(196)", -+ "DW_DLE_PUBTYPE_CONTEXT(196)", - "DW_DLE_DEBUG_PUBTYPES_LENGTH_BAD(197)", - "DW_DLE_DEBUG_PUBTYPES_VERSION_ERROR(198)", - "DW_DLE_DEBUG_PUBTYPES_DUPLICATE(199)", diff --git a/devel/libdwarf/files/patch-libdwarf.h b/devel/libdwarf/files/patch-libdwarf.h deleted file mode 100644 index a984dbd16f36..000000000000 --- a/devel/libdwarf/files/patch-libdwarf.h +++ /dev/null @@ -1,11 +0,0 @@ ---- libdwarf.h.orig 2008-08-30 20:32:29.000000000 -0500 -+++ libdwarf.h 2008-08-30 20:33:43.000000000 -0500 -@@ -897,7 +897,7 @@ - #define DW_DLE_DF_FRAME_DECODING_ERROR 193 - #define DW_DLE_DEBUG_LOC_SECTION_SHORT 194 - #define DW_DLE_FRAME_AUGMENTATION_UNKNOWN 195 --#define DW_DLA_PUBTYPE_CONTEXT 196 -+#define DW_DLE_PUBTYPE_CONTEXT 196 - #define DW_DLE_DEBUG_PUBTYPES_LENGTH_BAD 197 - #define DW_DLE_DEBUG_PUBTYPES_VERSION_ERROR 198 - #define DW_DLE_DEBUG_PUBTYPES_DUPLICATE 199