Changes that should have been committed with recent upgrade to 5.01.

4 files changed, 74 insertions, 57 deletions

diff --git a/databases/geneweb/PLIST b/databases/geneweb/PLIST
index 0177038fa97..148d39b0da4 100644
--- a/databases/geneweb/PLIST
+++ b/databases/geneweb/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST,v 1.9 2008/06/15 22:55:22 gdt Exp $
 bin/consang
 bin/ged2gwb
 bin/gwb2ged
@@ -125,18 +125,87 @@ share/doc/geneweb/sv/report.htm
 share/doc/geneweb/sv/server.htm
 share/doc/geneweb/sv/start.htm
 share/doc/geneweb/sv/update.htm
+share/doc/geneweb/wdoc/de/access.txt
+share/doc/geneweb/wdoc/de/cdrom.txt
+share/doc/geneweb/wdoc/de/consang.txt
+share/doc/geneweb/wdoc/de/diruse.txt
+share/doc/geneweb/wdoc/de/divide.txt
+share/doc/geneweb/wdoc/de/faq.txt
+share/doc/geneweb/wdoc/de/gwsetup.txt
+share/doc/geneweb/wdoc/de/initial.txt
+share/doc/geneweb/wdoc/de/links.txt
+share/doc/geneweb/wdoc/de/maint.txt
+share/doc/geneweb/wdoc/de/merge.txt
+share/doc/geneweb/wdoc/de/pcustom.txt
+share/doc/geneweb/wdoc/de/problem.txt
+share/doc/geneweb/wdoc/de/recover.txt
+share/doc/geneweb/wdoc/de/report.txt
+share/doc/geneweb/wdoc/de/server.txt
+share/doc/geneweb/wdoc/de/start.txt
+share/doc/geneweb/wdoc/de/update.txt
+share/doc/geneweb/wdoc/en/access.txt
+share/doc/geneweb/wdoc/en/cdrom.txt
+share/doc/geneweb/wdoc/en/consang.txt
+share/doc/geneweb/wdoc/en/diruse.txt
+share/doc/geneweb/wdoc/en/divide.txt
+share/doc/geneweb/wdoc/en/faq.txt
+share/doc/geneweb/wdoc/en/gwformat.txt
+share/doc/geneweb/wdoc/en/gwsetup.txt
+share/doc/geneweb/wdoc/en/initial.txt
+share/doc/geneweb/wdoc/en/links.txt
+share/doc/geneweb/wdoc/en/maint.txt
+share/doc/geneweb/wdoc/en/merge.txt
+share/doc/geneweb/wdoc/en/pcustom.txt
+share/doc/geneweb/wdoc/en/problem.txt
+share/doc/geneweb/wdoc/en/recover.txt
+share/doc/geneweb/wdoc/en/report.txt
+share/doc/geneweb/wdoc/en/server.txt
+share/doc/geneweb/wdoc/en/start.txt
+share/doc/geneweb/wdoc/en/update.txt
+share/doc/geneweb/wdoc/fr/diruse.txt
+share/doc/geneweb/wdoc/fr/gwsetup.txt
+share/doc/geneweb/wdoc/fr/initial.txt
+share/doc/geneweb/wdoc/fr/problem.txt
+share/doc/geneweb/wdoc/fr/recover.txt
+share/doc/geneweb/wdoc/fr/server.txt
+share/doc/geneweb/wdoc/fr/start.txt
+share/doc/geneweb/wdoc/fr/update.txt
+share/doc/geneweb/wdoc/wdoc.txt
 share/examples/geneweb/a.gwf
 share/examples/geneweb/only.txt
 share/examples/rc.d/geneweb
+share/geneweb/etc/accent.txt
+share/geneweb/etc/anclist.txt
+share/geneweb/etc/ancmenu.txt
+share/geneweb/etc/ancsosa.txt
+share/geneweb/etc/anctree.txt
+share/geneweb/etc/calendar.txt
 share/geneweb/etc/copyr.txt
+share/geneweb/etc/cousmenu.txt
+share/geneweb/etc/dag.txt
+share/geneweb/etc/deslist.txt
+share/geneweb/etc/desmenu.txt
+share/geneweb/etc/forum.txt
 share/geneweb/etc/index.txt
 share/geneweb/etc/moved.txt
+share/geneweb/etc/particles.txt
 share/geneweb/etc/perso.txt
+share/geneweb/etc/random_css.txt
 share/geneweb/etc/redirect.txt
+share/geneweb/etc/relmenu.txt
 share/geneweb/etc/renamed.txt
 share/geneweb/etc/robot.txt
+share/geneweb/etc/robots.txt
+share/geneweb/etc/stats.txt
+share/geneweb/etc/summary.txt
 share/geneweb/etc/updfam.txt
