pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/devel/elfsh Update to 0.51b3.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/8dd710ca8249
branches:  trunk
changeset: 468861:8dd710ca8249
user:      cube <cube%pkgsrc.org@localhost>
date:      Tue Feb 17 12:45:56 2004 +0000

description:
Update to 0.51b3.

There is a reather long list of changes available in ${WRKSRC}/doc/ChangeLog.

diffstat:

 devel/elfsh/Makefile         |  23 +++++++++++++++------
 devel/elfsh/PLIST            |   4 +-
 devel/elfsh/distinfo         |  12 +++++-----
 devel/elfsh/patches/patch-aa |  28 +++++++++++++-------------
 devel/elfsh/patches/patch-ab |  45 ++++++++++++++++++++++++++++---------------
 devel/elfsh/patches/patch-ac |  30 ++++++++++++++--------------
 6 files changed, 82 insertions(+), 60 deletions(-)

diffs (216 lines):

diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/Makefile
--- a/devel/elfsh/Makefile      Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/Makefile      Tue Feb 17 12:45:56 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:30:25 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/17 12:45:56 cube Exp $
 #
 
-VERS=          0.43b
+VERS=          0.51b3
 DISTNAME=      ${PKGNAME}-portable
 PKGNAME=       elfsh-${VERS}
 CATEGORIES=    devel
@@ -13,20 +13,29 @@
 HOMEPAGE=      http://devhell.org/projects/elfsh/
 COMMENT=       ELF format exploration shell
 
-WRKSRC=                ${WRKDIR}/elfsh_0.43
+WRKSRC=                ${WRKDIR}/${PKGNAME}
+
+USE_BUILDLINK3=                yes
+USE_GNU_READLINE=      yes
 
-USE_BUILDLINK2=        yes
+SUBST_STAGE.elfsh=     post-patch
+SUBST_FILES.elfsh=     vm/include/elfsh.h
+SUBST_SED.elfsh=       -e s,@@SH@@,${SH}, -e s,@@PREFIX@@,${PREFIX},
+SUBST_CLASSES+=                elfsh
 
 # XXX This package should be converted to use libtool
 
 do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/elfsh/elfsh ${PREFIX}/bin/elfsh
+       ${INSTALL_PROGRAM} ${WRKSRC}/vm/elfsh ${PREFIX}/bin/elfsh
        ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.a ${PREFIX}/lib/libelfsh.a
        ${INSTALL_DATA} ${WRKSRC}/libelfsh/libelfsh.so ${PREFIX}/lib/libelfsh.so
        ${INSTALL_DATA} ${WRKSRC}/libelfsh/include/libelfsh.h ${PREFIX}/include/libelfsh.h
+       ${INSTALL_DATA_DIR} ${PREFIX}/lib/elfsh
+       ${INSTALL_DATA} ${WRKSRC}/modules/modremap.so ${PREFIX}/lib/elfsh
+       ${INSTALL_DATA} ${WRKSRC}/modules/modtest.so ${PREFIX}/lib/elfsh
        ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/elfsh
-       ${INSTALL_DATA} ${WRKSRC}/doc/README ${PREFIX}/share/doc/elfsh/README
+       ${INSTALL_DATA} ${WRKSRC}/doc/elfsh-ref.txt ${PREFIX}/share/doc/elfsh/elfsh-ref.txt
        ${INSTALL_DATA} ${WRKSRC}/doc/libelfsh-ref.txt ${PREFIX}/share/doc/elfsh/libelfsh-ref.txt
 
-.include "../../devel/readline/buildlink2.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/PLIST
--- a/devel/elfsh/PLIST Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/PLIST Tue Feb 17 12:45:56 2004 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/05 10:57:05 mjl Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/17 12:45:56 cube Exp $
 bin/elfsh
 lib/libelfsh.a
 lib/libelfsh.so
 include/libelfsh.h
-share/doc/elfsh/README
+share/doc/elfsh/elfsh-ref.txt
 share/doc/elfsh/libelfsh-ref.txt
 @unexec ${RMDIR} %D/share/doc/elfsh
diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/distinfo
--- a/devel/elfsh/distinfo      Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/distinfo      Tue Feb 17 12:45:56 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2003/05/12 21:27:10 jmc Exp $
+$NetBSD: distinfo,v 1.3 2004/02/17 12:45:56 cube Exp $
 
