* Update ncurses dependency.

    * Correct MD5 checksum of distfile.
    * Adapt to ncurses-4.2.

4 files changed, 36 insertions, 37 deletions

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index e185ad44d8b..85a21cd3a10 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 1999/02/20 22:48:27 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 1999/07/06 08:00:10 jlam Exp $
 #
 
 DISTNAME=	hexedit-1.1.0
@@ -10,13 +10,13 @@ EXTRACT_SUFX=	.src.tgz
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 
-DEPENDS+=	ncurses-1.9.9g:../../devel/ncurses
+DEPENDS+=	ncurses-4.2:../../devel/ncurses
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	LIBS="-L${PREFIX}/lib" INSTALL=/usr/bin/install
+LDFLAGS+=	-L${LOCALBASE}/lib	# for -lncurses
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/hexedit
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hexedit
 .for file in COPYING Changes TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
 .endfor
diff --git a/editors/hexedit/files/md5 b/editors/hexedit/files/md5
index b4e8cfe7449..3cdc01c3378 100644
--- a/editors/hexedit/files/md5
+++ b/editors/hexedit/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 1999/02/06 20:32:44 frueauf Exp $
+$NetBSD: md5,v 1.5 1999/07/06 08:00:10 jlam Exp $
 
-MD5 (hexedit-1.1.0.src.tgz) = 91d610d21288e99092a1498daaa01fc8
+MD5 (hexedit-1.1.0.src.tgz) = 29972c7afc503f55e728a8310ef8491a
diff --git a/editors/hexedit/patches/patch-aa b/editors/hexedit/patches/patch-aa
index 582c43f8bd0..1eae5cf631d 100644
--- a/editors/hexedit/patches/patch-aa
+++ b/editors/hexedit/patches/patch-aa
@@ -1,31 +1,21 @@
-$NetBSD: patch-aa,v 1.3 1998/09/28 10:35:56 frueauf Exp $
+$NetBSD: patch-aa,v 1.4 1999/07/06 08:00:11 jlam Exp $
 
---- 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'
+--- configure.orig	Tue Mar  9 05:07:58 1999
++++ configure	Fri Jul  2 05:07:04 1999
+@@ -781,7 +781,7 @@
  
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
--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
+-
++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_%'`
- 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 @@
+@@ -814,6 +814,7 @@
+ rm -f conftest*
+ LIBS="$ac_save_LIBS"
+ 
++fi
  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-ac b/editors/hexedit/patches/patch-ac
index c5ac6ce0c56..8180f13ec98 100644
--- a/editors/hexedit/patches/patch-ac
+++ b/editors/hexedit/patches/patch-ac
@@ -1,13 +1,22 @@
-$NetBSD: patch-ac,v 1.1 1998/09/28 10:35:56 frueauf Exp $
+$NetBSD: patch-ac,v 1.2 1999/07/06 08:00:11 jlam 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
+--- Makefile.in.orig	Wed Feb 17 09:22:57 1999
++++ Makefile.in	Fri Jul  2 06:57:09 1999
+@@ -7,6 +7,7 @@
  
  CC = @CC@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ -I${prefix}/include
+ CFLAGS = @CFLAGS@
++CFLAGS += -I${LOCALBASE}/include	# for ncurses.h
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  DEFS = @DEFS@
+@@ -39,7 +40,5 @@
+ 	rm -f Makefile config.cache config.status config.log
+ 
+ install: $(PRODUCT)
+-	$(INSTALL) -d -m 755 $(bindir)
+-	$(INSTALL) -s -m 755 $(PRODUCT) $(bindir)
+-	$(INSTALL) -d -m 755 $(mandir)
+-	$(INSTALL) -m 644 $(PRODUCT).1 $(mandir)
++	$(BSD_INSTALL_PROGRAM) $(PRODUCT) $(bindir)
++	$(BSD_INSTALL_DATA) $(PRODUCT).1 $(mandir)