+share/geneweb/etc/updhist.txt
 share/geneweb/etc/updind.txt
+share/geneweb/etc/updmenu.txt
+share/geneweb/etc/welcome.txt
+share/geneweb/gwtp_tmp/lang/main.txt
+share/geneweb/lang/lex_utf8.txt
+share/geneweb/lang/start_utf8.txt
 share/geneweb/gwtp_tmp/README
 share/geneweb/gwtp_tmp/gwtp
 share/geneweb/gwtp_tmp/gwtp.log
diff --git a/databases/geneweb/distinfo b/databases/geneweb/distinfo
index 5377e3ed9cc..db0d918d247 100644
--- a/databases/geneweb/distinfo
+++ b/databases/geneweb/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.13 2006/10/22 07:01:38 rillig Exp $
+$NetBSD: distinfo,v 1.14 2008/06/15 22:55:22 gdt Exp $
 
-SHA1 (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 0ab12497a3ffc3541228d9dc899c095b18e7fba1
-RMD160 (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 5d5c9d08d76bbc08a288e7ae56aa335b9cfc0fb8
-Size (geneweb-4.10nb1/geneweb-4.10.tar.gz) = 998314 bytes
-SHA1 (patch-aa) = 5f90d1c0a8545b670587ee5d7bbd39829073671f
-SHA1 (patch-ab) = 36e0ed9d8034ea546400cdc685a43fce4bac1d30
+SHA1 (geneweb-5.01.tgz) = 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e
+RMD160 (geneweb-5.01.tgz) = 75507bb35df74b92becc8514c9ad82c8f4ef886e
+Size (geneweb-5.01.tgz) = 1388008 bytes
 SHA1 (patch-ac) = cf35956939ab1ce57cac2a4261f892b0a34cb053
diff --git a/databases/geneweb/patches/patch-aa b/databases/geneweb/patches/patch-aa
deleted file mode 100644
index d18c73cf498..00000000000
--- a/databases/geneweb/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/02/10 23:32:00 rillig Exp $
-
-Don't treat unused variables as errors.
-
---- tools/Makefile.inc.orig	2002-11-29 07:03:04.000000000 +0100
-+++ tools/Makefile.inc	2006-02-11 00:25:06.000000000 +0100
-@@ -5,8 +5,8 @@ CAMLP4_COMM=TOP=$(TOP) $(TOP)/tools/caml
- CAMLP4F=-DUNIX
- CAMLP4D=`camlp4 -where`
- LIBUNIX=-cclib -lunix
--OCAMLC=ocamlc.opt -warn-error A
--OCAMLOPT=ocamlopt.opt -warn-error A
-+OCAMLC=ocamlc.opt -warn-error Ay
-+OCAMLOPT=ocamlopt.opt -warn-error Ay
- OCAMLI=
- OCAMLD=
- STRIP=strip
diff --git a/databases/geneweb/patches/patch-ab b/databases/geneweb/patches/patch-ab
deleted file mode 100644
index 46ca2bfbaa9..00000000000
--- a/databases/geneweb/patches/patch-ab
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/03/09 10:35:49 tonio Exp $
-
---- src/pa_html.ml.orig	2004-12-14 10:30:14.000000000 +0100
-+++ src/pa_html.ml
-@@ -10,7 +10,7 @@ value rec unfold_apply list =
-   | e -> (e, list) ]
- ;
- 
--value tag_encloser loc tag newl a el =
-+value tag_encloser _loc tag newl a el =
-   let s = if newl then "\n" else "" in
-   let e =
-     let (frm, al) =
-@@ -37,13 +37,13 @@ EXTEND
-   GLOBAL: expr;
-   expr: LEVEL "top"
-     [ [ "tag"; (tn, al, el) = tag_body ->
--          let el = tag_encloser loc tn True al el in
--          ifndef NEWSEQ then MLast.ExSeq loc el (MLast.ExUid loc "()")
--          else MLast.ExSeq loc el
-+          let el = tag_encloser _loc tn True al el in
-+          ifndef NEWSEQ then MLast.ExSeq _loc el (MLast.ExUid _loc "()")
-+          else MLast.ExSeq _loc el
-       | "stag"; (tn, al, el) = tag_body ->
--          let el = tag_encloser loc tn False al el in
--          ifndef NEWSEQ then MLast.ExSeq loc el (MLast.ExUid loc "()")
--          else MLast.ExSeq loc el ] ]
-+          let el = tag_encloser _loc tn False al el in
-+          ifndef NEWSEQ then MLast.ExSeq _loc el (MLast.ExUid _loc "()")
-+          else MLast.ExSeq _loc el ] ]
-   ;
-   tag_body:
-     [ [ tn = STRING; a = OPT expr; "begin"; el = LIST0 expr_semi; "end" ->