Fri Dec 30 11:55:53 2016 UTC ()
Updated package to latest version, 2.8. Changes include:
* PostgreSQL Ocsipersist backend
* Compatibility with TyXML 4.0.x
* Export OpenSSL options through configuration file
* Various small fixes and improvements


(jaapb)
diff -r1.23 -r1.24 pkgsrc/www/ocsigen/Makefile
diff -r1.7 -r1.8 pkgsrc/www/ocsigen/PLIST
diff -r1.8 -r1.9 pkgsrc/www/ocsigen/distinfo
diff -r1.2 -r1.3 pkgsrc/www/ocsigen/patches/patch-Makefile
diff -r1.2 -r0 pkgsrc/www/ocsigen/patches/patch-src_Makefile
diff -r1.1 -r0 pkgsrc/www/ocsigen/patches/patch-src_http_ocsigen_senders.ml
diff -r1.1 -r0 pkgsrc/www/ocsigen/patches/patch-src_http_ocsigen_senders.mli
cvs diff -r1.23 -r1.24 pkgsrc/www/ocsigen/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ocsigen/Makefile 2016/06/25 14:33:41 1.23
+++ pkgsrc/www/ocsigen/Makefile 2016/12/30 11:55:53 1.24
@@ -1,21 +1,20 @@ @@ -1,21 +1,20 @@
1# $NetBSD: Makefile,v 1.23 2016/06/25 14:33:41 jaapb Exp $ 1# $NetBSD: Makefile,v 1.24 2016/12/30 11:55:53 jaapb Exp $
2# 2#
3 3
4VERSION= 2.7 4VERSION= 2.8
5GITHUB_PROJECT= ocsigenserver 5GITHUB_PROJECT= ocsigenserver
6PKGNAME= ocsigen-${VERSION} 6PKGNAME= ocsigen-${VERSION}
7DISTNAME= ${GITHUB_PROJECT}-${VERSION} 7DISTNAME= ${GITHUB_PROJECT}-${VERSION}
8PKGREVISION= 1 
9CATEGORIES= www 8CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 9MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
11 10
12MAINTAINER= jaapb@NetBSD.org 11MAINTAINER= jaapb@NetBSD.org
13HOMEPAGE= http://www.ocsigen.org/ 12HOMEPAGE= http://www.ocsigen.org/
14COMMENT= Web programming framework for OCaml 13COMMENT= Web programming framework for OCaml
15LICENSE= gnu-lgpl-v2.1 14LICENSE= gnu-lgpl-v2.1
16 15
17# ln: ./ocsipersist.mli: File exists 16# ln: ./ocsipersist.mli: File exists
18# Makefile:42: recipe for target 'ocsipersist.mli' failed 17# Makefile:42: recipe for target 'ocsipersist.mli' failed
19MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
20 19
21DEPENDS+= ocaml-react-[0-9]*:../../devel/ocaml-react 20DEPENDS+= ocaml-react-[0-9]*:../../devel/ocaml-react
@@ -43,27 +42,26 @@ CONFIGURE_ARGS= --disable-debug \ @@ -43,27 +42,26 @@ CONFIGURE_ARGS= --disable-debug \
43 --docdir ${PREFIX}/share/doc \ 42 --docdir ${PREFIX}/share/doc \
44 --sysconfdir ${PREFIX}/share/examples/ocsigen \ 43 --sysconfdir ${PREFIX}/share/examples/ocsigen \
45 --staticpagesdir ${PREFIX}/share/ocsigen/www \ 44 --staticpagesdir ${PREFIX}/share/ocsigen/www \
46 --uploaddir /tmp \ 45 --uploaddir /tmp \
47 --ocsigen-user ${OCSIGEN_USER} \ 46 --ocsigen-user ${OCSIGEN_USER} \
48 --ocsigen-group ${OCSIGEN_GROUP} \ 47 --ocsigen-group ${OCSIGEN_GROUP} \
49 --logdir ${VARBASE}/log/ocsigen \ 48 --logdir ${VARBASE}/log/ocsigen \
50 --datadir ${VARBASE}/lib/ocsigen \ 49 --datadir ${VARBASE}/lib/ocsigen \
51 --commandpipe ${VARBASE}/run/ocsigen_command 50 --commandpipe ${VARBASE}/run/ocsigen_command
52 51
53CONF_FILES+= ${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \ 52CONF_FILES+= ${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \
54 ${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf 53 ${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf
55USE_TOOLS+= gmake 54USE_TOOLS+= gmake
56WRKSRC= ${WRKDIR}/ocsigenserver-${VERSION} 
57 55
58OCAML_USE_FINDLIB= yes 56OCAML_USE_FINDLIB= yes
59OCAML_FINDLIB_DIRS= ocsigenserver 57OCAML_FINDLIB_DIRS= ocsigenserver
60 58
61.include "../../mk/ocaml.mk" 59.include "../../mk/ocaml.mk"
62 60
63.if ${OCAML_USE_OPT_COMPILER} == "yes" 61.if ${OCAML_USE_OPT_COMPILER} == "yes"
64CONFIGURE_ARGS+= --enable-natdynlink 62CONFIGURE_ARGS+= --enable-natdynlink
65BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0 63BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0
66.else 64.else
67CONFIGURE_ARGS+= --disable-natdynlink 65CONFIGURE_ARGS+= --disable-natdynlink
68.endif 66.endif
69 67
cvs diff -r1.7 -r1.8 pkgsrc/www/ocsigen/PLIST (expand / switch to unified diff)

--- pkgsrc/www/ocsigen/PLIST 2016/06/25 14:33:41 1.7
+++ pkgsrc/www/ocsigen/PLIST 2016/12/30 11:55:53 1.8
@@ -1,171 +1,194 @@ @@ -1,171 +1,194 @@
1@comment $NetBSD: PLIST,v 1.7 2016/06/25 14:33:41 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.8 2016/12/30 11:55:53 jaapb Exp $
2bin/ocsigenserver 2bin/ocsigenserver
3${PLIST.ocaml-opt}bin/ocsigenserver.opt 3${PLIST.ocaml-opt}bin/ocsigenserver.opt
4share/examples/ocsigen/ocsigenserver.conf 4share/examples/ocsigen/ocsigenserver.conf
5share/examples/ocsigen/ocsigenserver.conf.sample 5share/examples/ocsigen/ocsigenserver.conf.sample
6lib/ocaml/site-lib/ocsigenserver/META 6${OCAML_SITELIB}/ocsigenserver/META
7${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.a 7${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.a
8lib/ocaml/site-lib/ocsigenserver/baselib.cma 8${OCAML_SITELIB}/ocsigenserver/baselib.cma
9${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa 9${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.cmxa
10lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmi 10${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmi
11lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmo 11${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmo
12${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx 12${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmx
13${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs 13${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmxs
14lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.mli 14${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.mli
15${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.o 15${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.o
16lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmi 16${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmi
17lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmo 17${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmo
18${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx 18${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmx
19${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs 19${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmxs
20lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.mli 20${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.mli
21${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o 21${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.o
22lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmo 22${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmo
23${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmx 23${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmx
24${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmxs 24${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmxs
25${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.o 25${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.o
26${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmo 26${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmo
27${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmx 27${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmx
28${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmxs 28${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmxs
29${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.o 29${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.o
30${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a 30${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.a
31lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cma 31${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cma
32${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa 32${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxa
33${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs 33${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxs
34lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmo 34${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmo
35${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmx 35${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmx
36${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmxs 36${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmxs
37${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.o 37${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.o
38lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmo 38${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmo
39${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmx 39${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmx
40${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmxs 40${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmxs
41${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.o 41${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.o
42lib/ocaml/site-lib/ocsigenserver/framepp.cmi 42${OCAML_SITELIB}/ocsigenserver/framepp.cmi
43lib/ocaml/site-lib/ocsigenserver/framepp.mli 43${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/framepp.cmx
44${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.a 44${OCAML_SITELIB}/ocsigenserver/framepp.mli
45lib/ocaml/site-lib/ocsigenserver/http.cma 45${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.a
46${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.cmxa 46${OCAML_SITELIB}/ocsigenserver/http.cma
47lib/ocaml/site-lib/ocsigenserver/http_headers.cmi 47${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.cmxa
48lib/ocaml/site-lib/ocsigenserver/http_headers.mli 48${OCAML_SITELIB}/ocsigenserver/http_headers.cmi
49@comment ${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a 49${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http_headers.cmx
50${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a 50${OCAML_SITELIB}/ocsigenserver/http_headers.mli
51lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cma 51@comment ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/libocsigenserver.a
52${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cmxa 52${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.a
53lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmi 53${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cma
54lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmo 54${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cmxa
55${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx 55${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmi
56${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs 56${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmo
57lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.mli 57${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmx
58${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o 58${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmxs
59${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a 59${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.mli
60lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cma 60${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.o
61${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxa 61${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.a
62${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxs 62${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cma
63${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.a 63${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxa
64${PLIST.sqlite}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cma 64${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxs
65${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxa 65${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.a
66${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxs 66${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cma
67lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.cmi 67${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxa
68lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.mli 68${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxs
69lib/ocaml/site-lib/ocsigenserver/ocsigen_charset_mime.cmi 69${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.a
70lib/ocaml/site-lib/ocsigenserver/ocsigen_charset_mime.mli 70${PLIST.sqlite}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cma
71lib/ocaml/site-lib/ocsigenserver/ocsigen_config.cmi 71${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
72lib/ocaml/site-lib/ocsigenserver/ocsigen_config.mli 72${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxs
73lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmi 73${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmi
74lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmo 74${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmx
75${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx 75${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.mli
76lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.mli 76${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmi
77${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.o 77${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmx
78lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.cmi 78${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.mli
79lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.mli 79${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmi
80lib/ocaml/site-lib/ocsigenserver/ocsigen_getcommandline.cmi 80${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmx
81lib/ocaml/site-lib/ocsigenserver/ocsigen_getcommandline.mli 81${OCAML_SITELIB}/ocsigenserver/ocsigen_config.mli
82lib/ocaml/site-lib/ocsigenserver/ocsigen_headers.cmi 82${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmi
83lib/ocaml/site-lib/ocsigenserver/ocsigen_headers.mli 83${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmo
84lib/ocaml/site-lib/ocsigenserver/ocsigen_http_client.cmi 84${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmx
85lib/ocaml/site-lib/ocsigenserver/ocsigen_http_client.mli 85${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.mli
86lib/ocaml/site-lib/ocsigenserver/ocsigen_http_com.cmi 86${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.o
87lib/ocaml/site-lib/ocsigenserver/ocsigen_http_com.mli 87${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmi
88lib/ocaml/site-lib/ocsigenserver/ocsigen_http_frame.cmi 88${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmx
89lib/ocaml/site-lib/ocsigenserver/ocsigen_http_frame.mli 89${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.mli
90lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.cmi 90${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.cmi
91lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.mli 91${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.mli
92lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmi 92${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmi
93lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmo 93${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmx
94${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx 94${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.mli
95lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.mli 95${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmi
96${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.o 96${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmx
97lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.cmi 97${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.mli
98lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.mli 98${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmi
99lib/ocaml/site-lib/ocsigenserver/ocsigen_local_files.cmi 99${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmx
100lib/ocaml/site-lib/ocsigenserver/ocsigen_local_files.mli 100${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.mli
101lib/ocaml/site-lib/ocsigenserver/ocsigen_messages.cmi 101${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmi
102lib/ocaml/site-lib/ocsigenserver/ocsigen_messages.mli 102${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmx
103lib/ocaml/site-lib/ocsigenserver/ocsigen_parseconfig.cmi 103${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.mli
104lib/ocaml/site-lib/ocsigenserver/ocsigen_parseconfig.mli 104${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmi
105lib/ocaml/site-lib/ocsigenserver/ocsigen_request_info.cmi 105${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmx
106lib/ocaml/site-lib/ocsigenserver/ocsigen_request_info.mli 106${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.mli
107lib/ocaml/site-lib/ocsigenserver/ocsigen_senders.cmi 107${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmi
108lib/ocaml/site-lib/ocsigenserver/ocsigen_senders.mli 108${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmo
109lib/ocaml/site-lib/ocsigenserver/ocsigen_server.cmi 109${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmx
110lib/ocaml/site-lib/ocsigenserver/ocsigen_server.mli 110${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.mli
111lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.cmi 111${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.o
112lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.mli 112${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmi
113lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmo 113${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmx
114${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmx 114${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.mli
115${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmxs 115${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmi
116${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.o 116${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmx
117lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.cmi 117${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.mli
118lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.mli 118${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmi
119lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmo 119${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmx
120${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmx 120${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.mli
121${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmxs 121${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmi
122${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.o 122${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmx
123${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.a 123${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.mli
124lib/ocaml/site-lib/ocsigenserver/parsecommandline.cma 124${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmi
125${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa 125${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmx
126${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs 126${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.mli
127lib/ocaml/site-lib/ocsigenserver/polytables.cmi 127${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmi
128lib/ocaml/site-lib/ocsigenserver/polytables.cmo 128${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmx
129${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmx 129${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.mli
130${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs 130${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmi
131lib/ocaml/site-lib/ocsigenserver/polytables.mli 131${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmx
132${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.o 132${OCAML_SITELIB}/ocsigenserver/ocsigen_server.mli
133lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmo 133${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmi
134${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmx 134${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmx
135${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmxs 135${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.mli
136${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.o 136${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmo
137lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmo 137${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmx
138${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmx 138${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmxs
139${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmxs 139${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.o
140${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.o 140${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.cmi
141lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmo 141${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.mli
142${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmx 142${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmo
143${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmxs 143${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmx
144${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.o 144${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmxs
145lib/ocaml/site-lib/ocsigenserver/server_main.cmo 145${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.o
146${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.cmx 146${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.a
147${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.o 147${OCAML_SITELIB}/ocsigenserver/parsecommandline.cma
148lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmo 148${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxa
149${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmx 149${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxs
150${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmxs 150${OCAML_SITELIB}/ocsigenserver/polytables.cmi
151${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.o 151${OCAML_SITELIB}/ocsigenserver/polytables.cmo
152lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmo 152${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmx
153${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmx 153${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmxs
154${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmxs 154${OCAML_SITELIB}/ocsigenserver/polytables.mli
155${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.o 155${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.o
156@comment lib/ocaml/site-lib/ocsigenserver/dllocsigenserver.so 156${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmo
157lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm 157${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmx
158${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm.opt 158${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmxs
 159${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.o
 160${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmo
 161${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmx
 162${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmxs
 163${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.o
 164${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmo
 165${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmx
 166${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmxs
 167${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.o
 168${OCAML_SITELIB}/ocsigenserver/server_main.cmo
 169${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.cmx
 170${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.o
 171${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmo
 172${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmx
 173${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmxs
 174${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.o
 175${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmo
 176${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmx
 177${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmxs
 178${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.o
 179@comment ${OCAML_SITELIB}/ocsigenserver/dllocsigenserver.so
 180${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm
 181${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm.opt
159man/man1/ocsigenserver.1 182man/man1/ocsigenserver.1
160share/examples/ocsigen/mime.types 183share/examples/ocsigen/mime.types
161share/ocsigen/www/index.html 184share/ocsigen/www/index.html
162share/ocsigen/www/ocsigenstuff/back.png 185share/ocsigen/www/ocsigenstuff/back.png
163share/ocsigen/www/ocsigenstuff/cdimage.png 186share/ocsigen/www/ocsigenstuff/cdimage.png
164share/ocsigen/www/ocsigenstuff/deb.png 187share/ocsigen/www/ocsigenstuff/deb.png
165share/ocsigen/www/ocsigenstuff/dvi.png 188share/ocsigen/www/ocsigenstuff/dvi.png
166share/ocsigen/www/ocsigenstuff/folder_open.png 189share/ocsigen/www/ocsigenstuff/folder_open.png
167share/ocsigen/www/ocsigenstuff/html.png 190share/ocsigen/www/ocsigenstuff/html.png
168share/ocsigen/www/ocsigenstuff/image.png 191share/ocsigen/www/ocsigenstuff/image.png
169share/ocsigen/www/ocsigenstuff/ocsigen5.png 192share/ocsigen/www/ocsigenstuff/ocsigen5.png
170share/ocsigen/www/ocsigenstuff/pdf.png 193share/ocsigen/www/ocsigenstuff/pdf.png
171share/ocsigen/www/ocsigenstuff/postscript.png 194share/ocsigen/www/ocsigenstuff/postscript.png
cvs diff -r1.8 -r1.9 pkgsrc/www/ocsigen/distinfo (expand / switch to unified diff)

--- pkgsrc/www/ocsigen/distinfo 2016/06/20 19:35:56 1.8
+++ pkgsrc/www/ocsigen/distinfo 2016/12/30 11:55:53 1.9
@@ -1,10 +1,7 @@ @@ -1,10 +1,7 @@
1$NetBSD: distinfo,v 1.8 2016/06/20 19:35:56 jaapb Exp $ 1$NetBSD: distinfo,v 1.9 2016/12/30 11:55:53 jaapb Exp $
2 2
3SHA1 (ocsigenserver-2.7.tar.gz) = ce8319c61c368df3b8f7f31be4af8828c801b08d 3SHA1 (ocsigenserver-2.8.tar.gz) = 1043cd33b3e356a29957b95005edff0930c11be4
4RMD160 (ocsigenserver-2.7.tar.gz) = 8839bdcb642ebf4631085803d1c6159e9af3d397 4RMD160 (ocsigenserver-2.8.tar.gz) = 729596c04091ed471b51ff7139359461ef883de9
5SHA512 (ocsigenserver-2.7.tar.gz) = e31fa428e1d86232e4066a93fc948b592e80bb3e8374efee4f40d02c53e8a713ade8aa9904623c1129c892557ac4a451928278b808abe190bb254e6e43aab256 5SHA512 (ocsigenserver-2.8.tar.gz) = 80d5125a93239c73756b03a0f50d83e691810f93a15525daef2f7ccd69279e348f03486c26319a9511c1a746f375317082a89ba37ce0ba22872d6db7d3fddf1b
6Size (ocsigenserver-2.7.tar.gz) = 1262049 bytes 6Size (ocsigenserver-2.8.tar.gz) = 1265240 bytes
7SHA1 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518 7SHA1 (patch-Makefile) = 637a45aacd7c8afaeb73be624eb7732b21e78b4d
8SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423 
9SHA1 (patch-src_http_ocsigen_senders.ml) = 61fcd61531f955d169991692f44d532597057984 
10SHA1 (patch-src_http_ocsigen_senders.mli) = 71dce72976e55a49c8111dea29ceaa8f0008bdd8 
cvs diff -r1.2 -r1.3 pkgsrc/www/ocsigen/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/www/ocsigen/patches/patch-Makefile 2012/12/15 11:16:07 1.2
+++ pkgsrc/www/ocsigen/patches/patch-Makefile 2016/12/30 11:55:53 1.3
@@ -1,95 +1,89 @@ @@ -1,95 +1,89 @@
1$NetBSD: patch-Makefile,v 1.2 2012/12/15 11:16:07 jaapb Exp $ 1$NetBSD: patch-Makefile,v 1.3 2016/12/30 11:55:53 jaapb Exp $
2 2
3Correct installation procedure for pkgsrc environment 3Use BSD_* installation commands
4--- Makefile.orig 2012-12-07 15:17:09.000000000 +0000 4--- Makefile.orig 2016-11-15 15:04:34.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -67,61 +67,53 @@ install.opt: install.META.opt install.fi 6@@ -67,66 +67,43 @@ install.opt: install.META.opt install.fi
7  7
8 # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody 8 # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
9 # BB different, make files universally accessible, we cannot chown. 9 # BB different, make files universally accessible, we cannot chown.
10-INSTALL_CAN_PUT_PERMISSIONS=yes 10-INSTALL_CAN_PUT_PERMISSIONS=yes
11+INSTALL_CAN_PUT_PERMISSIONS=no 11-INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)"
12 INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP) 12-INSTALL_MOD_660=660
13 INSTALL_MOD_660=660 13-INSTALL_MOD_644=644
14 INSTALL_MOD_644=644 14-INSTALL_MOD_755=755
15 INSTALL_MOD_755=755 15-INSTALL_MOD_770=770
16 INSTALL_MOD_770=770 16-INSTALL_MOD_750=750
17 INSTALL_MOD_750=750 17-USERNAME=$(shell whoami)
18-ifneq ($(shell id -u), 0) 18-ifneq ($(shell id -u), 0)
19- ifneq ($(OCSIGENUSER), $(USERNAME)) 19- ifneq ($(OCSIGENUSER), $(USERNAME))
20- INSTALL_CAN_PUT_PERMISSIONS=no 20- INSTALL_CAN_PUT_PERMISSIONS=no
21- endif 21- endif
22- ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0) 22- ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0)
23- INSTALL_CAN_PUT_PERMISSIONS=no 23- INSTALL_CAN_PUT_PERMISSIONS=no
24- endif 24- endif
25-endif 25-endif
26-ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no) 26-ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no)
27- INSTALL_USER_GROUP= 27- INSTALL_USER_GROUP=
28- INSTALL_MOD_660=666 28- INSTALL_MOD_660=666
29- INSTALL_MOD_644=666 29- INSTALL_MOD_644=666
30- INSTALL_MOD_755=777 30- INSTALL_MOD_755=777
31- INSTALL_MOD_770=777 31- INSTALL_MOD_770=777
32- INSTALL_MOD_750=777 32- INSTALL_MOD_750=777
33-endif 33-endif
34+#ifneq ($(shell id -u), 0) 34+INSTALL_CAN_PUT_PERMISSIONS=no
35+# ifneq ($(OCSIGENUSER), $(USERNAME)) 
36+# INSTALL_CAN_PUT_PERMISSIONS=no 
37+# endif 
38+# ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0) 
39+# INSTALL_CAN_PUT_PERMISSIONS=no 
40+# endif 
41+#endif 
42+#ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no) 
43+# INSTALL_USER_GROUP= 
44+# INSTALL_MOD_660=666 
45+# INSTALL_MOD_644=666 
46+# INSTALL_MOD_755=777 
47+# INSTALL_MOD_770=777 
48+# INSTALL_MOD_750=777 
49+#endif 
50  35
51 install.files: 36 install.files:
52 @echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS} 37 @echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS}
53- ## Command pipe 38 ## Command pipe
54- $(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE)) 39- $(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE))
55- [ -p $(TEMPROOT)$(COMMANDPIPE) ] || \ 40+ $(BSD_INSTALL_DATA_DIR) $(dir $(TEMPROOT)$(COMMANDPIPE))
 41 [ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
56- { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \ 42- { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
57- if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \ 43+ { mkfifo ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
58- then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \ 44 if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
59- fi; } 45 then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \
 46 fi; }
60 ## Configuration files 47 ## Configuration files
61- $(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d 48- $(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
62- ${INSTALL} -m ${INSTALL_MOD_644} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/ 49- ${INSTALL} -m ${INSTALL_MOD_644} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
63+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(CONFIGDIR)/conf.d 50+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(CONFIGDIR)/conf.d
64+ ${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/ 51+ ${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/
65 [ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \ 52 [ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \
66- { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \ 53- { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \
67+ { $(BSD_INSTALL_DATA) $(PROJECTNAME).conf.sample \ 54+ { $(BSD_INSTALL_DATA) $(PROJECTNAME).conf.sample \
68 $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf; } 55 $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf; }
69 -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old 56- -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
 57+#-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old
70 ## Log directory 58 ## Log directory
71- $(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR) 59- $(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
72- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR) 60- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR)
73+ $(BSD_INSTALL_DATA) src/files/mime.types $(TEMPROOT)$(CONFIGDIR) 61+ $(BSD_INSTALL_DATA) src/files/mime.types $(TEMPROOT)$(CONFIGDIR)
 62+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(LOGDIR)
74 ## Static files 63 ## Static files
75- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR) 64- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR)
76- $(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR) 65- $(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR)
77- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \ 66- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
78+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(STATICPAGESDIR) 67+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(STATICPAGESDIR)
79+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(DATADIR) 68+ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(DATADIR)
80+ $(BSD_INSTALL_DATA) \ 69+ $(BSD_INSTALL_DATA) \
81 local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR) 70 local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR)
82- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \ 71- $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \
83+ $(BSD_INSTALL_DATA_DIR) -d \ 72+ $(BSD_INSTALL_DATA_DIR) \
84 $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff 73 $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
85- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \ 74- $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \
86+ $(BSD_INSTALL_DATA) \ 75+ $(BSD_INSTALL_DATA) \
87 local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \ 76 local/var/www/ocsigenstuff/*.png local/var/www/ocsigenstuff/*.css \
88 $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff 77 $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff
89- $(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR) 78- $(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR)
90- $(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR) 79- $(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
91+ $(BSD_INSTALL_MAN_DIR) -d $(TEMPROOT)$(MANDIR) 80+ $(BSD_INSTALL_MAN_DIR) $(TEMPROOT)$(MANDIR)
92+ $(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR) 81+ $(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR)
93  82
94 uninstall: 83 uninstall:
95 -make -C doc uninstall 84 -make -C doc uninstall
 85- -rm -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample
 86+ -rm -F $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample
 87 -rm -f $(TEMPROOT)$(MANDIR)/${PROJECTNAME}.1
 88 -rm -f $(TEMPROOT)$(COMMANDPIPE)
 89 -rmdir --ignore-fail-on-non-empty $(TEMPROOT)$(CONFIGDIR)/conf.d
File Deleted: pkgsrc/www/ocsigen/patches/Attic/patch-src_Makefile
File Deleted: pkgsrc/www/ocsigen/patches/Attic/patch-src_http_ocsigen_senders.ml
File Deleted: pkgsrc/www/ocsigen/patches/Attic/patch-src_http_ocsigen_senders.mli