[76756] trunk/dports/genealogy/geneweb
jmr at macports.org
jmr at macports.org
Mon Mar 7 20:25:41 PST 2011
Revision: 76756
http://trac.macports.org/changeset/76756
Author: jmr at macports.org
Date: 2011-03-07 20:25:39 -0800 (Mon, 07 Mar 2011)
Log Message:
-----------
geneweb: update to 5.02 and disable parallel build (fixes #23364), use notes
Modified Paths:
--------------
trunk/dports/genealogy/geneweb/Portfile
Added Paths:
-----------
trunk/dports/genealogy/geneweb/files/patch-5.02-1
Modified: trunk/dports/genealogy/geneweb/Portfile
===================================================================
--- trunk/dports/genealogy/geneweb/Portfile 2011-03-07 23:30:52 UTC (rev 76755)
+++ trunk/dports/genealogy/geneweb/Portfile 2011-03-08 04:25:39 UTC (rev 76756)
@@ -3,7 +3,7 @@
PortSystem 1.0
name geneweb
-version 5.01
+version 5.02
revision 0
categories genealogy
maintainers bfulgham
@@ -14,15 +14,22 @@
of entries), and more.
homepage http://cristal.inria.fr/~ddr/GeneWeb
-master_sites ftp://ftp.inria.fr/INRIA/Projects/cristal/${name}/Src \
+master_sites http://cristal.inria.fr/~ddr/GeneWeb/ftp/Src \
+ ftp://ftp.inria.fr/INRIA/Projects/cristal/${name}/Src \
http://www.sartorelli.gen.nz/GeneWeb/Src
distfiles ${name}-${version}.tgz
-checksums md5 a1a763213d08bc0e0f547dff9b6f2ee4
+checksums md5 e8c6c789a9dd2f9155bf6eefa8786d01 \
+ sha1 e040496b3ce106cc7a508360cd0e4268bcb3e7b1 \
+ rmd160 fd284630e11957cf1265bfce9207e46d449a83ec
platforms darwin
depends_build port:ocaml \
port:camlp5
+patchfiles patch-5.02-1
+
+use_parallel_build no
+
destroot.target distrib
set gwuser ${name}
@@ -71,7 +78,6 @@
system "chmod -R a+r ${destroot}${prefix}/share/${name}/gw"
# Move a few utilities where the user can get to them easily
- xinstall -d -m 0755 ${destroot}${prefix}/bin
file copy -force ${destroot}${prefix}/share/${name}/gw/consang ${destroot}${prefix}/bin
file copy -force ${destroot}${prefix}/share/${name}/gw/ged2gwb ${destroot}${prefix}/bin
file copy -force ${destroot}${prefix}/share/${name}/gw/gwb2ged ${destroot}${prefix}/bin
@@ -91,18 +97,15 @@
realname=Geneweb\ Server
}
-post-install {
- # Create a location to store the databases
- # Create the bases directory:
- xinstall -d -m 0755 ${prefix}/var/db/${name}
+post-activate {
system "chown -R ${gwuser}:${gwgroup} ${prefix}/var/db/${name}"
system "chmod -R a+rw ${prefix}/var/db/${name}"
+}
- ui_msg "\nGeneweb will be listening on localhost, port 2317.\n"
+notes \
+"Geneweb will be listening on localhost, port 2317.
- ui_msg "To get started, you will need to load an initial database."
- ui_msg "Run the program 'gwsetup' to get started. After that point,"
- ui_msg "simply point your browser to http://localhost:2317 to review"
- ui_msg "the data."
-}
-
+To get started, you will need to load an initial database.
+Run the program 'gwsetup' to get started. After that point,
+simply point your browser to http://localhost:2317 to review
+the data."
Added: trunk/dports/genealogy/geneweb/files/patch-5.02-1
===================================================================
--- trunk/dports/genealogy/geneweb/files/patch-5.02-1 (rev 0)
+++ trunk/dports/genealogy/geneweb/files/patch-5.02-1 2011-03-08 04:25:39 UTC (rev 76756)
@@ -0,0 +1,78 @@
+? wserver/pa_macro5.ppo
+Index: CHANGES
+===================================================================
+RCS file: /net/yquem/devel/caml/repository/geneweb/CHANGES,v
+retrieving revision 5.12
+retrieving revision 5.13
+diff -c -r5.12 -r5.13
+*** CHANGES 2 May 2009 09:56:55 -0000 5.12
+--- CHANGES 17 Jan 2011 13:21:53 -0000 5.13
+***************
+*** 1,3 ****
+--- 1,8 ----
++ GeneWeb version 5.02.0
++ ----------------------
++
++ * [17 Jan 2011] Fixed compilation problem if using Camlp5 version < 5.12.
++
+ GeneWeb version 5.02
+ --------------------
+
+Index: wserver/pa_macro5.ml
+===================================================================
+RCS file: /net/yquem/devel/caml/repository/geneweb/wserver/pa_macro5.ml,v
+retrieving revision 5.1
+retrieving revision 5.2
+diff -c -r5.1 -r5.2
+*** wserver/pa_macro5.ml 23 Sep 2010 17:16:49 -0000 5.1
+--- wserver/pa_macro5.ml 17 Jan 2011 13:21:53 -0000 5.2
+***************
+*** 1,5 ****
+ (* camlp5r pa_extend.cmo q_MLast.cmo *)
+! (* $Id: pa_macro5.ml,v 5.1 2010-09-23 17:16:49 ddr Exp $ *)
+ (* Copyright (c) INRIA 2007-2010 *)
+
+ (*
+--- 1,5 ----
+ (* camlp5r pa_extend.cmo q_MLast.cmo *)
+! (* $Id: pa_macro5.ml,v 5.2 2011-01-17 13:21:53 ddr Exp $ *)
+ (* Copyright (c) INRIA 2007-2010 *)
+
+ (*
+***************
+*** 357,364 ****
+ ;
+
+ EXTEND
+! GLOBAL: expr patt str_item sig_item constructor_declaration match_case
+! label_declaration;
+ str_item: FIRST
+ [ [ x = str_macro_def ->
+ match x with
+--- 357,363 ----
+ ;
+
+ EXTEND
+! GLOBAL: expr patt str_item sig_item constructor_declaration match_case;
+ str_item: FIRST
+ [ [ x = str_macro_def ->
+ match x with
+***************
+*** 458,473 ****
+ | "IFNDEF"; e = dexpr; "THEN"; x = SELF; "ELSE"; y = SELF; "END" ->
+ if e then y else x ] ]
+ ;
+- label_declaration: FIRST
+- [ [ "IFDEF"; e = dexpr; "THEN"; x = SELF; "END" ->
+- if e then x else Grammar.skip_item x
+- | "IFDEF"; e = dexpr; "THEN"; x = SELF; "ELSE"; y = SELF; "END" ->
+- if e then x else y
+- | "IFNDEF"; e = dexpr; "THEN"; x = SELF; "END" ->
+- if e then Grammar.skip_item x else x
+- | "IFNDEF"; e = dexpr; "THEN"; x = SELF; "ELSE"; y = SELF; "END" ->
+- if e then y else x ] ]
+- ;
+ match_case: FIRST
+ [ [ "IFDEF"; e = dexpr; "THEN"; x = SELF; "END" ->
+ if e then x else Grammar.skip_item x
+--- 457,462 ----
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110307/fa6e08ce/attachment.html>
More information about the macports-changes
mailing list