Changes Zile 2.2.4:

* Fix macro creation.
* Add --funcall back.
* termcap terminal replaced with ncurses again.
* More code cleanup.
* .zilerc replaced by .zile, which is a pseudo-Lisp file.
* Various other bug, design and documentation fixes.
* Add case-replace and kill-whole-line.
* Change command-line options to be more like Emacs.

7 files changed, 24 insertions, 78 deletions

diff --git a/editors/zile/Makefile b/editors/zile/Makefile
index a62a4491904..6a1a62052a4 100644
--- a/editors/zile/Makefile
+++ b/editors/zile/Makefile
@@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/11 15:33:08 adam Exp $
 
-DISTNAME=		zile-1.6.2
-PKGREVISION=		2
-CATEGORIES=		editors
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=zile/}
+DISTNAME=	zile-2.2.4
+CATEGORIES=	editors
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=zile/}
 
-MAINTAINER=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://zile.sourceforge.net/
-COMMENT=		Emacs-like text editor
+MAINTAINER=	tech-pkg@NetBSD.org
+HOMEPAGE=	http://zile.sourceforge.net/
+COMMENT=	Emacs-like text editor
 
-GNU_CONFIGURE=		yes
-USE_NCURSES=		# uses stdscr->_delay directly
-USE_MAKEINFO=		YES
-INFO_FILES=		zile.info
+USE_MAKEINFO=	yes
+USE_NCURSES=	yes	# uses stdscr->_delay directly
+GNU_CONFIGURE=	yes
+
+INFO_FILES=	zile.info
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/zile/PLIST b/editors/zile/PLIST
index 4d884d287c9..d421668d0a8 100644
--- a/editors/zile/PLIST
+++ b/editors/zile/PLIST
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2004/02/17 14:36:04 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2005/08/11 15:33:08 adam Exp $
 bin/zile
 man/man1/zile.1
 share/zile/AUTODOC
 share/zile/FAQ
 share/zile/HELP
-share/zile/LATEST_VERSION
-share/zile/MINIHELP1
-share/zile/MINIHELP2
-share/zile/MINIHELP3
 share/zile/TUTORIAL
-share/zile/zilerc.sample
+share/zile/dotzile.sample
 @dirrm share/zile
diff --git a/editors/zile/distinfo b/editors/zile/distinfo
index 1a53d3aec85..73e5d0e9f6d 100644
--- a/editors/zile/distinfo
+++ b/editors/zile/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 17:15:13 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/08/11 15:33:08 adam Exp $
 
-SHA1 (zile-1.6.2.tar.gz) = 3e88d5d7d50f65c58f1d305f93fe275a49650ac7
-RMD160 (zile-1.6.2.tar.gz) = aeca66c82176b1329991e5ccc939878803d32107
-Size (zile-1.6.2.tar.gz) = 254162 bytes
-SHA1 (patch-aa) = 80456cfebddddec4029a37db493acce46bc69e8c
-SHA1 (patch-ab) = bf37094e812b4c8dea8f305d7ae174e93b0b7fa9
-SHA1 (patch-ac) = 39fa3f6de47b619b547d8e025d735e69a91248ac
-SHA1 (patch-ad) = 30a7d6584781a54a6da7692c376c1a7728da2906
+SHA1 (zile-2.2.4.tar.gz) = a07bd3d187a46da55e6ca595b628bde1312bc3a9
+RMD160 (zile-2.2.4.tar.gz) = a65cff37597346ba79bef6a787b0d4e12b599691
+Size (zile-2.2.4.tar.gz) = 329391 bytes
+SHA1 (patch-aa) = ceb1d7997376b9c0f3f16d482ae579218ed13f98
diff --git a/editors/zile/patches/patch-aa b/editors/zile/patches/patch-aa
index 128b81fa0ca..df93c25d45b 100644
--- a/editors/zile/patches/patch-aa
+++ b/editors/zile/patches/patch-aa
@@ -1,9 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2003/06/29 22:19:13 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2005/08/11 15:33:08 adam Exp $
 
---- doc/zile.info.orig
+--- doc/zile.info.orig	2005-07-24 17:53:02.000000000 +0000
 +++ doc/zile.info
-@@ -1,5 +1,10 @@
- This is zile.info, produced by makeinfo version 4.2 from zile.texi.
+@@ -5,6 +5,11 @@ START-INFO-DIR-ENTRY
+ * Zile: (zile).                 Zile emacs clone text editor.
+ END-INFO-DIR-ENTRY
  
 +INFO-DIR-SECTION Editors
 +START-INFO-DIR-ENTRY
diff --git a/editors/zile/patches/patch-ab b/editors/zile/patches/patch-ab
deleted file mode 100644
index eb4292551e2..00000000000
--- a/editors/zile/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/08/15 00:08:58 minskim Exp $
-
---- src/Makefile.in.orig	Sat Aug 14 18:53:10 2004
-+++ src/Makefile.in
-@@ -77,7 +77,7 @@ OBJS =	basic.o			\
- 	window.o
- 
- .c.o:
--	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $<
-+	$(CC) -c -I. -I$(srcdir) @CPPFLAGS@ $(CFLAGS) $<
- 
- all: paths.h maketerminals $(PROG) zile.1
- 
diff --git a/editors/zile/patches/patch-ac b/editors/zile/patches/patch-ac
deleted file mode 100644
index 50292592df5..00000000000
--- a/editors/zile/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/08/15 00:08:58 minskim Exp $
-
---- etc/Makefile.in.orig	Thu Apr 24 10:11:17 2003
-+++ etc/Makefile.in
-@@ -13,7 +13,7 @@ INSTALL_DATA = @INSTALL_DATA@
- INSTALL = @INSTALL@
- 
- CC = @CC@
--CFLAGS = -I.. -I../lib -I../src @CFLAGS@
-+CFLAGS += -I.. -I../lib -I../src @CFLAGS@
- LDFLAGS = @LDFLAGS@
- ZILELIBS = ../lib/libzile.a
- LIBS = $(ZILELIBS) @LIBS@
-@@ -27,7 +27,7 @@ AUTODOCSRCS = $(srcdir)/../src/*.c
- .SUFFIXES:
- .SUFFIXES: .c .o
- .c.o:
--	$(CC) -c -I. -I$(srcdir)/../src $(CFLAGS) $<
-+	$(CC) -c -I. -I$(srcdir)/../src @CPPFLAGS@ $(CFLAGS) $<
- 
- all: $(FILES)
- 
diff --git a/editors/zile/patches/patch-ad b/editors/zile/patches/patch-ad
deleted file mode 100644
index e7e7074699e..00000000000
--- a/editors/zile/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/08/15 00:08:58 minskim Exp $
-
---- lib/Makefile.in.orig	Thu Apr 24 10:11:58 2003
-+++ lib/Makefile.in
-@@ -13,7 +13,7 @@ LIB = libzile.a
- OBJS = alist.o astr.o htable.o @LIBOBJS@
- 
- .c.o:
--	$(CC) -c -I. -I$(srcdir) $(CFLAGS) $<
-+	$(CC) -c -I. -I$(srcdir) @CPPFLAGS@ $(CFLAGS) $<
- 
- all: $(LIB)
-