Changes 1.2.10:

	- handle getnstr() not defined (needed for SGI IRIX 6.5.22)

Changes 1.2.9:
	- fix searching larger than 3 characters long strings

Changes 1.2.8:
	- replace the unsafe getstr() with getnstr()

Changes 1.2.7:
	- check the presence of <sys/mount.h> before including it
	- fix build on Digital UNIX 4.0f (remove -Wall)
	- use the full width of the terminal (the trick is to stop relying on
	printing "\n", but using move() instead)
	- fix displaying the offsets at beginning of each line on big endian
	boxes (thanks to Martin Schaffner)

Changes 1.2.6:
	- fix core dump when searching backward (thanks to Jean Delvare)
          (the culprit is memrmem, but also fixing provided memrchr)

Changes 1.2.5:
	- fix build on Solaris
	  (which doesn't have BLKGETSIZE and all compilers don't have -W)

Changes 1.2.4:
	- use BLKGETSIZE to try to get the size of a device
	- do not die horribly when accessing after the end
	- fix provided memrchr() (thanks to Yue Luo)
	- fix displaying after searching >32bit files (thanks to Paul Mattal)

Changes 1.2.3:
	- add some KEY_HOME KEY_END (^[[7~ and ^[[8~)
	- fix for HAVE_MEMMEM
	- fix my memrchr not behaving the same as libc's
	- fix the use of memrchr to behave as libc's
	- use "(void)" in prototype of functions having no parameters
	- call "raw()" when help() is over

6 files changed, 23 insertions, 89 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index fa289bf4707..724414caa1b 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,25 +1,17 @@
-# $NetBSD: Makefile,v 1.21 2004/04/11 08:12:34 snj Exp $
-#
+# $NetBSD: Makefile,v 1.22 2004/08/03 12:12:54 adam Exp $
 
-DISTNAME=	hexedit-1.2.2
-PKGREVISION=			2
+DISTNAME=	hexedit-1.2.10
 CATEGORIES=	editors
-MASTER_SITES=	http://www.chez.com/prigaux/
+MASTER_SITES=	http://merd.net/pixel/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	tech-pkg@NetBSD.org
-HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
+HOMEPAGE=	http://merd.net/pixel/hexedit.html
 COMMENT=	To view and edit files in hexadecimal or ASCII
 
-WRKSRC=		${WRKDIR}/hexedit
-GNU_CONFIGURE=	yes
-USE_BUILDLINK3=	yes
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hexedit
-.for file in COPYING Changes TODO
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
-.endfor
+WRKSRC=			${WRKDIR}/hexedit
+USE_BUILDLINK3=		yes
+GNU_CONFIGURE=		yes
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hexedit/PLIST b/editors/hexedit/PLIST
index d5e9f66bf18..d75cb7fa690 100644
--- a/editors/hexedit/PLIST
+++ b/editors/hexedit/PLIST
@@ -1,7 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 21:22:48 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/08/03 12:12:54 adam Exp $
 bin/hexedit
 man/man1/hexedit.1
-share/doc/hexedit/COPYING
-share/doc/hexedit/Changes
-share/doc/hexedit/TODO
-@dirrm share/doc/hexedit
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index 2654d67f664..85e1bebfad3 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/08/08 13:24:56 scw Exp $
+$NetBSD: distinfo,v 1.6 2004/08/03 12:12:54 adam Exp $
 
-SHA1 (hexedit-1.2.2.src.tgz) = 6f145f07717680fb088fb56f9813ba429bfae6b3
-Size (hexedit-1.2.2.src.tgz) = 56247 bytes
-SHA1 (patch-aa) = fbb203fb3e86b5ac2d029e9859112d5e7ec37344
+SHA1 (hexedit-1.2.10.src.tgz) = 91ddc20587da85f5d4c33e97bae73453d19ed788
+Size (hexedit-1.2.10.src.tgz) = 61566 bytes
 SHA1 (patch-ac) = 969c8f19692e63eb817f917f35b8ff871e689ed9
-SHA1 (patch-ad) = fda8797b504b572d68842cdc0cfba2c1c6f02de9
-SHA1 (patch-ae) = a6f76bf77125efce668c36acd4e769c3ecad0012
+SHA1 (patch-ae) = 182659941237f13c23c7bfb48527000504da33de
diff --git a/editors/hexedit/patches/patch-aa b/editors/hexedit/patches/patch-aa
deleted file mode 100644
index fd3302c4da1..00000000000
--- a/editors/hexedit/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/01/18 22:59:31 mjl Exp $
-
---- 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
- 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
-+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-ad b/editors/hexedit/patches/patch-ad
deleted file mode 100644
index 36fb5683473..00000000000
--- a/editors/hexedit/patches/patch-ad
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/09/01 10:17:35 cjep Exp $
---- display.c.orig	2003-08-08 13:50:59.000000000 +0100
-+++ display.c	2003-08-08 14:10:45.000000000 +0100
-@@ -144,7 +144,7 @@
- 
-   move(0,0);
-   for (i = 0; i < nbBytes; i += lineLength) displayLine(i, nbBytes);
--  for (; i < page; i += lineLength) PRINTW(("%08lX\n", base + i))
-+  for (; i < page; i += lineLength) PRINTW(("%08" INT_FMT "\n", base + i))
- 
-   attrset(NORMAL);
-   move(LINES - 1, 0);
-@@ -153,8 +153,8 @@
-   if (isReadOnly) i = '%';
-   else if (edited) i = '*';
-   else i = '-';
--  printw("-%c%c  %s       --0x%llX", i, i, baseName, base + cursor);
--  if (MAX(fileSize, lastEditedLoc)) printw("/0x%llX", getfilesize());
-+  printw("-%c%c  %s       --0x%" INT_FMT, i, i, baseName, base + cursor);
-+  if (MAX(fileSize, lastEditedLoc)) printw("/0x%" INT_FMT, getfilesize());
-   if (option == bySector) printw("--sector %d", (base + cursor) / SECTOR_SIZE);
- 
-   move(cursor / lineLength, computeCursorXCurrentPos());
-@@ -164,7 +164,7 @@
- {
-   int i;
- 
--  PRINTW(("%08lX   ", base + offset))
-+  PRINTW(("%08" INT_FMT "   ", base + offset))
-   for (i = offset; i < offset + lineLength; i++) {
-      if (i > offset) MAXATTRPRINTW(bufferAttr[i] & MARKED, (((i - offset) % blocSize) ? " " : "  "))
-      if (i < max) ATTRPRINTW(bufferAttr[i], ("%02X", buffer[i]))
diff --git a/editors/hexedit/patches/patch-ae b/editors/hexedit/patches/patch-ae
index 572ef13ba93..b1896648f6c 100644
--- a/editors/hexedit/patches/patch-ae
+++ b/editors/hexedit/patches/patch-ae
@@ -1,6 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2003/09/01 10:17:36 cjep Exp $
---- hexedit.h.orig	2003-08-08 13:51:08.000000000 +0100
-+++ hexedit.h	2003-08-08 13:52:50.000000000 +0100
+$NetBSD: patch-ae,v 1.3 2004/08/03 12:12:54 adam Exp $
+
+--- hexedit.h.orig	2004-05-07 15:26:43.000000000 +0000
++++ hexedit.h
 @@ -2,6 +2,7 @@
  #define HEXEDIT_H
  
@@ -9,11 +10,11 @@ $NetBSD: patch-ae,v 1.2 2003/09/01 10:17:36 cjep Exp $
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
-@@ -26,6 +27,7 @@
+@@ -24,6 +25,7 @@
+ #include <libgen.h>
+ #endif
+ #if HAVE_SYS_MOUNT_H
++#include <sys/param.h>
+ #include <sys/mount.h> /* for BLKGETSIZE */
+ #endif
  
- 
- #define INT off_t
-+#define INT_FMT PRIX64	/* Modern, Sane OSs have a 64-bit off_t */
- 
- /*******************************************************************************/
- /* Macros */