General cleanup, via a distfile patch.

   - NULL is a pointer. Don't use it for '\0', which is a character.
   - Silence warnings about unused variables.
   - Silence clang warnings about format strings.
   - Fix up the makefile and configure logic, rolling in patch-aa and
     patch-ab. Make the configure script report what it's doing instead
     of making wrong decisions silently.
   - Fix broken build when using system curses instead of the builtin
     curses subset. (This is not the default, nor apparently recommended,
     but can happen if the configure script doesn't like you.)
   - Bump PKGREVISION.

4 files changed, 10 insertions, 54 deletions

diff --git a/editors/easyedit/Makefile b/editors/easyedit/Makefile
index ee3288f73ad..3b244a246ea 100644
--- a/editors/easyedit/Makefile
+++ b/editors/easyedit/Makefile
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 11:43:31 asau Exp $
+# $NetBSD: Makefile,v 1.16 2013/03/30 21:57:25 dholland Exp $
 #
 
 DISTNAME=	ee-1.4.6.src
 PKGNAME=	easyedit-1.4.6
+PKGREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	http://mahon.cwx.net/sources/
 EXTRACT_SUFX=	.tgz
 
+PATCHFILES=	easyedit-jumbo-patch-20130330.gz
+PATCH_SITES=	http://www.NetBSD.org/~dholland/patchkits/easyedit/
+PATCH_DIST_STRIP= -p1
+
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mahon.cwx.net/
 COMMENT=	Easy to use text editor with onscreen instructions
diff --git a/editors/easyedit/distinfo b/editors/easyedit/distinfo
index 540a93da0d8..03abae0706d 100644
--- a/editors/easyedit/distinfo
+++ b/editors/easyedit/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.5 2011/10/03 00:45:47 dholland Exp $
+$NetBSD: distinfo,v 1.6 2013/03/30 21:57:25 dholland Exp $
 
+SHA1 (easyedit-jumbo-patch-20130330.gz) = 58ef9d86a505e5244a092748653de7a46bcf9220
+RMD160 (easyedit-jumbo-patch-20130330.gz) = 69f99b675a2360554df7175de63ce8d031e502d0
+Size (easyedit-jumbo-patch-20130330.gz) = 11512 bytes
 SHA1 (ee-1.4.6.src.tgz) = 6be7d03eade441a6c409b9d441ba2c144e26b157
 RMD160 (ee-1.4.6.src.tgz) = 2ed8ad3123c5443b29f5db142ad367d67028da27
 Size (ee-1.4.6.src.tgz) = 70511 bytes
-SHA1 (patch-aa) = b06c957864d790b46e7e133f5abb4ceb877aa15a
-SHA1 (patch-ab) = daf02fd0bdc7bbb397baf3d7d1c713e92ce73ea5
 SHA1 (patch-ac) = cf3c94a42825a86941a40a8a66c7f413c51d0ac7
diff --git a/editors/easyedit/patches/patch-aa b/editors/easyedit/patches/patch-aa
deleted file mode 100644
index 9f398cef374..00000000000
--- a/editors/easyedit/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/07/03 07:05:10 cjep Exp $
-
---- Makefile.orig	1994-11-21 03:52:00.000000000 +0000
-+++ Makefile
-@@ -15,7 +15,7 @@
- all :	localmake buildee
- 
- buildee :	
--	make -f make.local
-+	${MAKE} -f make.local
- 
- localmake:
- 	@./create.make
diff --git a/editors/easyedit/patches/patch-ab b/editors/easyedit/patches/patch-ab
deleted file mode 100644
index d4d420a8854..00000000000
--- a/editors/easyedit/patches/patch-ab
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2011/10/03 00:45:47 dholland Exp $
-
-- find netbsd's terminfo
-- configure for pkgsrc
-
---- create.make.orig	2002-09-23 04:18:30.000000000 +0000
-+++ create.make
-@@ -31,7 +31,7 @@ fi
- 
- # test for terminfo directory (exists on SysV systems)
- 
--if [ -d /usr/lib/terminfo -o -d /usr/share/lib/terminfo -o -d /usr/share/terminfo ]
-+if [ -d /usr/lib/terminfo -o -d /usr/share/lib/terminfo -o -d /usr/share/terminfo -o -f /usr/share/misc/terminfo.db ]
- then
- 	terminfo_exists=""
- else
-@@ -267,16 +267,16 @@ echo "all :	$TARGET" >> make.local
- cat  >> make.local << EOF
- 
- curses :	ee.c
--	cc ee.c -o ee \$(CFLAGS) -lcurses 
-+	\$(CC) ee.c -o ee \$(CFLAGS) -lcurses 
- 
- ee :	ee.o new_curse.o
--	cc -o ee ee.o new_curse.o \$(CFLAGS) 
-+	\$(CC) -o ee ee.o new_curse.o \$(CFLAGS) 
- 
- ee.o :	ee.c new_curse.h
--	cc -c ee.c \$(DEFINES) \$(CFLAGS) 
-+	\$(CC) -c ee.c \$(DEFINES) \$(CFLAGS) 
- 
- new_curse.o :	new_curse.c new_curse.h
--	cc new_curse.c -c \$(DEFINES) \$(CFLAGS)
-+	\$(CC) new_curse.c -c \$(DEFINES) \$(CFLAGS)
- 
- EOF
-