From ba886226ffc9882d1580b17d9a08e12e66bbfb3b Mon Sep 17 00:00:00 2001 From: naddy Date: Mon, 23 May 2005 20:24:44 +0000 Subject: [PATCH] update to 2.0.5: major program overhaul --- editors/zile/Makefile | 18 ++++--------- editors/zile/distinfo | 8 +++--- editors/zile/patches/patch-doc_Makefile_in | 21 +++++++++++++++ editors/zile/patches/patch-doc_zile_texi | 31 +++++++++++++++------- editors/zile/patches/patch-src_Makefile_in | 12 +++++++++ editors/zile/pkg/PLIST | 6 +---- 6 files changed, 65 insertions(+), 31 deletions(-) create mode 100644 editors/zile/patches/patch-doc_Makefile_in create mode 100644 editors/zile/patches/patch-src_Makefile_in diff --git a/editors/zile/Makefile b/editors/zile/Makefile index 4475bcaa59c..9b62f635b7c 100644 --- a/editors/zile/Makefile +++ b/editors/zile/Makefile @@ -1,28 +1,20 @@ -# $OpenBSD: Makefile,v 1.5 2005/03/12 21:38:18 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2005/05/23 20:24:44 naddy Exp $ COMMENT= "zile is lossy emacs" -DISTNAME= zile-1.6.2 -PKGNAME= ${DISTNAME}p1 +DISTNAME= zile-2.0.5 CATEGORIES= editors - HOMEPAGE= http://zile.sourceforge.net/ - -# BSD +# GPL PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c ncurses +WANTLIB= c termcap MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zile/} -CONFIGURE_STYLE= simple -CONFIGURE_ARGS= ${CONFIGURE_SHARED} --enable-xterm-support - -# Force regen from patched version -post-patch: - cd ${WRKDIST}/doc && makeinfo zile.texi +CONFIGURE_STYLE= gnu .include diff --git a/editors/zile/distinfo b/editors/zile/distinfo index bf785092a0b..c222a2edd52 100644 --- a/editors/zile/distinfo +++ b/editors/zile/distinfo @@ -1,4 +1,4 @@ -MD5 (zile-1.6.2.tar.gz) = 7bb34d180c9de83f54cf079c694fcf9b -RMD160 (zile-1.6.2.tar.gz) = aeca66c82176b1329991e5ccc939878803d32107 -SHA1 (zile-1.6.2.tar.gz) = 3e88d5d7d50f65c58f1d305f93fe275a49650ac7 -SIZE (zile-1.6.2.tar.gz) = 254162 +MD5 (zile-2.0.5.tar.gz) = 49fc8916fbf6b9ec09227265f013b4a6 +RMD160 (zile-2.0.5.tar.gz) = fe4265327c0cf732ca8dbb640c7b6e9c5f7a0398 +SHA1 (zile-2.0.5.tar.gz) = eee75e0b234854983671d9685045a955f5fa28af +SIZE (zile-2.0.5.tar.gz) = 340353 diff --git a/editors/zile/patches/patch-doc_Makefile_in b/editors/zile/patches/patch-doc_Makefile_in new file mode 100644 index 00000000000..e8153da1fb6 --- /dev/null +++ b/editors/zile/patches/patch-doc_Makefile_in @@ -0,0 +1,21 @@ +$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 index c5de033fae3..2caf79c866c 100644 --- a/editors/zile/patches/patch-doc_zile_texi +++ b/editors/zile/patches/patch-doc_zile_texi @@ -1,14 +1,27 @@ -$OpenBSD: patch-doc_zile_texi,v 1.2 2005/03/12 21:38:19 espie Exp $ ---- doc/zile.texi.orig Sun Apr 14 17:35:14 2002 -+++ doc/zile.texi Sat Mar 12 22:36:44 2005 -@@ -1,6 +1,10 @@ - \input texinfo @c -*-texinfo-*- +$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 Editors -+@direntry -+* zile: (zile). Documentation for the Zile text editor -+@end direntry ++@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 new file mode 100644 index 00000000000..a4e3b266077 --- /dev/null +++ b/editors/zile/patches/patch-src_Makefile_in @@ -0,0 +1,12 @@ +$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/pkg/PLIST b/editors/zile/pkg/PLIST index f6fd2205588..a36b81198e3 100644 --- a/editors/zile/pkg/PLIST +++ b/editors/zile/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:01:08 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2005/05/23 20:24:44 naddy Exp $ bin/zile @info info/zile.info @man man/man1/zile.1 @@ -6,9 +6,5 @@ share/zile/ 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