From 1f1aa9a5f999227d98fd9677c26f018e25b1c0d3 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 3 Jul 2005 01:22:22 +0000
Subject: [PATCH] upgrade to hexedit 1.2.10

Based on a diff from Ben Hooper <ben at networkinsanity dot com>
---
 editors/hexedit/Makefile                | 11 +++--------
 editors/hexedit/distinfo                |  8 ++++----
 editors/hexedit/patches/patch-hexedit_h | 24 ++++++++++++++++++++++++
 editors/hexedit/pkg/PLIST               |  6 +-----
 4 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 editors/hexedit/patches/patch-hexedit_h

diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 0fefbf99201..60e328943b0 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2004/11/24 11:08:03 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2005/07/03 01:22:22 brad Exp $
 
 COMMENT=	"view and edit files in hexadecimal or ASCII"
 
-DISTNAME=	hexedit-1.2.2
+DISTNAME=	hexedit-1.2.10
 CATEGORIES=	editors
 MASTER_SITES=	http://www.chez.com/prigaux/	\
 		http://merd.net/pixel/
@@ -12,6 +12,7 @@ HOMEPAGE=	http://www.chez.com/prigaux/hexedit.html
 
 MAINTAINER=	Brad Smith <brad@openbsd.org>
 
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -21,12 +22,6 @@ WANTLIB=		c curses
 CONFIGURE_STYLE= gnu dest
 NO_REGRESS=	Yes
 
-DOCS=	COPYING TODO Changes
-
 WRKDIST=	${WRKDIR}/hexedit
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hexedit
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/hexedit
-
 .include <bsd.port.mk>
diff --git a/editors/hexedit/distinfo b/editors/hexedit/distinfo
index 2dea398ad2a..dcee9168b31 100644
--- a/editors/hexedit/distinfo
+++ b/editors/hexedit/distinfo
@@ -1,4 +1,4 @@
-MD5 (hexedit-1.2.2.src.tgz) = 99fcf36bf539a34e47c496b667b1f795
-RMD160 (hexedit-1.2.2.src.tgz) = fe450e927cd1c56e35d737f922f54319b4f7cc23
-SHA1 (hexedit-1.2.2.src.tgz) = 6f145f07717680fb088fb56f9813ba429bfae6b3
-SIZE (hexedit-1.2.2.src.tgz) = 56247
+MD5 (hexedit-1.2.10.src.tgz) = 5d925ab9f0746ccd1d05c80fef628938
+RMD160 (hexedit-1.2.10.src.tgz) = e46f19b0d91de3c833d02083db9e12b8f3a4eaac
+SHA1 (hexedit-1.2.10.src.tgz) = 91ddc20587da85f5d4c33e97bae73453d19ed788
+SIZE (hexedit-1.2.10.src.tgz) = 61566
diff --git a/editors/hexedit/patches/patch-hexedit_h b/editors/hexedit/patches/patch-hexedit_h
new file mode 100644
index 00000000000..1b81a202437
--- /dev/null
+++ b/editors/hexedit/patches/patch-hexedit_h
@@ -0,0 +1,24 @@
+$OpenBSD: patch-hexedit_h,v 1.1 2005/07/03 01:24:09 brad Exp $
+--- hexedit.h.orig	Sat Jul  2 21:14:58 2005
++++ hexedit.h	Sat Jul  2 21:15:31 2005
+@@ -5,6 +5,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #if HAVE_FCNTL_H
+@@ -42,8 +43,12 @@
+ #define ALT(c) ((c) | 0xa0)
+ #define DIE(M) { fprintf(stderr, M, progName); exit(1); }
+ #define FREE(p) if (p) free(p)
++#ifndef MIN
+ #define MIN(a, b) ((a) < (b) ? (a) : (b))
++#endif
++#ifndef MAX
+ #define MAX(a, b) ((a) > (b) ? (a) : (b))
++#endif
+ #define NORMAL A_NORMAL
+ #define MARKED A_REVERSE
+ #define MODIFIED A_BOLD
diff --git a/editors/hexedit/pkg/PLIST b/editors/hexedit/pkg/PLIST
index 01ca2b476e2..49a6eaa93e2 100644
--- a/editors/hexedit/pkg/PLIST
+++ b/editors/hexedit/pkg/PLIST
@@ -1,7 +1,3 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/09/15 18:01:06 espie Exp $
+@comment $OpenBSD: PLIST,v 1.6 2005/07/03 01:22:23 brad Exp $
 bin/hexedit
 @man man/man1/hexedit.1
-share/doc/hexedit/
-share/doc/hexedit/COPYING
-share/doc/hexedit/Changes
-share/doc/hexedit/TODO