Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH] Update FTP/HTTP mirrors.

X-seq: zsh-workers 29114
From: Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: Re: [PATCH] Update FTP/HTTP mirrors.
Date: Sat, 30 Apr 2011 19:46:22 +0100
In-reply-to: <20110420000607.GB5536@ruderich.org>
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
References: <1e35ce203a671039a3ef835fbc6c80c8538ef358.1302878239.git.simon@ruderich.org> <20110415161536.111330c0@pwslap01u.europe.root.pri> <20110417203150.GA24304@ruderich.org> <20110418202547.19a81608@pws-pc.ntlworld.com> <20110420000607.GB5536@ruderich.org>

On Wed, 20 Apr 2011 02:06:07 +0200
Simon Ruderich <simon@xxxxxxxxxxxx> wrote:

> On Mon, Apr 18, 2011 at 08:25:47PM +0100, Peter Stephenson wrote:
> >> I don't have commit access (this patch is for the zsh
> >> repository).
> >
> > I think you do, but I've committed it anyway.
> 
> Interesting, didn't know that ;-)
> 
> I've never really used CVS (I guess that's the only way to
> commit). Could you give me a short introduction (or link to one)
> how to commit to zsh's CVS and which rules have to be followed?

https://sourceforge.net/apps/trac/sourceforge/wiki/CVS

The only rule is stuff should appear on the mailing list first (or be
referred to as a patch somewhere else if it's really large) and the mail
sequence number appears in the ChangeLog entry; beyond that it's common
sense, i.e. contentious stuff such as changes of behaviour should be
discussed but typos, simple bug fixes, and enhancements to one's own
shell functions don't require explicit feedback before committing.
 
> > Probably including metafaq.yo in FAQ.yo is the way to go now FAQ.yo is
> > only generated in situ in the source tree.
> 
> I don't know any yodl, could you please change that? Thanks.

It'll be an includefile(...), I suppose.  However, it looks like the
metafaq itself is specific to the manual style, so the FTP info needs
need separating out and even then the remaining macros are different.
I've hacked up some kind of fix in FAQ.you which I will not be
attempting to improve further (the only remaining thing that's wrong
that I can see is the indentation, which isn't going to worry
anyone).

> We still have to update http://zsh.org/ - it contains the broken
> mirrors.

That's Geoff Wing's: email gcw@xxxxxxx.

Index: Doc/Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Makefile.in,v
retrieving revision 1.47
diff -p -u -r1.47 Makefile.in
--- Doc/Makefile.in	30 May 2009 22:28:51 -0000	1.47
+++ Doc/Makefile.in	30 Apr 2011 18:39:35 -0000
@@ -73,7 +73,8 @@ YODLSRC = zmacros.yo zman.yo ztexi.yo Zs
 Zsh/calsys.yo \
 Zsh/compat.yo Zsh/compctl.yo Zsh/compsys.yo Zsh/compwid.yo Zsh/cond.yo \
 Zsh/contrib.yo Zsh/exec.yo Zsh/expn.yo \
-Zsh/filelist.yo Zsh/files.yo Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \
+Zsh/filelist.yo Zsh/files.yo Zsh/ftp_sites.yo \
+Zsh/func.yo Zsh/grammar.yo Zsh/manual.yo \
 Zsh/index.yo Zsh/intro.yo Zsh/invoke.yo Zsh/jobs.yo Zsh/metafaq.yo \
 Zsh/modules.yo Zsh/modlist.yo Zsh/modmenu.yo Zsh/manmodmenu.yo $(MODDOCSRC) \
 Zsh/options.yo Zsh/params.yo Zsh/prompt.yo Zsh/redirect.yo Zsh/restricted.yo \
@@ -161,9 +162,9 @@ zshall.1: zsh.yo
 	    $(YODL) -I$(sdir) -DZSHALL -w zman.yo version.yo zsh.yo | sed -e '1s/\\-/-/g' -e '/^\.'\''/d' > $$target \
 	;; esac; \
 
-../META-FAQ: META-FAQ.yo Zsh/metafaq.yo
+../META-FAQ: META-FAQ.yo Zsh/metafaq.yo Zsh/ftp_sites.yo
 	case '$(YODL)' in :*) touch $(sdir_top)/META-FAQ ;; *) \
