Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 5431F7A2E9 for ; Fri, 30 Dec 2016 11:55:56 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id B589F855BA; Fri, 30 Dec 2016 11:55:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 425998559F for ; Fri, 30 Dec 2016 11:55:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id NuwDvvFr6S0L for ; Fri, 30 Dec 2016 11:55:53 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7E95885593 for ; Fri, 30 Dec 2016 11:55:53 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6F9E4FBA6; Fri, 30 Dec 2016 11:55:53 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_148309895356940" MIME-Version: 1.0 Date: Fri, 30 Dec 2016 11:55:53 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/www/ocsigen To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20161230115553.6F9E4FBA6@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_148309895356940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Fri Dec 30 11:55:53 UTC 2016 Modified Files: pkgsrc/www/ocsigen: Makefile PLIST distinfo pkgsrc/www/ocsigen/patches: patch-Makefile Removed Files: pkgsrc/www/ocsigen/patches: patch-src_Makefile patch-src_http_ocsigen_senders.ml patch-src_http_ocsigen_senders.mli Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/ocsigen/Makefile cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/ocsigen/PLIST cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ocsigen/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/ocsigen/patches/patch-Makefile cvs rdiff -u -r1.2 -r0 pkgsrc/www/ocsigen/patches/patch-src_Makefile cvs rdiff -u -r1.1 -r0 \ pkgsrc/www/ocsigen/patches/patch-src_http_ocsigen_senders.ml \ pkgsrc/www/ocsigen/patches/patch-src_http_ocsigen_senders.mli Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_148309895356940 Content-Disposition: inline Content-Length: 30139 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/www/ocsigen/Makefile diff -u pkgsrc/www/ocsigen/Makefile:1.23 pkgsrc/www/ocsigen/Makefile:1.24 --- pkgsrc/www/ocsigen/Makefile:1.23 Sat Jun 25 14:33:41 2016 +++ pkgsrc/www/ocsigen/Makefile Fri Dec 30 11:55:53 2016 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.23 2016/06/25 14:33:41 jaapb Exp $ +# $NetBSD: Makefile,v 1.24 2016/12/30 11:55:53 jaapb Exp $ # -VERSION= 2.7 +VERSION= 2.8 GITHUB_PROJECT= ocsigenserver PKGNAME= ocsigen-${VERSION} DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} @@ -53,7 +52,6 @@ CONFIGURE_ARGS= --disable-debug \ CONF_FILES+= ${DESTDIR}${PREFIX}/share/examples/ocsigen/ocsigenserver.conf.sample \ ${PKG_SYSCONFDIR}/ocsigenserver/ocsigenserver.conf USE_TOOLS+= gmake -WRKSRC= ${WRKDIR}/ocsigenserver-${VERSION} OCAML_USE_FINDLIB= yes OCAML_FINDLIB_DIRS= ocsigenserver Index: pkgsrc/www/ocsigen/PLIST diff -u pkgsrc/www/ocsigen/PLIST:1.7 pkgsrc/www/ocsigen/PLIST:1.8 --- pkgsrc/www/ocsigen/PLIST:1.7 Sat Jun 25 14:33:41 2016 +++ pkgsrc/www/ocsigen/PLIST Fri Dec 30 11:55:53 2016 @@ -1,161 +1,184 @@ -@comment $NetBSD: PLIST,v 1.7 2016/06/25 14:33:41 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.8 2016/12/30 11:55:53 jaapb Exp $ bin/ocsigenserver ${PLIST.ocaml-opt}bin/ocsigenserver.opt share/examples/ocsigen/ocsigenserver.conf share/examples/ocsigen/ocsigenserver.conf.sample -lib/ocaml/site-lib/ocsigenserver/META -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.a -lib/ocaml/site-lib/ocsigenserver/baselib.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/baselib.cmxa -lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmi -lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.cmxs -lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/accesscontrol.o -lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmi -lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.cmxs -lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/authbasic.o -lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cgimod.o -${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmo -${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmx -${PLIST.camlzip}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.cmxs -${PLIST.camlzip}lib/ocaml/site-lib/ocsigenserver/extensions/deflatemod.o -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.a -lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxa -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/donotparsecommandline.cmxs -lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extendconfiguration.o -lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/extensiontemplate.o -lib/ocaml/site-lib/ocsigenserver/framepp.cmi -lib/ocaml/site-lib/ocsigenserver/framepp.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.a -lib/ocaml/site-lib/ocsigenserver/http.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/http.cmxa -lib/ocaml/site-lib/ocsigenserver/http_headers.cmi -lib/ocaml/site-lib/ocsigenserver/http_headers.mli -@comment ${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/libocsigenserver.a -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.a -lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigenserver.cmxa -lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmi -lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.cmxs -lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsigen_comet.o -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.a -lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxa -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-dbm.cmxs -${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.a -${PLIST.sqlite}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cma -${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxa -${PLIST.sqlite}${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist-sqlite.cmxs -lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_cache.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_charset_mime.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_charset_mime.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_config.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_config.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.cmx -lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_cookies.o -lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_extensions.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_getcommandline.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_getcommandline.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_headers.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_headers.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_client.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_client.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_com.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_com.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_frame.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_http_frame.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_lib.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.cmx -lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/ocsigen_lib_base.o -lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_loader.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_local_files.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_local_files.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_messages.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_messages.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_parseconfig.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_parseconfig.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_request_info.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_request_info.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_senders.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_senders.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_server.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_server.mli -lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.cmi -lib/ocaml/site-lib/ocsigenserver/ocsigen_stream.mli -lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/cors.o -lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.cmi -lib/ocaml/site-lib/ocsigenserver/extensions/ocsipersist.mli -lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/outputfilter.o -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.a -lib/ocaml/site-lib/ocsigenserver/parsecommandline.cma -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxa -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/parsecommandline.cmxs -lib/ocaml/site-lib/ocsigenserver/polytables.cmi -lib/ocaml/site-lib/ocsigenserver/polytables.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.cmxs -lib/ocaml/site-lib/ocsigenserver/polytables.mli -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/polytables.o -lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/redirectmod.o -lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/revproxy.o -lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/rewritemod.o -lib/ocaml/site-lib/ocsigenserver/server_main.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/server_main.o -lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/staticmod.o -lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmo -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmx -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.cmxs -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/userconf.o -@comment lib/ocaml/site-lib/ocsigenserver/dllocsigenserver.so -lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm -${PLIST.ocaml-opt}lib/ocaml/site-lib/ocsigenserver/extensions/ocsidbm.opt +${OCAML_SITELIB}/ocsigenserver/META +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.a +${OCAML_SITELIB}/ocsigenserver/baselib.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/baselib.cmxa +${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmi +${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.cmxs +${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/accesscontrol.o +${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmi +${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.cmxs +${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/authbasic.o +${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cgimod.o +${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmo +${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmx +${PLIST.camlzip}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.cmxs +${PLIST.camlzip}${OCAML_SITELIB}/ocsigenserver/extensions/deflatemod.o +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.a +${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/donotparsecommandline.cmxs +${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extendconfiguration.o +${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/extensiontemplate.o +${OCAML_SITELIB}/ocsigenserver/framepp.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/framepp.cmx +${OCAML_SITELIB}/ocsigenserver/framepp.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.a +${OCAML_SITELIB}/ocsigenserver/http.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http.cmxa +${OCAML_SITELIB}/ocsigenserver/http_headers.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/http_headers.cmx +${OCAML_SITELIB}/ocsigenserver/http_headers.mli +@comment ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/libocsigenserver.a +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.a +${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigenserver.cmxa +${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmi +${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.cmxs +${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsigen_comet.o +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.a +${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.a +${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxs +${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.a +${PLIST.sqlite}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cma +${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxa +${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxs +${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_cache.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_charset_mime.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_config.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_config.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmi +${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_cookies.o +${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_extensions.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.cmi +${OCAML_SITELIB}/ocsigenserver/ocsigen_getcommandline.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_headers.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_client.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_com.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_http_frame.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_lib.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmi +${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_lib_base.o +${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_loader.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_local_files.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_messages.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_parseconfig.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_request_info.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_senders.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_server.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_server.mli +${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmi +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.cmx +${OCAML_SITELIB}/ocsigenserver/ocsigen_stream.mli +${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/cors.o +${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.cmi +${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist.mli +${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/outputfilter.o +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.a +${OCAML_SITELIB}/ocsigenserver/parsecommandline.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/parsecommandline.cmxs +${OCAML_SITELIB}/ocsigenserver/polytables.cmi +${OCAML_SITELIB}/ocsigenserver/polytables.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.cmxs +${OCAML_SITELIB}/ocsigenserver/polytables.mli +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/polytables.o +${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/redirectmod.o +${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/revproxy.o +${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/rewritemod.o +${OCAML_SITELIB}/ocsigenserver/server_main.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/server_main.o +${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/staticmod.o +${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmo +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmx +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.cmxs +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/userconf.o +@comment ${OCAML_SITELIB}/ocsigenserver/dllocsigenserver.so +${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm +${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsidbm.opt man/man1/ocsigenserver.1 share/examples/ocsigen/mime.types share/ocsigen/www/index.html Index: pkgsrc/www/ocsigen/distinfo diff -u pkgsrc/www/ocsigen/distinfo:1.8 pkgsrc/www/ocsigen/distinfo:1.9 --- pkgsrc/www/ocsigen/distinfo:1.8 Mon Jun 20 19:35:56 2016 +++ pkgsrc/www/ocsigen/distinfo Fri Dec 30 11:55:53 2016 @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.8 2016/06/20 19:35:56 jaapb Exp $ +$NetBSD: distinfo,v 1.9 2016/12/30 11:55:53 jaapb Exp $ -SHA1 (ocsigenserver-2.7.tar.gz) = ce8319c61c368df3b8f7f31be4af8828c801b08d -RMD160 (ocsigenserver-2.7.tar.gz) = 8839bdcb642ebf4631085803d1c6159e9af3d397 -SHA512 (ocsigenserver-2.7.tar.gz) = e31fa428e1d86232e4066a93fc948b592e80bb3e8374efee4f40d02c53e8a713ade8aa9904623c1129c892557ac4a451928278b808abe190bb254e6e43aab256 -Size (ocsigenserver-2.7.tar.gz) = 1262049 bytes -SHA1 (patch-Makefile) = c91c9f739462e3ef79bcd3ee4f05acfcff1e4518 -SHA1 (patch-src_Makefile) = acbd4a0e9b6c4a853f18fdacd1625ee142b5c423 -SHA1 (patch-src_http_ocsigen_senders.ml) = 61fcd61531f955d169991692f44d532597057984 -SHA1 (patch-src_http_ocsigen_senders.mli) = 71dce72976e55a49c8111dea29ceaa8f0008bdd8 +SHA1 (ocsigenserver-2.8.tar.gz) = 1043cd33b3e356a29957b95005edff0930c11be4 +RMD160 (ocsigenserver-2.8.tar.gz) = 729596c04091ed471b51ff7139359461ef883de9 +SHA512 (ocsigenserver-2.8.tar.gz) = 80d5125a93239c73756b03a0f50d83e691810f93a15525daef2f7ccd69279e348f03486c26319a9511c1a746f375317082a89ba37ce0ba22872d6db7d3fddf1b +Size (ocsigenserver-2.8.tar.gz) = 1265240 bytes +SHA1 (patch-Makefile) = 637a45aacd7c8afaeb73be624eb7732b21e78b4d Index: pkgsrc/www/ocsigen/patches/patch-Makefile diff -u pkgsrc/www/ocsigen/patches/patch-Makefile:1.2 pkgsrc/www/ocsigen/patches/patch-Makefile:1.3 --- pkgsrc/www/ocsigen/patches/patch-Makefile:1.2 Sat Dec 15 11:16:07 2012 +++ pkgsrc/www/ocsigen/patches/patch-Makefile Fri Dec 30 11:55:53 2016 @@ -1,20 +1,20 @@ -$NetBSD: patch-Makefile,v 1.2 2012/12/15 11:16:07 jaapb Exp $ +$NetBSD: patch-Makefile,v 1.3 2016/12/30 11:55:53 jaapb Exp $ -Correct installation procedure for pkgsrc environment ---- Makefile.orig 2012-12-07 15:17:09.000000000 +0000 +Use BSD_* installation commands +--- Makefile.orig 2016-11-15 15:04:34.000000000 +0000 +++ Makefile -@@ -67,61 +67,53 @@ install.opt: install.META.opt install.fi +@@ -67,66 +67,43 @@ install.opt: install.META.opt install.fi # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody # BB different, make files universally accessible, we cannot chown. -INSTALL_CAN_PUT_PERMISSIONS=yes -+INSTALL_CAN_PUT_PERMISSIONS=no - INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP) - INSTALL_MOD_660=660 - INSTALL_MOD_644=644 - INSTALL_MOD_755=755 - INSTALL_MOD_770=770 - INSTALL_MOD_750=750 +-INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)" +-INSTALL_MOD_660=660 +-INSTALL_MOD_644=644 +-INSTALL_MOD_755=755 +-INSTALL_MOD_770=770 +-INSTALL_MOD_750=750 +-USERNAME=$(shell whoami) -ifneq ($(shell id -u), 0) - ifneq ($(OCSIGENUSER), $(USERNAME)) - INSTALL_CAN_PUT_PERMISSIONS=no @@ -31,56 +31,45 @@ Correct installation procedure for pkgsr - INSTALL_MOD_770=777 - INSTALL_MOD_750=777 -endif -+#ifneq ($(shell id -u), 0) -+# ifneq ($(OCSIGENUSER), $(USERNAME)) -+# INSTALL_CAN_PUT_PERMISSIONS=no -+# endif -+# ifneq ($(shell groups ${USERNAME}|grep -q ${OCSIGENGROUP}; echo $$?), 0) -+# INSTALL_CAN_PUT_PERMISSIONS=no -+# endif -+#endif -+#ifeq ($(INSTALL_CAN_PUT_PERMISSIONS), no) -+# INSTALL_USER_GROUP= -+# INSTALL_MOD_660=666 -+# INSTALL_MOD_644=666 -+# INSTALL_MOD_755=777 -+# INSTALL_MOD_770=777 -+# INSTALL_MOD_750=777 -+#endif ++INSTALL_CAN_PUT_PERMISSIONS=no install.files: @echo INSTALL_CAN_PUT_PERMISSIONS: ${INSTALL_CAN_PUT_PERMISSIONS} -- ## Command pipe + ## Command pipe - $(INSTALL) -m ${INSTALL_MOD_755} -d $(dir $(TEMPROOT)$(COMMANDPIPE)) -- [ -p $(TEMPROOT)$(COMMANDPIPE) ] || \ ++ $(BSD_INSTALL_DATA_DIR) $(dir $(TEMPROOT)$(COMMANDPIPE)) + [ -p $(TEMPROOT)$(COMMANDPIPE) ] || \ - { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \ -- if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \ -- then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \ -- fi; } ++ { mkfifo ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \ + if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \ + then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \ + fi; } ## Configuration files - $(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d - ${INSTALL} -m ${INSTALL_MOD_644} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/ -+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(CONFIGDIR)/conf.d ++ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(CONFIGDIR)/conf.d + ${BSD_INSTALL_DATA} ${PROJECTNAME}.conf.sample $(TEMPROOT)$(CONFIGDIR)/ [ -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf ] || \ - { $(INSTALL) -m ${INSTALL_MOD_644} $(PROJECTNAME).conf.sample \ + { $(BSD_INSTALL_DATA) $(PROJECTNAME).conf.sample \ $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf; } - -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old +- -mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old ++#-mv $(TEMPROOT)$(CONFIGDIR)/mime.types $(TEMPROOT)$(CONFIGDIR)/mime.types.old ## Log directory - $(INSTALL) -m ${INSTALL_MOD_644} src/files/mime.types $(TEMPROOT)$(CONFIGDIR) - $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(LOGDIR) + $(BSD_INSTALL_DATA) src/files/mime.types $(TEMPROOT)$(CONFIGDIR) ++ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(LOGDIR) ## Static files - $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} $(TEMPROOT)$(STATICPAGESDIR) - $(INSTALL) -d -m ${INSTALL_MOD_750} ${INSTALL_USER_GROUP} $(TEMPROOT)$(DATADIR) - $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \ -+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(STATICPAGESDIR) -+ $(BSD_INSTALL_DATA_DIR) -d $(TEMPROOT)$(DATADIR) ++ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(STATICPAGESDIR) ++ $(BSD_INSTALL_DATA_DIR) $(TEMPROOT)$(DATADIR) + $(BSD_INSTALL_DATA) \ local/var/www/*.html $(TEMPROOT)$(STATICPAGESDIR) - $(INSTALL) -d -m ${INSTALL_MOD_755} ${INSTALL_USER_GROUP} \ -+ $(BSD_INSTALL_DATA_DIR) -d \ ++ $(BSD_INSTALL_DATA_DIR) \ $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff - $(INSTALL) -m ${INSTALL_MOD_644} ${INSTALL_USER_GROUP} \ + $(BSD_INSTALL_DATA) \ @@ -88,8 +77,13 @@ Correct installation procedure for pkgsr $(TEMPROOT)$(STATICPAGESDIR)/ocsigenstuff - $(INSTALL) -d -m ${INSTALL_MOD_755} $(TEMPROOT)$(MANDIR) - $(INSTALL) -m ${INSTALL_MOD_644} src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR) -+ $(BSD_INSTALL_MAN_DIR) -d $(TEMPROOT)$(MANDIR) ++ $(BSD_INSTALL_MAN_DIR) $(TEMPROOT)$(MANDIR) + $(BSD_INSTALL_MAN) src/files/${PROJECTNAME}.1 $(TEMPROOT)$(MANDIR) uninstall: -make -C doc uninstall +- -rm -f $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample ++ -rm -F $(TEMPROOT)$(CONFIGDIR)/$(PROJECTNAME).conf.sample + -rm -f $(TEMPROOT)$(MANDIR)/${PROJECTNAME}.1 + -rm -f $(TEMPROOT)$(COMMANDPIPE) + -rmdir --ignore-fail-on-non-empty $(TEMPROOT)$(CONFIGDIR)/conf.d --_----------=_148309895356940--