From 7b4a9ec727bf10ca3a6a891e1bd87a7900994edf Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 1 Oct 2001 00:51:46 +0000
Subject: Buildlinkify (strongly), and use ncurses' buildlink.mk, which removes
 the need for some of the hacks in the patches.

---
 editors/hexedit/Makefile         | 13 ++++---------
 editors/hexedit/distinfo         |  6 +++---
 editors/hexedit/patches/patch-ab |  9 +++------
 editors/hexedit/patches/patch-ac | 21 +--------------------
 4 files changed, 11 insertions(+), 38 deletions(-)

(limited to 'editors/hexedit')

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 03177e72286..eafb084562d 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/16 14:40:50 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2001/10/01 00:51:46 wiz Exp $
 #
 
 DISTNAME=	hexedit-1.1.0
@@ -11,8 +11,8 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 COMMENT=	to view and edit files in hexadecimal or ASCII
 
-GNU_CONFIGURE=	yes
-LDFLAGS+=	-L${LOCALBASE}/lib	# for -lncurses
+GNU_CONFIGURE=		yes
+USE_BUILDLINK_ONLY=	yes
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hexedit
@@ -20,10 +20,5 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/hexedit
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-DEPENDS+=	ncurses>=4.2:../../devel/ncurses
-.endif
-
+.include "../../devel/ncurses/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index fcc40be0534..37dfa5f32da 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:01:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/10/01 00:51:46 wiz 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) = e64a3fe166cab13a81f229c82ff7080332a96145
-SHA1 (patch-ac) = 610c62efc6e874428399d5205414a67796d143fe
+SHA1 (patch-ab) = d7ef68877da920ee644af88503229f8571b4aab8
+SHA1 (patch-ac) = 673e39d3722dff4f32269c290ff74e82d00a7b88
diff --git a/editors/hexedit/patches/patch-ab b/editors/hexedit/patches/patch-ab
index 81d3e79c6e3..e4a2525ce60 100644
--- a/editors/hexedit/patches/patch-ab
+++ b/editors/hexedit/patches/patch-ab
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.4 1999/11/12 16:07:02 agc Exp $
+$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,11 @@
+@@ -12,7 +12,7 @@
  #if HAVE_UNISTD_H
  #include <unistd.h>
  #endif
-+#ifdef __NetBSD__
+-#include <curses.h>
 +#include <ncurses.h>
-+#else
- #include <curses.h>
-+#endif
  #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 d6414192516..98a1b8250fa 100644
--- a/editors/hexedit/patches/patch-ac
+++ b/editors/hexedit/patches/patch-ac
@@ -1,26 +1,7 @@
-$NetBSD: patch-ac,v 1.4 1999/11/12 16:07:02 agc Exp $
+$NetBSD: patch-ac,v 1.5 2001/10/01 00:51:47 wiz Exp $
 
 --- Makefile.in.orig	Wed Feb 17 14:22:57 1999
 +++ Makefile.in	Fri Nov 12 16:04:03 1999
-@@ -7,11 +7,18 @@
- 
- CC = @CC@
- CFLAGS = @CFLAGS@
-+CFLAGS += -I${LOCALBASE}/include	# for ncurses.h
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- DEFS = @DEFS@
- INSTALL = @INSTALL@
- 
-+OPSYS!= uname -s
-+
-+.if ${OPSYS} == "SunOS"
-+LIBS+= -lcurses
-+.endif
-+
- # Installation directories
- prefix = @prefix@
- exec_prefix = @exec_prefix@
 @@ -39,7 +46,5 @@
  	rm -f Makefile config.cache config.status config.log
  
-- 
cgit v1.2.3