Here is more complete patch. Suggestion from Chris Kuethe to truncate
unwanted patches and use patch -E to apply diff. This will remove
unneeded patches automatically.
Genadijus Paleckis wrote:
here is patch to update to 2.0.12, rename executable to hte (removing
conflict with texlive_base) and to use included lzo instead of external
dep.
patches patch-io_posix_htsys_cc and patch-io_htio_h must be removed by
hand.
Paul Irofti wrote:
pkg/DESCR:
HT is a file editor/viewer/analyzer for executables. The goal is to
combine the low-level functionality of a debugger and the usability of
IDEs. We plan to implement all (hex-)editing features and support of the
most important file formats.
Please test and comment, this is most useful for exec in-depth analysis.
Index: Makefile
===================================================================
RCS file: /cvs/ports/editors/ht/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 6 Nov 2007 06:33:51 -0000 1.9
+++ Makefile 13 Apr 2008 11:18:57 -0000
@@ -2,14 +2,15 @@
COMMENT= file editor/viewer/analyzer for executables
-DISTNAME= ht-0.7.4
-PKGNAME= ${DISTNAME}p1
+DISTNAME= ht-2.0.12
CATEGORIES= editors
HOMEPAGE= http://hte.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hte/}
+MAINTAINER= Paul Irofti <[EMAIL PROTECTED]>
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -28,8 +29,11 @@ CONFIGURE_ARGS+= --disable-x11-textmode
.else
USE_X11= Yes
CONFIGURE_ENV= X11BASE=${X11BASE} CPPFLAGS=-I${X11BASE}/include
+# rename of executeble is needed to remove conflict with print/texlive/base
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include \
- --x-libraries=${X11BASE}/lib
+ --x-libraries=${X11BASE}/lib \
+ --with-included-lzo \
+ --program-transform-name='s/ht/hte/'
WANTLIB+= X11
.endif
Index: distinfo
===================================================================
RCS file: /cvs/ports/editors/ht/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 5 Apr 2007 15:38:07 -0000 1.6
+++ distinfo 13 Apr 2008 11:18:57 -0000
@@ -1,5 +1,5 @@
-MD5 (ht-0.7.4.tar.gz) = zbe0LLja7fEiQlQGuzzP3g==
-RMD160 (ht-0.7.4.tar.gz) = zXv7Gxj/yRRdcjYQ+z/7F+wIfgU=
-SHA1 (ht-0.7.4.tar.gz) = 8Dkgkr7iRPda5KREal17YmKLVTA=
-SHA256 (ht-0.7.4.tar.gz) = ONZpYiHuGoAQkrKfbs41kwbtSLjOMtSfYnIIaGefLPk=
-SIZE (ht-0.7.4.tar.gz) = 809899
+MD5 (ht-2.0.12.tar.gz) = K3BPCklG2gLeuHl7DVAJRg==
+RMD160 (ht-2.0.12.tar.gz) = pB6nwjXIq3hLAcCHyXurtjz2l60=
+SHA1 (ht-2.0.12.tar.gz) = RcaxzTGSfNQ+l1PiX9MkLXdA0kY=
+SHA256 (ht-2.0.12.tar.gz) = sUgSO60vS9MHJfeMTBdQeaeF7pxM8+eC8ZYa0bZDTwQ=
+SIZE (ht-2.0.12.tar.gz) = 1046455
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/editors/ht/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 4 Jan 2004 17:27:48 -0000 1.3
+++ patches/patch-configure 13 Apr 2008 11:18:57 -0000
@@ -1,21 +1,21 @@
-$OpenBSD: patch-configure,v 1.3 2004/01/04 17:27:48 sturm Exp $
---- configure.orig 2003-11-06 22:07:50.000000000 +0100
-+++ configure 2004-01-04 17:54:41.000000000 +0100
-@@ -1420,7 +1420,7 @@ fi;
+$OpenBSD$
+--- configure.orig Sun Apr 13 09:47:28 2008
++++ configure Sun Apr 13 09:48:40 2008
+@@ -1979,7 +1979,7 @@ fi
+
+ if test "x$enable_maintainermode" = "xno"; then
if test "x$enable_release" = "xyes"; then
- FLAGS_ALL="-O2 -fomit-frame-pointer -Wall -fsigned-char"
- else
-- FLAGS_ALL="-g -O0 -Wall -fsigned-char"
+- FLAGS_ALL="-O3 -fomit-frame-pointer -Wall -fsigned-char"
+ FLAGS_ALL="${CFLAGS} -fsigned-char"
+ else
+ FLAGS_ALL="-ggdb -g3 -O0 -Wall -fsigned-char"
fi
-
- if test "x$enable_profiling" = "xyes"; then
-@@ -3835,7 +3835,7 @@ HAVE_X11=0
+@@ -5728,7 +5728,7 @@ HAVE_X11=0
if test "x$enable_x11_textmode" = "xyes"; then
TEMP_LDFLAGS=$LDFLAGS
- LDFLAGS="$HT_LDFLAGS -L/usr/X11/lib -L/usr/X11R6/lib"
+ LDFLAGS="$HT_LDFLAGS -L${X11BASE}/lib"
- echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
- echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6
+ { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
+ echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
Index: patches/patch-io_htio_h
===================================================================
RCS file: /cvs/ports/editors/ht/patches/patch-io_htio_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-io_htio_h
--- patches/patch-io_htio_h 18 Jun 2003 01:54:49 -0000 1.1
+++ patches/patch-io_htio_h 13 Apr 2008 11:18:57 -0000
@@ -1,11 +0,0 @@
-$OpenBSD: patch-io_htio_h,v 1.1 2003/06/18 01:54:49 avsm Exp $
---- io/htio.h.orig Tue Jun 17 02:11:15 2003
-+++ io/htio.h Tue Jun 17 02:11:37 2003
-@@ -25,6 +25,7 @@
-
- // include sys/types.h _before_ dirent.h because Darwin needs this (!)
- #include <sys/types.h>
-+#include <sys/param.h>
- #include <dirent.h>
- #include <time.h>
-
Index: patches/patch-io_posix_htsys_cc
===================================================================
RCS file: /cvs/ports/editors/ht/patches/patch-io_posix_htsys_cc,v
retrieving revision 1.1
diff -u -p -r1.1 patch-io_posix_htsys_cc
--- patches/patch-io_posix_htsys_cc 4 Jan 2004 17:27:48 -0000 1.1
+++ patches/patch-io_posix_htsys_cc 13 Apr 2008 11:18:57 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-io_posix_htsys_cc,v 1.1 2004/01/04 17:27:48 sturm Exp $
---- io/posix/htsys.cc.orig 2004-01-04 17:55:28.000000000 +0100
-+++ io/posix/htsys.cc 2004-01-04 17:59:08.000000000 +0100
-@@ -209,7 +209,7 @@ int sys_ipc_exec(ht_streamfile **in, ht_
- close(in_fds[0]);
- close(out_fds[1]);
- close(err_fds[1]);
-- execl(cmd, cmd, NULL);
-+ execl(cmd, cmd, (void *)NULL);
- exit(1);
- } else return errno;
- }
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/ht/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 6 Nov 2007 06:33:51 -0000 1.3
+++ pkg/PLIST 13 Apr 2008 11:18:57 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.3 2007/11/06 06:33:51 bernd Exp $
[EMAIL PROTECTED] texlive_base-*
-bin/ht
+bin/hte
share/doc/ht/
share/doc/ht/README
share/doc/ht/ht.html