-	    $(YODL) -I$(sdir) META-FAQ.yo | sed -e '/NEXTLINE/N' -e '/DELLINE/d' -e '/^SECTHEAD$$/{N;s/^SECTHEAD.//;h;s/./-/g;H;g;}' -e 's/  *$$//' > $(sdir_top)/META-FAQ \
+	    $(YODL) -I$(sdir) META-FAQ.yo | sed -e '/NEXTLINE/N' -e '/DELLINE/d' -e '/^SECTHEAD$$/{N;s/^SECTHEAD.//;h;s/./-/g;H;g;}' -e 's/  *$$//' -e '/comment(.*)/d' > $(sdir_top)/META-FAQ \
 	;; esac
 
 $(YODLDOC): version.yo
@@ -176,7 +177,8 @@ man: $(MAN)
 $(MAN): zmacros.yo zman.yo
 
 zsh.1 zshall.1: Zsh/intro.yo Zsh/metafaq.yo Zsh/invoke.yo Zsh/files.yo \
-                Zsh/filelist.yo Zsh/filelist.yo Zsh/seealso.yo
+                Zsh/filelist.yo Zsh/filelist.yo Zsh/seealso.yo \
+                Zsh/ftp_sites.yo
 
 zshbuiltins.1: Zsh/builtins.yo
 
Index: Doc/Zsh/.distfiles
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/.distfiles,v
retrieving revision 1.20
diff -p -u -r1.20 .distfiles
--- Doc/Zsh/.distfiles	3 Mar 2009 16:40:42 -0000	1.20
+++ Doc/Zsh/.distfiles	30 Apr 2011 18:39:35 -0000
@@ -14,6 +14,7 @@ exec.yo
 expn.yo
 filelist.yo
 files.yo
+ftp_sites.yo
 func.yo
 grammar.yo
 index.yo
