pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/ocsigen/patches ocsigen: remove patches that are n...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dd5ce5819243
branches:  trunk
changeset: 329125:dd5ce5819243
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jan 31 09:13:08 2019 +0000

description:
ocsigen: remove patches that are not in distinfo

diffstat:

 www/ocsigen/patches/patch-Makefile.options |  24 --------------------
 www/ocsigen/patches/patch-configure        |  36 ------------------------------
 2 files changed, 0 insertions(+), 60 deletions(-)

diffs (68 lines):

diff -r e28e86a35475 -r dd5ce5819243 www/ocsigen/patches/patch-Makefile.options
--- a/www/ocsigen/patches/patch-Makefile.options        Thu Jan 31 09:12:23 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-Makefile.options,v 1.5 2018/11/29 10:54:14 jaapb Exp $
-
-Support for preemptive threads is in lwt.unix now
-Replace tyxml.parser with xml-light (patch from upstream)
---- Makefile.options.orig      2018-02-01 12:55:17.000000000 +0000
-+++ Makefile.options
-@@ -25,7 +25,7 @@ endif
- ## but also to generate src/baselib/ocsigen_config.ml and src/files/META
- 
- ifeq "$(PREEMPTIVE)" "YES"
--LWT_PREEMPTIVE_PACKAGE:=lwt.preemptive
-+LWT_PREEMPTIVE_PACKAGE:=lwt.unix
- endif
- 
- BASE_PACKAGE := lwt ipaddr bytes
-@@ -39,7 +39,7 @@ SERVER_PACKAGE := lwt_ssl           \
-                   findlib           \
-                 cryptokit         \
-                 tyxml             \
--                tyxml.parser      \
-+                xml-light      \
-                   dynlink           \
- 
- INITPACKAGE := \"$(shell ${OCAMLFIND} query -p-format -recursive        \
diff -r e28e86a35475 -r dd5ce5819243 www/ocsigen/patches/patch-configure
--- a/www/ocsigen/patches/patch-configure       Thu Jan 31 09:12:23 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2018/11/29 10:54:14 jaapb Exp $
-
-Support for preemptive threads is in lwt.unix now
-Replace tyxml.parser with xml-light (patch from upstream)
---- configure.orig     2018-02-01 12:55:17.000000000 +0000
-+++ configure
-@@ -412,7 +412,7 @@ check_library lwt "See: http://ocsigen.o
- check_library lwt.unix  "Missing support for 'unix' in lwt."
- check_library lwt_react   "See: http://ocsigen.org/lwt";
- check_library lwt_ssl   "See: http://ocsigen.org/lwt";
--check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
-+#check_library lwt.preemptive "Missing support for 'preemptive' in lwt."
- 
- check_library netstring \
-     "See ocamlnet: http://projects.camlcity.org/projects/ocamlnet.html";
-@@ -425,6 +425,7 @@ check_library pcre "See: http://ocaml.in
- check_library cryptokit "See: http://pauillac.inria.fr/~xleroy/software.html#cryptokit";
- 
- check_library tyxml "See: http://ocsigen.org/tyxml/";
-+check_library xml-light "See: https://github.com/ncannasse/xml-light";
- 
- # Check PostgreSQL
- case "$with_pgsql" in
-@@ -464,10 +465,10 @@ fi
- 
- # Check Lwt.preemptive
- if [ "$with_preempt" -gt 0 ]; then
--    if test_library lwt.preemptive; then
-+    if test_library lwt.unix; then
-       echo -n
-     elif [ "$with_preempt" -gt 1 ]; then
--      fail_library lwt.preemptive "Missing support for 'preemptive' in lwt."
-+      fail_library lwt.unix "Missing support for 'preemptive' in lwt."
-     else
-       with_preempt=0
-     fi



Home | Main Index | Thread Index | Old Index