- Patched package to compile with new version of net/ocamlnet.

5 files changed, 57 insertions, 1 deletions

diff --git a/www/ocsigen/distinfo b/www/ocsigen/distinfo
index fec1e533c8f..f31a0580539 100644
--- a/www/ocsigen/distinfo
+++ b/www/ocsigen/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.3 2012/12/15 11:16:07 jaapb Exp $
+$NetBSD: distinfo,v 1.4 2013/06/11 14:56:06 jaapb Exp $
 
 SHA1 (ocsigenserver-2.2.0.tar.gz) = 9402b0518fd1701b0a50cb307853293ceae22605
 RMD160 (ocsigenserver-2.2.0.tar.gz) = f6683ab488e6bb9fed65a1e99706440c49c52fcd
 Size (ocsigenserver-2.2.0.tar.gz) = 1259122 bytes
 SHA1 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518
+SHA1 (patch-Makefile.options) = f0908f862401b6dbed09ed59624ad0db7759a2a6
 SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423
+SHA1 (patch-src_baselib_Makefile) = c29813b664f251e60da1ca65c8cfea59df350de3
+SHA1 (patch-src_extensions_Makefile) = 26a64c67b33936f0a7864263c498610797d87f31
+SHA1 (patch-src_http_Makefile) = 3fd370004363cfef342a28c369cf997d47d097ba
diff --git a/www/ocsigen/patches/patch-Makefile.options b/www/ocsigen/patches/patch-Makefile.options
new file mode 100644
index 00000000000..d429cbb927e
--- /dev/null
+++ b/www/ocsigen/patches/patch-Makefile.options
@@ -0,0 +1,13 @@
+$NetBSD: patch-Makefile.options,v 1.1 2013/06/11 14:56:06 jaapb Exp $
+
+Add netstring-pcre package, no longer provided by netstring by default
+--- Makefile.options.orig	2012-12-07 15:17:09.000000000 +0000
++++ Makefile.options
+@@ -34,6 +34,7 @@ BASE_PACKAGE := lwt
+ SERVER_PACKAGE := lwt.ssl           \
+ 	          ${LWT_EXTRA_PACKAGE} \
+ 	          netstring         \
++	          netstring-pcre    \
+                   findlib           \
+ 	          cryptokit         \
+ 		  tyxml             \
diff --git a/www/ocsigen/patches/patch-src_baselib_Makefile b/www/ocsigen/patches/patch-src_baselib_Makefile
new file mode 100644
index 00000000000..fad7dcd532a
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_baselib_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_baselib_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
+
+Add netstring-pcre package, no longer provided by netstring by default
+--- src/baselib/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
++++ src/baselib/Makefile
+@@ -1,6 +1,6 @@
+ include ../../Makefile.config
+ 
+-LIBS     := -package lwt.unix,netstring,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE}
++LIBS     := -package lwt.unix,netstring,netstring-pcre,cryptokit,findlib,tyxml,lwt.syntax,${LWT_EXTRA_PACKAGE}
+ OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG} ${THREAD}
+ OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG} ${THREAD}
+ OCAMLDOC := $(OCAMLFIND) ocamldoc
diff --git a/www/ocsigen/patches/patch-src_extensions_Makefile b/www/ocsigen/patches/patch-src_extensions_Makefile
new file mode 100644
index 00000000000..c24123ee6ea
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_extensions_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_extensions_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
+
+Add netstring-pcre package, no longer provided by netstring by default
+--- src/extensions/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
++++ src/extensions/Makefile
+@@ -4,6 +4,7 @@ PACKAGE  := lwt.unix     \
+ 	    lwt.ssl      \
+ 	    lwt.react    \
+             netstring    \
++            netstring-pcre \
+ 	    tyxml.parser \
+ 
+ LIBS     := -I ../baselib -I ../http -I ../server ${addprefix -package ,${PACKAGE}}
diff --git a/www/ocsigen/patches/patch-src_http_Makefile b/www/ocsigen/patches/patch-src_http_Makefile
new file mode 100644
index 00000000000..c0c6fb2188f
--- /dev/null
+++ b/www/ocsigen/patches/patch-src_http_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_http_Makefile,v 1.1 2013/06/11 14:56:06 jaapb Exp $
+
+Add netstring-pcre package, no longer provided by netstring by default
+--- src/http/Makefile.orig	2012-12-07 15:17:09.000000000 +0000
++++ src/http/Makefile
+@@ -1,6 +1,6 @@
+ include ../../Makefile.config
+ 
+-LIBS     := -package netstring,lwt.ssl,tyxml -I ../baselib
++LIBS     := -package netstring,netstring-pcre,lwt.ssl,tyxml -I ../baselib
+ OCAMLC   := $(OCAMLFIND) ocamlc${BYTEDBG}
+ OCAMLOPT := $(OCAMLFIND) ocamlopt ${OPTDBG}
+ OCAMLDOC := $(OCAMLFIND) ocamldoc