Update hexedit to 1.0.0.

5 files changed, 56 insertions, 44 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index ca5a9a07cfc..2f47bc5b2d0 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1998/08/27 22:08:37 frueauf Exp $
+# $NetBSD: Makefile,v 1.3 1998/09/28 10:35:48 frueauf Exp $
 #
 
-DISTNAME=	hexedit-0.9.5
+DISTNAME=	hexedit-1.0.0
 WRKSRC=		${WRKDIR}/hexedit
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/
@@ -12,13 +12,12 @@ HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 
 DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
 
-CONFLICTS=	hexedit-0.9.4
+CONFLICTS=	hexedit-0.9.4 hexedit-0.9.5
 
-ALL_TARGET=	# empty
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	LIBS="-L${PREFIX}/lib"
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hexedit ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/hexedit.1 ${PREFIX}/man/man1
+post-install:
 	${MKDIR} ${PREFIX}/share/doc/hexedit
 .for file in COPYING Changes TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
diff --git a/editors/hexedit/files/md5 b/editors/hexedit/files/md5
index e682e5e23ae..02cafb24dd2 100644
--- a/editors/hexedit/files/md5
+++ b/editors/hexedit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/27 22:08:38 frueauf Exp $
+$NetBSD: md5,v 1.3 1998/09/28 10:35:49 frueauf Exp $
 
-MD5 (hexedit-0.9.5.src.tgz) = dd7131cb5f5b885bc2fa911f116ce473
+MD5 (hexedit-1.0.0.src.tgz) = cbf49bfa81f0e3c779b46c9cbe4266b7
diff --git a/editors/hexedit/patches/patch-aa b/editors/hexedit/patches/patch-aa
index 7b4f3acb404..582c43f8bd0 100644
--- a/editors/hexedit/patches/patch-aa
+++ b/editors/hexedit/patches/patch-aa
@@ -1,31 +1,31 @@
-$NetBSD: patch-aa,v 1.2 1998/08/27 22:08:38 frueauf Exp $
+$NetBSD: patch-aa,v 1.3 1998/09/28 10:35:56 frueauf Exp $
 
---- Makefile.orig	Wed Aug 26 14:32:18 1998
-+++ Makefile	Thu Aug 27 23:23:26 1998
-@@ -2,15 +2,15 @@
- VERSION = 0.9.5
+--- configure.orig	Thu Sep 10 17:32:03 1998
++++ configure	Tue Sep 15 14:06:07 1998
+@@ -782,14 +782,14 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
- # Define BASENAME if your libc doesn't have it
--#BASENAME=-DBASENAME
-+BASENAME=-DBASENAME
  
--DESTDIR = /usr/local
-+DESTDIR = ${PREFIX}
- 
- SHELL = /bin/sh
- CC = gcc
--CFLAGS = -O2 -Wall $(BASENAME)
--LIBS = -lcurses
--LFLAGS =
-+CFLAGS = -O2 -Wall $(BASENAME) -I${PREFIX}/include
-+LIBS = -lncurses
-+LFLAGS =-L${PREFIX}/lib
- 
- INCL = hexedit.h
- SRCS = hexedit.c display.c mark.c page.c file.c interact.c misc.c search.c
-@@ -63,4 +63,4 @@
- 	ci -l -mdefault *
- 
- TAGS:
--	etags *.[hc]
-+	etags *.[hc]
+-echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
+-echo "configure:787: checking for initscr in -lcurses" >&5
++echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
++echo "configure:787: checking for initscr in -lncurses" >&5
+ ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-lcurses  $LIBS"
++LIBS="-L${libdir} -lncurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 795 "configure"
+ #include "confdefs.h"
+@@ -817,7 +817,7 @@
+ fi
+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  LIBS="$LIBS -lcurses"
++  LIBS="$LIBS -lncurses"
+ else
+   echo "$ac_t""no" 1>&6
+ echo $ac_n "checking for initscr in -lncurses""... $ac_c" 1>&6
diff --git a/editors/hexedit/patches/patch-ab b/editors/hexedit/patches/patch-ab
index ff4d519cd27..d3ad4f63917 100644
--- a/editors/hexedit/patches/patch-ab
+++ b/editors/hexedit/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.2 1998/08/27 22:08:38 frueauf Exp $
+$NetBSD: patch-ab,v 1.3 1998/09/28 10:35:56 frueauf Exp $
 
---- hexedit.h-orig	Wed Aug 26 11:42:48 1998
-+++ hexedit.h	Thu Aug 27 23:27:38 1998
-@@ -8,7 +8,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
+--- hexedit.h.orig	Mon Aug 31 20:50:50 1998
++++ hexedit.h	Tue Sep 15 13:45:05 1998
+@@ -12,7 +12,7 @@
+ #if HAVE_UNISTD_H
  #include <unistd.h>
+ #endif
 -#include <curses.h>
 +#include <ncurses.h>
  #include <ctype.h>
  #include <signal.h>
- #include <sys/wait.h>
+ #if HAVE_SYS_WAIT_H
diff --git a/editors/hexedit/patches/patch-ac b/editors/hexedit/patches/patch-ac
new file mode 100644
index 00000000000..c5ac6ce0c56
--- /dev/null
+++ b/editors/hexedit/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 1998/09/28 10:35:56 frueauf Exp $
+
+--- Makefile.in.orig	Sat Sep 12 10:25:05 1998
++++ Makefile.in	Tue Sep 15 14:11:35 1998
+@@ -6,7 +6,7 @@
+ SHELL = /bin/sh
+ 
+ CC = @CC@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -I${prefix}/include
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ DEFS = @DEFS@