-SHA1 (elfsh-0.43b-portable.tgz) = a4ccc9e8727409f65a3b9571455d7e2fea56e55b
-Size (elfsh-0.43b-portable.tgz) = 101978 bytes
-SHA1 (patch-aa) = 32c31367c920dde165a79464c984bfdb346598b5
-SHA1 (patch-ab) = 4d9e36b5f163c582d636256afff5b9f9460264eb
-SHA1 (patch-ac) = 76b9926e1e3705be731784859304a168f211cf91
+SHA1 (elfsh-0.51b3-portable.tgz) = d8afc99cb2966710aa4b6a781ad9008bf0baaeb9
+Size (elfsh-0.51b3-portable.tgz) = 136679 bytes
+SHA1 (patch-aa) = 0494158b7daf4d1b55984bf98c161bf70e114430
+SHA1 (patch-ab) = 4db74e87f1505e4bd0334060019944eccd9f5cd3
+SHA1 (patch-ac) = e60e109b4e2664619defc9a56616d1c7b7c3b35a
diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/patches/patch-aa
--- a/devel/elfsh/patches/patch-aa      Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/patches/patch-aa      Tue Feb 17 12:45:56 2004 +0000
@@ -1,28 +1,28 @@
-$NetBSD: patch-aa,v 1.1.1.1 2003/05/05 10:57:05 mjl Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/17 12:45:56 cube Exp $
 
---- libelfsh/Makefile.orig     Thu Jun  6 05:03:44 2002
-+++ libelfsh/Makefile  Mon May  5 12:26:36 2003
+--- libelfsh/Makefile.orig     2003-08-21 03:11:03.000000000 +0200
++++ libelfsh/Makefile
 @@ -5,10 +5,10 @@
- ## Last update Wed Mar 27 12:06:42 2002 mayhem
+ ## Last update Tue Jun  3 09:30:50 2003 mayhem
  ##
  
 -CC                    = gcc
 -RM                    = rm -f 
 -AR                    = ar rc
--CFLAGS                        = -Iinclude -Wall -g3 -O2
+-CFLAGS                        = -rdynamic -Iinclude -Wall -fPIC -g3 -O2 -DELFSH_INTERN
 +# CC                  = gcc
 +# RM                  = rm -f 
 +# AR                  = ar rc
-+CFLAGS                        += -Iinclude -Wall -g3 -O2
++CFLAGS                        += -rdynamic -Iinclude -Wall -fPIC -g3 -O2 -DELFSH_INTERN
  SRC                   = dynamic.c dynsym.c elf.c fixup.c got.c hash.c \
-                           interp.c pht.c plt.c section.c sht.c error.c \
-                         stab.c symbol.c notes.c reloc.c functions.c \
-@@ -19,7 +19,7 @@
+                         interp.c pht.c plt.c section.c sht.c error.c stab.c \
+                       symbol.c notes.c reloc.c blocks.c ctors.c dtors.c \
+@@ -22,7 +22,7 @@ RANLIB                       = ranlib
  
  all                   : $(OBJ)
-                       $(CC) -shared $(OBJ) -o $(NAME).so
--                      $(AR) $(NAME).a $(OBJ)
-+                      $(AR) rc $(NAME).a $(OBJ)
-                       $(RANLIB) $(NAME).a
-                   
+                       @$(CC) -shared $(OBJ) -o $(NAME).so #-lasm
+-                      @$(AR) $(NAME).a $(OBJ)
++                      @$(AR) rc $(NAME).a $(OBJ)
+                       @$(RANLIB) $(NAME).a
+ 
  clean                 : 
diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/patches/patch-ab
--- a/devel/elfsh/patches/patch-ab      Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/patches/patch-ab      Tue Feb 17 12:45:56 2004 +0000
@@ -1,22 +1,35 @@
-$NetBSD: patch-ab,v 1.1.1.1 2003/05/05 10:57:05 mjl Exp $
+$NetBSD: patch-ab,v 1.2 2004/02/17 12:45:56 cube Exp $
 
