5 files changed, 27 insertions, 40 deletions
diff --git a/editors/dhex/Makefile b/editors/dhex/Makefile
index 6db906884e5..be5829eb528 100644
--- a/editors/dhex/Makefile
+++ b/editors/dhex/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:06 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/23 19:45:36 nia Exp $
 
-DISTNAME=	dhex_0.68
+DISTNAME=	dhex_0.69
 PKGNAME=	${DISTNAME:S/_/-/}
-PKGREVISION=	3
 CATEGORIES=	editors
-MASTER_SITES=	http://dettus.net/dhex/
+MASTER_SITES=	https://dettus.net/dhex/
 
 MAINTAINER=	amoibos@gmail.com
 HOMEPAGE=	https://www.dettus.net/dhex/
@@ -14,6 +13,10 @@ LICENSE=	gnu-gpl-v2
 USE_LANGUAGES=	c
 FAKE_NCURSES=	yes
 
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	LDFLAGS=${CFLAGS:Q}
+
 MAN1=		dhex.1
 MAN5=		dhexrc.5 dhex_markers.5 dhex_searchlog.5
 
diff --git a/editors/dhex/distinfo b/editors/dhex/distinfo
index 419c7865fac..9d6fb8334a9 100644
--- a/editors/dhex/distinfo
+++ b/editors/dhex/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.3 2019/06/08 10:40:53 rillig Exp $
+$NetBSD: distinfo,v 1.4 2020/03/23 19:45:36 nia Exp $
 
-SHA1 (dhex_0.68.tar.gz) = d23d65a7b330b47f8254f6c1ff25a30c4778440e
-RMD160 (dhex_0.68.tar.gz) = 0b5e4232a8f9e0a3ae345a9c1486c335ae7038c2
-SHA512 (dhex_0.68.tar.gz) = 9397ec0574652022387f4108613f839b9262841c436079249fb325011b0a0e3c5bbd32d323f37b0f30e643f7060c1275337710c237ab68fb0c3f8096651a2421
-Size (dhex_0.68.tar.gz) = 58602 bytes
-SHA1 (patch-aa) = 663a11004dc2838797c9d16f5953e500f33f4f65
-SHA1 (patch-ac) = 05a58bbf2202de62699cb1ebee9238dae7e52bc7
+SHA1 (dhex_0.69.tar.gz) = f18020a8fd59839eb735bc8bba2624c9a8a7ae5c
+RMD160 (dhex_0.69.tar.gz) = e963140362f661bb415ae0519dcd62192ab4fa70
+SHA512 (dhex_0.69.tar.gz) = 76115fd6b67bf1f61af6acfbc4dac9ac54c14aeb291de6a190aa1ffa599cf8b3e40a422ed34c237cf1f5c7406b07e38e38fb1c9c9dd36ce93d05265238060ba0
+Size (dhex_0.69.tar.gz) = 57362 bytes
+SHA1 (patch-main.c) = 1e9b3801f5d11373a53e21aa0e98e72cfcc3cc98
diff --git a/editors/dhex/patches/patch-aa b/editors/dhex/patches/patch-aa
deleted file mode 100644
index 6045db4f9e2..00000000000
--- a/editors/dhex/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2019/06/08 10:40:53 rillig Exp $
-
-require NetBSD
-
---- main.c.orig	2011-02-25 14:54:07.000000000 +0100
-+++ main.c	2011-02-25 14:54:27.000000000 +0100
-@@ -469,6 +469,7 @@
- 		output->win=initscr();
- 		pairsinit(output);
- 		noecho();
-+		raw();
- 		nodelay(output->win,1);
- 		if (keyboardsetupreq) keyboardsetup(output,configfile);
- 		readbuf(buf1,0);
diff --git a/editors/dhex/patches/patch-ac b/editors/dhex/patches/patch-ac
deleted file mode 100644
index 447a0e2de23..00000000000
--- a/editors/dhex/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2019/06/08 10:40:53 rillig Exp $
-
-disable one compiler flag
-
---- Makefile.orig	2011-02-25 16:20:02.000000000 +0100
-+++ Makefile	2011-02-25 16:21:03.000000000 +0100
-@@ -1,7 +1,7 @@
- CC=		gcc
- LDFLAGS=	-L/usr/lib	-L/usr/local/lib  	-L/usr/lib/ncurses	-L/usr/local/lib/ncurses
- CPPFLAGS=	-I/usr/include	-I/usr/local/include	-I/usr/include/ncurses	-I/usr/local/include/ncurses
--CFLAGS=		-O3 -Wall -std=c99 
-+CFLAGS=		#-O3 -Wall -std=c99 
- #CFLAGS+= -ffunction-sections -fdata-sections
- #LDFLAGS+= --gc-sections 
- LIBS=		-lncurses
diff --git a/editors/dhex/patches/patch-main.c b/editors/dhex/patches/patch-main.c
new file mode 100644
index 00000000000..5a6909d12b4
--- /dev/null
+++ b/editors/dhex/patches/patch-main.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-main.c,v 1.1 2020/03/23 19:45:37 nia Exp $
+
+Required by NetBSD curses.
+
+--- main.c.orig	2019-01-19 16:17:37.000000000 +0000
++++ main.c
+@@ -530,6 +530,7 @@ int main(int argc,char** argv)
+ 		output->win=initscr();
+ 		pairsinit(output);
+ 		noecho();
++		raw();
+ 		nodelay(output->win,1);
+ 		if (keyboardsetupreq) keyboardsetup(output,configfile);
+ 		if (bhexcalc)