From f9eafe571b9c613790895d633004f28e61367dec Mon Sep 17 00:00:00 2001 From: naddy Date: Sat, 16 Jul 2005 14:46:34 +0000 Subject: [PATCH] Update to 2.2.1. Changes between Zile 2.0 and 2.2: * 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. --- editors/zile/Makefile | 4 +-- editors/zile/distinfo | 8 +++--- editors/zile/patches/patch-doc_Makefile_in | 21 --------------- editors/zile/patches/patch-doc_zile_texi | 27 ------------------- editors/zile/patches/patch-src_Makefile_in | 12 --------- editors/zile/patches/patch-src_term_termcap_c | 14 ++++++++++ editors/zile/pkg/PLIST | 4 +-- 7 files changed, 22 insertions(+), 68 deletions(-) delete mode 100644 editors/zile/patches/patch-doc_Makefile_in delete mode 100644 editors/zile/patches/patch-doc_zile_texi delete mode 100644 editors/zile/patches/patch-src_Makefile_in create mode 100644 editors/zile/patches/patch-src_term_termcap_c diff --git a/editors/zile/Makefile b/editors/zile/Makefile index f3fec54e268..1a12b1d49c2 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2005/05/28 19:51:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.8 2005/07/16 14:46:34 naddy Exp $ COMMENT= "zile is lossy emacs" -DISTNAME= zile-2.0.6 +DISTNAME= zile-2.2.1 CATEGORIES= editors HOMEPAGE= http://zile.sourceforge.net/ diff --git a/editors/zile/distinfo b/editors/zile/distinfo index a7487afe56c..ce86dfef554 100644 --- a/editors/zile/distinfo +++ b/editors/zile/distinfo @@ -1,4 +1,4 @@ -MD5 (zile-2.0.6.tar.gz) = 71f7bd8d1e01c9488aa1c5c583f75f82 -RMD160 (zile-2.0.6.tar.gz) = cf8d82fec46e95632cca8fb17f526ab4c94aaa58 -SHA1 (zile-2.0.6.tar.gz) = a14d015c16d7bfceb74e8fa05169be81b8447661 -SIZE (zile-2.0.6.tar.gz) = 340402 +MD5 (zile-2.2.1.tar.gz) = 312ccf09f479dc6c87c1f3493d309518 +RMD160 (zile-2.2.1.tar.gz) = 8b1d3444485b589a26b4a9e65b5cc99d44c7a2e5 +SHA1 (zile-2.2.1.tar.gz) = f3bb621ab20b4a5545bde0f74a3a8455df220187 +SIZE (zile-2.2.1.tar.gz) = 333375 diff --git a/editors/zile/patches/patch-doc_Makefile_in b/editors/zile/patches/patch-doc_Makefile_in deleted file mode 100644 index e8153da1fb6..00000000000 --- a/editors/zile/patches/patch-doc_Makefile_in +++ /dev/null @@ -1,21 +0,0 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.1 2005/05/23 20:24:44 naddy Exp $ ---- doc/Makefile.in.orig Mon May 23 21:12:21 2005 -+++ doc/Makefile.in Mon May 23 21:12:48 2005 -@@ -478,7 +478,7 @@ uninstall-am: uninstall-info-am uninstal - - - HELP: $(top_srcdir)/doc/zile.texi -- makeinfo --no-header --no-split -I$(top_srcdir)/doc $< >>$@ -+ makeinfo --no-header --no-split -I$(top_srcdir)/doc $? >>$@ - - mkdoc$(EXEEXT_FOR_BUILD): mkdoc.o config.h - $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) -o $@ mkdoc.o -@@ -495,7 +495,7 @@ zilerc.texi: zilerc.sample - @echo "@c Automatically generated file: NO DOT EDIT!" >$@ - @echo "@setfilename zilerc.info" >>$@ - @echo "@example" >>$@ -- expand $< >>$@ -+ expand $? >>$@ - @echo "@end example" >>$@ - - all-local: HELP AUTODOC diff --git a/editors/zile/patches/patch-doc_zile_texi b/editors/zile/patches/patch-doc_zile_texi deleted file mode 100644 index 2caf79c866c..00000000000 --- a/editors/zile/patches/patch-doc_zile_texi +++ /dev/null @@ -1,27 +0,0 @@ -$OpenBSD: patch-doc_zile_texi,v 1.3 2005/05/23 20:24:44 naddy Exp $ ---- doc/zile.texi.orig Mon May 23 21:36:18 2005 -+++ doc/zile.texi Mon May 23 21:36:43 2005 -@@ -2,6 +2,11 @@ - @setfilename zile.info - @settitle The Zile Manual - -+@dircategory Text editors -+@direntry -+* Zile: (zile). Zile emacs clone text editor. -+@end direntry -+ - @c If "finalout" is commented out, the printed output will show - @c black boxes that mark lines that are too long. Thus, it is - @c unwise to comment it out when running a master in case there are -@@ -18,11 +23,6 @@ - @subtitle Edition 2.0 for Zile version 2.0 - @subtitle December 2004 - @author Sandro Sigala and Reuben Thomas -- --@dircategory Text editors --@direntry --* Zile: (zile). Zile emacs clone text editor. --@end direntry - - @page - @vskip 0pt plus 1filll diff --git a/editors/zile/patches/patch-src_Makefile_in b/editors/zile/patches/patch-src_Makefile_in deleted file mode 100644 index a4e3b266077..00000000000 --- a/editors/zile/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2005/05/23 20:24:44 naddy Exp $ ---- src/Makefile.in.orig Mon May 23 21:09:34 2005 -+++ src/Makefile.in Mon May 23 21:09:57 2005 -@@ -717,7 +717,7 @@ uninstall-man: uninstall-man1 - - zile.1: zile.1.in - rm -f $@ -- sed s+'@'pkgdatadir@+$(pkgdatadir)+g $< > $@ -+ sed s+'@'pkgdatadir@+$(pkgdatadir)+g $? > $@ - - clean-local: - rm -f zile.1 diff --git a/editors/zile/patches/patch-src_term_termcap_c b/editors/zile/patches/patch-src_term_termcap_c new file mode 100644 index 00000000000..432662e870b --- /dev/null +++ b/editors/zile/patches/patch-src_term_termcap_c @@ -0,0 +1,14 @@ +$OpenBSD: patch-src_term_termcap_c,v 1.1 2005/07/16 14:46:35 naddy Exp $ +--- src/term_termcap.c.orig Sat Jul 16 16:34:20 2005 ++++ src/term_termcap.c Sat Jul 16 16:34:55 2005 +@@ -284,8 +284,8 @@ static void init_screen(void) + + read_screen_size(); + size = ZILE_COLS * ZILE_LINES; +- screen.array = zrealloc(screen.array, size * sizeof(int)); +- screen.oarray = zrealloc(screen.oarray, size * sizeof(int)); ++ screen.array = zrealloc(screen.array, size * sizeof(size_t)); ++ screen.oarray = zrealloc(screen.oarray, size * sizeof(size_t)); + screen.curx = screen.cury = 0; + } + diff --git a/editors/zile/pkg/PLIST b/editors/zile/pkg/PLIST index a36b81198e3..a2841828245 100644 --- a/editors/zile/pkg/PLIST +++ b/editors/zile/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2005/05/23 20:24:44 naddy Exp $ +@comment $OpenBSD: PLIST,v 1.4 2005/07/16 14:46:35 naddy Exp $ bin/zile @info info/zile.info @man man/man1/zile.1 @@ -7,4 +7,4 @@ share/zile/AUTODOC share/zile/FAQ share/zile/HELP share/zile/TUTORIAL -share/zile/zilerc.sample +share/zile/dotzile.sample