Update hexedit to 1.2.2

- now displays the reached offset while searching
- many shortcuts added for different teminals
- replace llseek with lseek + use of _FILE_OFFSET_BITS=64
- replaced lots of int by INT which 64bits
- yet again some s/int/INT/
- Some bug fixed

Fixes PR/15050 by Shell Hung.

5 files changed, 31 insertions, 45 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index eafb084562d..7aa17b56962 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2001/10/01 00:51:46 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2002/01/18 22:59:30 mjl Exp $
 #
 
-DISTNAME=	hexedit-1.1.0
+DISTNAME=	hexedit-1.2.2
 WRKSRC=		${WRKDIR}/hexedit
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index 37dfa5f32da..7651bda3c91 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2001/10/01 00:51:46 wiz Exp $
+$NetBSD: distinfo,v 1.4 2002/01/18 22:59:30 mjl Exp $
 
-SHA1 (hexedit-1.1.0.src.tgz) = 096e5c992d6a484de66f2e66865c66b584ceedef
-Size (hexedit-1.1.0.src.tgz) = 39569 bytes
-SHA1 (patch-aa) = 06f504c4adf19f458b176854c9b5d29bca9ecc7d
-SHA1 (patch-ab) = d7ef68877da920ee644af88503229f8571b4aab8
-SHA1 (patch-ac) = 673e39d3722dff4f32269c290ff74e82d00a7b88
+SHA1 (hexedit-1.2.2.src.tgz) = 6f145f07717680fb088fb56f9813ba429bfae6b3
+Size (hexedit-1.2.2.src.tgz) = 56247 bytes
+SHA1 (patch-aa) = fbb203fb3e86b5ac2d029e9859112d5e7ec37344
+SHA1 (patch-ac) = 969c8f19692e63eb817f917f35b8ff871e689ed9
diff --git a/editors/hexedit/patches/patch-aa b/editors/hexedit/patches/patch-aa
index 1eae5cf631d..fd3302c4da1 100644
--- a/editors/hexedit/patches/patch-aa
+++ b/editors/hexedit/patches/patch-aa
@@ -1,21 +1,21 @@
-$NetBSD: patch-aa,v 1.4 1999/07/06 08:00:11 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2002/01/18 22:59:31 mjl Exp $
 
---- configure.orig	Tue Mar  9 05:07:58 1999
-+++ configure	Fri Jul  2 05:07:04 1999
-@@ -781,7 +781,7 @@
+--- configure.orig	Tue Dec 25 18:01:39 2001
++++ configure
+@@ -1822,6 +1822,7 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
--
-+if false ; then		# skip check for curses...we use ncurses
- echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
- echo "configure:787: checking for initscr in -lcurses" >&5
- ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
-@@ -814,6 +814,7 @@
- rm -f conftest*
- LIBS="$ac_save_LIBS"
- 
-+fi
++if false ; then
+ echo "$as_me:1825: checking for initscr in -lcurses" >&5
+ echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
+ if test "${ac_cv_lib_curses_initscr+set}" = set; then
+@@ -1875,6 +1876,8 @@
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
  fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
++fi
++
+ echo "$as_me:1878: result: $ac_cv_lib_curses_initscr" >&5
+ echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
+ if test $ac_cv_lib_curses_initscr = yes; then
diff --git a/editors/hexedit/patches/patch-ab b/editors/hexedit/patches/patch-ab
deleted file mode 100644
index e4a2525ce60..00000000000
--- a/editors/hexedit/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/10/01 00:51:47 wiz Exp $
-
---- hexedit.h	1999/11/12 15:56:55	1.1
-+++ hexedit.h	1999/11/12 15:57:32
-@@ -12,7 +12,7 @@
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
--#include <curses.h>
-+#include <ncurses.h>
- #include <ctype.h>
- #include <signal.h>
- #if HAVE_SYS_WAIT_H
diff --git a/editors/hexedit/patches/patch-ac b/editors/hexedit/patches/patch-ac
index 98a1b8250fa..55f4d9fe6e1 100644
--- a/editors/hexedit/patches/patch-ac
+++ b/editors/hexedit/patches/patch-ac
@@ -1,14 +1,14 @@
-$NetBSD: patch-ac,v 1.5 2001/10/01 00:51:47 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2002/01/18 22:59:31 mjl Exp $
 
---- Makefile.in.orig	Wed Feb 17 14:22:57 1999
-+++ Makefile.in	Fri Nov 12 16:04:03 1999
-@@ -39,7 +46,5 @@
- 	rm -f Makefile config.cache config.status config.log
+--- Makefile.in.orig	Thu Oct 25 00:00:51 2001
++++ Makefile.in
+@@ -40,7 +40,5 @@
+ 	rm -f Makefile config.h
  
  install: $(PRODUCT)
 -	$(INSTALL) -d -m 755 $(bindir)
 -	$(INSTALL) -s -m 755 $(PRODUCT) $(bindir)
--	$(INSTALL) -d -m 755 $(mandir)
--	$(INSTALL) -m 644 $(PRODUCT).1 $(mandir)
+-	$(INSTALL) -d -m 755 $(mandir)/man1
+-	$(INSTALL) -m 644 $(PRODUCT).1 $(mandir)/man1
 +	$(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir)
-+	$(BSD_INSTALL_DATA) $(PRODUCT).1 $(mandir)
++	$(BSD_INSTALL_DATA) $(PRODUCT).1 $(mandir)/man1/