---- elfsh/Makefile.orig        Mon May  5 12:27:16 2003
-+++ elfsh/Makefile     Mon May  5 12:27:43 2003
-@@ -9,12 +9,12 @@
-                         notes.c opt.c pht.c rel.c sht.c stab.c sym.c usage.c \
-                         data.c ctors.c dtors.c hexa.c
+--- vm/Makefile.orig   2003-08-21 03:23:17.000000000 +0200
++++ vm/Makefile
+@@ -19,8 +19,8 @@
+ #LDASMOPT             = -lasm
+ 
+ # Uncommant that to use libreadline
+-#READLNOPT            = -DUSE_READLN
+-#LDREADLNOPT          = -lreadline -ltermcap
++READLNOPT             = -DUSE_READLN
++LDREADLNOPT           = -lreadline -ltermcap
+ 
+ 
+ # End of configurable Makefile
+@@ -36,15 +36,15 @@ SRC                        = grammar.c disasm.c dyn.c hdr.c m
  OBJ                   = $(SRC:.c=.o)
+ SRC_DYN                       = elfsh_etdyn.c
+ OBJ_DYN                       = $(SRC_DYN:.c=.o)
 -CC                    = gcc
--NAME                  = elfsh
--LDFLAGS                       = -L../libelfsh/ -lelfsh
--CFLAGS                        = -Wall -Iinclude -I../libelfsh/include -g3 -O2
--RM                    = rm -f 
+-RM                    = rm -f
 +# CC                  = gcc
++# RM                  = rm -f
  NAME                  = elfsh
-+LDFLAGS                       += -L../libelfsh/ -lelfsh
-+CFLAGS                        += -Wall -Iinclude -I../libelfsh/include -g3 -O2
-+# RM                  = rm -f 
-+# NAME                        = elfsh
+ 
+-CFLAGS                        = -rdynamic -fPIC -g3 -O2 -Wall -Iinclude \
++CFLAGS                        += -rdynamic -fPIC -g3 -O2 -Wall -Iinclude \
+                       -I../libhash/include/ -I../libelfsh/include/ \
+                       -DELFSH_INTERN $(DLOPT) $(ASMOPT) $(READLNOPT)
  
- all                   : $(OBJ)
-                      $(CC) $(LDFLAGS) $(OBJ) -o $(NAME)
+-LDFLAGS                       = -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \
++LDFLAGS                       += -L../libelfsh/ -lelfsh -L../libhash/ -lhashelfsh \
+                       -rdynamic -g3 $(LDASMOPT) $(LDREADLNOPT) $(DLOPT)\
+                       $(EXTRAOPT)
+ 
diff -r 4e87a1171509 -r 8dd710ca8249 devel/elfsh/patches/patch-ac
--- a/devel/elfsh/patches/patch-ac      Tue Feb 17 12:40:01 2004 +0000
+++ b/devel/elfsh/patches/patch-ac      Tue Feb 17 12:45:56 2004 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2003/05/12 21:27:11 jmc Exp $
+$NetBSD: patch-ac,v 1.2 2004/02/17 12:45:56 cube Exp $
 
---- elfsh/include/elfsh.h.orig Mon May 12 15:59:28 2003
-+++ elfsh/include/elfsh.h      Mon May 12 16:00:27 2003
-@@ -15,7 +15,12 @@
- 
+--- vm/include/elfsh.h.orig    2003-08-21 03:11:02.000000000 +0200
++++ vm/include/elfsh.h
+@@ -91,10 +91,10 @@
+ #define       ELFSH_SPACE             ' '
+ #define       ELFSH_VERSION           "0.51b3"
+ #define ELFSH_PROMPT          "[ELFsh-"ELFSH_VERSION"]$ "
+-#define       ELFSH_SHELL             "/bin/bash"
++#define       ELFSH_SHELL             "@@SH@@"
+ #define       ELFSH_INIT              "elfsh_init"
+ #define       ELFSH_FINI              "elfsh_fini"
+-#define       ELFSH_MODPATH           "/usr/share/elfsh/"
++#define       ELFSH_MODPATH           "@@PREFIX@@/lib/elfsh/"
  
- #if defined(__NetBSD__)
-+#include <sys/param.h>
-+#if __NetBSD_Version__ < 106000000
- #include <readline.h>
-+#else
-+#include <readline/readline.h>
-+#endif
- #elif defined(__linux__) || defined(__FreeBSD__) | defined(sun)
- #include <readline/readline.h>
- #endif
+ /* For elfsh/elfsh/disasm.c:display_object() */
+ #define       ELFSH_HEXA_VIEW         0



Home | Main Index | Thread Index | Old Index