[111393] trunk/dports/textproc/tyxml

[mww at macports.org]

Revision: 111393
          https://trac.macports.org/changeset/111393
Author:   mww at macports.org
Date:     2013-09-19 22:30:25 -0700 (Thu, 19 Sep 2013)
Log Message:
-----------
tyxml: fix build due to changed interface of ocaml-ocamlnet

Modified Paths:
--------------
    trunk/dports/textproc/tyxml/Portfile

Added Paths:
-----------
    trunk/dports/textproc/tyxml/files/patch-rm_netstring_pcre.diff

Modified: trunk/dports/textproc/tyxml/Portfile
===================================================================
--- trunk/dports/textproc/tyxml/Portfile	2013-09-20 04:04:28 UTC (rev 111392)
+++ trunk/dports/textproc/tyxml/Portfile	2013-09-20 05:30:25 UTC (rev 111393)
@@ -4,7 +4,7 @@
 
 name                tyxml
 version             2.2.0
-revision            2
+revision            3
 categories          textproc devel ml
 platforms           darwin
 maintainers         mww openmaintainer
@@ -20,7 +20,7 @@
 checksums           rmd160  8cd613dbf1bbe6f439a5c5001b812288081aa3c8 \
                     sha256  8eab54f5fd7e9f5df3ac894123bd5abb124d741411a0ad5333e5058e44325f84
 
-patchfiles          patch-Makefile.diff
+patchfiles          patch-Makefile.diff patch-rm_netstring_pcre.diff
 
 depends_lib         port:ocaml port:ocaml-findlib port:ocaml-ocamlnet
 

Added: trunk/dports/textproc/tyxml/files/patch-rm_netstring_pcre.diff
===================================================================
--- trunk/dports/textproc/tyxml/files/patch-rm_netstring_pcre.diff	                        (rev 0)
+++ trunk/dports/textproc/tyxml/files/patch-rm_netstring_pcre.diff	2013-09-20 05:30:25 UTC (rev 111393)
@@ -0,0 +1,61 @@
+--- files/META.in	2012-12-07 16:15:22.000000000 +0100
++++ files/META.in	2013-07-03 00:30:43.705255131 +0200
+@@ -2,7 +2,7 @@
+ 
+ description = "XHTML and HTML5 pages typed with polymorphic variants"
+ version = "dev"
+-requires = "netstring"
++requires = "netstring pcre"
+ archive(byte) = "_LIBNAME_.cma"
+ archive(native) = "_LIBNAME_.cmxa"
+ 
+@@ -38,4 +38,4 @@
+     version = "(distributed with _PACKAGENAME_)"
+     archive(byte) = "_LIBNAME__duce.cma"
+     archive(native) = "_LIBNAME__duce.cmxa"
+-)
+\ No newline at end of file
++)
+--- lib/Makefile	2012-12-07 16:15:22.000000000 +0100
++++ lib/Makefile	2013-07-03 00:31:01.395255118 +0200
+@@ -13,7 +13,7 @@
+ 
+ DUCE_FILES := xml_print_duce.ml xhtml_duce.ml
+ 
+-LIBS     := -package netstring
++LIBS     := -package netstring -package pcre
+ 
+ # SYNTAX := -ppopt ../syntax/pa_include.cmo -package camlp4 -syntax camlp4o
+ 
+--- lib/xml.ml	2012-12-07 16:15:22.000000000 +0100
++++ lib/xml.ml	2013-07-03 00:23:21.658588803 +0200
+@@ -83,8 +83,7 @@
+      (as this string is to be considered as the end of the cdata)
+   *)
+     let s' = "\n<![CDATA[\n"^
+-      (Netstring_pcre.global_replace
+-	 (Netstring_pcre.regexp_string "]]>") "" s)
++      (Pcre.replace ~rex:(Pcre.regexp(Pcre.quote "]]>")) s)
+       ^"\n]]>\n" in
+     encodedpcdata s'
+ 
+@@ -93,8 +92,7 @@
+      (as this string is to be considered as the end of the cdata)
+   *)
+     let s' = "\n//<![CDATA[\n"^
+-      (Netstring_pcre.global_replace
+-	 (Netstring_pcre.regexp_string "]]>") "" s)
++      (Pcre.replace ~rex:(Pcre.regexp(Pcre.quote "]]>")) s)
+       ^"\n//]]>\n" in
+     encodedpcdata s'
+ 
+@@ -103,8 +101,7 @@
+      (as this string is to be considered as the end of the cdata)
+   *)
+     let s' = "\n/* <![CDATA[ */\n"^
+-      (Netstring_pcre.global_replace
+-	 (Netstring_pcre.regexp_string "]]>") "" s)
++      (Pcre.replace ~rex:(Pcre.regexp (Pcre.quote "]]>")) s)
+       ^"\n/* ]]> */\n" in
+     encodedpcdata s'
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130919/1aa8838d/attachment.html>