Index: Doc/Zsh/ftp_sites.yo
===================================================================
RCS file: Doc/Zsh/ftp_sites.yo
diff -N Doc/Zsh/ftp_sites.yo
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Doc/Zsh/ftp_sites.yo	30 Apr 2011 18:39:35 -0000
@@ -0,0 +1,28 @@
+startitem()
+item(Primary site)(
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
+)
+item(Australia)(
+nofill(tt(ftp://ftp.zsh.org/pub/)
+tt(http://www.zsh.org/pub/))
+)
+item(Denmark)(
+nofill(tt(ftp://mirrors.dotsrc.org/zsh/))
+)
+item(Finland)(
+nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
+)
+item(France)(
+nofill(tt(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/))
+)
+item(Germany)(
+nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/))
+)
+item(Hungary)(
+nofill(tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
+)
+item(Poland)(
+nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/))
+)
+enditem()
Index: Doc/Zsh/metafaq.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/metafaq.yo,v
retrieving revision 1.22
diff -p -u -r1.22 metafaq.yo
--- Doc/Zsh/metafaq.yo	18 Apr 2011 08:38:53 -0000	1.22
+++ Doc/Zsh/metafaq.yo	30 Apr 2011 18:39:35 -0000
@@ -25,34 +25,7 @@ mirroring tt(ftp.cs.elte.hu) instead of 
 cindex(FTP sites for zsh)
 cindex(acquiring zsh by FTP)
 cindex(availability of zsh)
-startitem()
-item(Primary site)(
-nofill(tt(ftp://ftp.zsh.org/pub/)
-tt(http://www.zsh.org/pub/))
-)
-item(Australia)(
-nofill(tt(ftp://ftp.zsh.org/pub/)
-tt(http://www.zsh.org/pub/))
-)
-item(Denmark)(
-nofill(tt(ftp://mirrors.dotsrc.org/zsh/))
-)
-item(Finland)(
-nofill(tt(ftp://ftp.funet.fi/pub/unix/shells/zsh/))
-)
-item(France)(
-nofill(tt(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/))
-)
-item(Germany)(
-nofill(tt(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/))
-)
-item(Hungary)(
-nofill(tt(ftp://ftp.kfki.hu/pub/packages/zsh/))
-)
-item(Poland)(
-nofill(tt(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/))
-)
-enditem()
+INCLUDEFILE(Zsh/ftp_sites.yo)\
 
 The up-to-date source code is available via anonymous CVS and Git from
 Sourceforge.  See tt(http://sourceforge.net/projects/zsh/) for details.
Index: Etc/FAQ.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Etc/FAQ.yo,v
retrieving revision 1.56
diff -p -u -r1.56 FAQ.yo
--- Etc/FAQ.yo	18 Apr 2011 08:38:53 -0000	1.56
+++ Etc/FAQ.yo	30 Apr 2011 18:39:36 -0000
@@ -42,7 +42,12 @@ whenhtml(report(ARG1)(ARG2)(ARG3))\
 whenlatex(report(ARG1)(ARG2)(ARG3))\
 whenman(report(ARG1)(ARG2)(ARG3))\
 whenms(report(ARG1)(ARG2)(ARG3))\
-whensgml(report(ARG1)(ARG2)(ARG3)))
+whensgml(report(ARG1)(ARG2)(ARG3)))\
+def(startitem)(0)() \
+def(enditem)(0)()\
+def(item)(2)(
+ARG1: ARG2)\
+def(nofill)(1)(ARG1)
 myreport(Z-Shell Frequently-Asked Questions)(Peter Stephenson)(2010/02/15)
 COMMENT(-- the following are for Usenet and must appear first)\
 description(\
@@ -334,25 +339,7 @@ label(16)
   the shell.  The following list also appears on the WWW at
   url(http://www.zsh.org/)(http://www.zsh.org/) .
 
-  description(
-    mydit(Home site) url(ftp://ftp.zsh.org/pub/)(ftp://ftp.zsh.org/pub/)
-    mydit()          (also url(http://www.zsh.org/pub/)
-(http://www.zsh.org/pub/))
-    mydit(Denmark)   url(ftp://mirrors.dotsrc.org/zsh/)
-(ftp://mirrors.dotsrc.org/zsh/)
-    mydit()          (also url(http://mirrors.dotsrc.org/zsh/)
-(http://mirrors.dotsrc.org/zsh/))
-    mydit(Finland)   url(ftp://ftp.funet.fi/pub/unix/shells/zsh/)
-(ftp://ftp.funet.fi/pub/unix/shells/zsh/)
-    mydit(France)    url(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/)
-(ftp://nephtys.lip6.fr/pub/unix/shells/zsh/)
-    mydit(Germany)   url(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
-(ftp://ftp.fu-berlin.de/pub/unix/shells/zsh/)
-    mydit(Hungary)   url(ftp://ftp.kfki.hu/pub/packages/zsh/)
-(ftp://ftp.kfki.hu/pub/packages/zsh/)
-    mydit(Poland)    url(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
-(ftp://sunsite.icm.edu.pl/pub/unix/shells/zsh/)
-  )
+includefile(../Doc/Zsh/ftp_sites.yo)
 
   A Windows port was created by Amol Deshpandem based on 3.0.5 (which
   is now rather old).  This has now been restored and can be found at
-- 
Peter Stephenson <p.w.stephenson@xxxxxxxxxxxx>
Web page now at http://homepage.ntlworld.com/p.w.stephenson/

References:
- [PATCH] Update FTP/HTTP mirrors.
  - From: Simon Ruderich
- Re: [PATCH] Update FTP/HTTP mirrors.
  - From: Peter Stephenson
- Re: [PATCH] Update FTP/HTTP mirrors.
  - From: Simon Ruderich
- Re: [PATCH] Update FTP/HTTP mirrors.
  - From: Peter Stephenson
- Re: [PATCH] Update FTP/HTTP mirrors.
  - From: Simon Ruderich

Messages sorted by: Reverse Date, Date, Thread, Author