[62316] trunk/dports/lang/coq

[jann at macports.org]

Revision: 62316
          http://trac.macports.org/changeset/62316
Author:   jann at macports.org
Date:     2010-01-03 13:58:17 -0800 (Sun, 03 Jan 2010)
Log Message:
-----------
Fix for ticket #22254

Modified Paths:
--------------
    trunk/dports/lang/coq/Portfile

Added Paths:
-----------
    trunk/dports/lang/coq/files/patch-tools-coq_makefile.ml4.diff

Modified: trunk/dports/lang/coq/Portfile
===================================================================
--- trunk/dports/lang/coq/Portfile	2010-01-03 19:54:28 UTC (rev 62315)
+++ trunk/dports/lang/coq/Portfile	2010-01-03 21:58:17 UTC (rev 62316)
@@ -33,8 +33,13 @@
 build.target       world 
 destroot.target    install 
 destroot.destdir   COQINSTALLPREFIX=${destroot}
-patchfiles         patch-doc-tools-latex_filter.diff
+patchfiles         patch-doc-tools-latex_filter.diff \
+                   patch-tools-coq_makefile.ml4.diff
 
+livecheck.type	regex
+livecheck.url	${homepage}/download/
+livecheck.regex	"<a href=\"distrib/V(\\d+(?:\\.\\w+)*)/files/coq-\\1\\.tar\\.gz\">"
+
 post-activate	{ ui_msg "The style file for LaTeX documentation,"
 		  ui_msg "coqdoc.sty, is in ${prefix}/share/coq/latex."
 		  ui_msg "Add this to your TEXINPUTS if you wish to"

Added: trunk/dports/lang/coq/files/patch-tools-coq_makefile.ml4.diff
===================================================================
--- trunk/dports/lang/coq/files/patch-tools-coq_makefile.ml4.diff	                        (rev 0)
+++ trunk/dports/lang/coq/files/patch-tools-coq_makefile.ml4.diff	2010-01-03 21:58:17 UTC (rev 62316)
@@ -0,0 +1,26 @@
+--- /opt/local/var/macports/build/_Users_kyamada_Documents_Develop_MacPorts_ports_private_coq/work/coq-8.2pl1/tools/coq_makefile.ml4	2009-06-09 18:44:40.000000000 +0900
++++ tools/coq_makefile.ml4	2009-12-28 16:38:21.000000000 +0900
+@@ -163,7 +163,7 @@
+     let ldir = List.assoc "." (List.map (fun (p,l,_) -> (p,l)) inc_r) in
+     let pdir = physical_dir_of_logical_dir ldir in
+     printf "\t(for i in $(%s); do \\\n" var;
+-    printf "\t install -D $$i $(COQLIB)/user-contrib/%s/$$i; \\\n" pdir;
++    printf "\t install -d `dirname $(COQLIB)/user-contrib/%s/$$i`; \\\n\t install $$i $(COQLIB)/user-contrib/%s/$$i; \\\n" pdir pdir;
+     printf "\t done)\n"
+   with Not_found ->
+     (* Files in the scope of a -R option (assuming they are disjoint) *)
+@@ -172,12 +172,12 @@
+ 	begin
+ 	  let pdir' = physical_dir_of_logical_dir ldir in
+ 	  printf "\t(cd %s; for i in $(%s%d); do \\\n" pdir var i;
+-	  printf "\t install -D $$i $(COQLIB)/user-contrib/%s/$$i; \\\n" pdir';
++	  printf "\t install -d `dirname $(COQLIB)/user-contrib/%s/$$i`; \\\n\t install $$i $(COQLIB)/user-contrib/%s/$$i; \\\n" pdir' pdir';
+ 	  printf "\t done)\n"
+ 	end) inc_r;
+     (* Files not in the scope of a -R option *)
+     printf "\t(for i in $(%s0); do \\\n" var;
+-    printf "\t install -D $$i $(COQLIB)/user-contrib/$(INSTALLDEFAULTROOT)/$$i; \\\n";
++    printf "\t install -d `dirname $(COQLIB)/user-contrib/$(INSTALLDEFAULTROOT)/$$i`; \\\n\t install $$i $(COQLIB)/user-contrib/$(INSTALLDEFAULTROOT)/$$i; \\\n";
+     printf "\t done)\n"
+ 
+ let install (vfiles,mlfiles,_,sds) inc =
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100103/c158b35e/attachment.html>