4 files changed, 21 insertions, 25 deletions

diff --git a/security/p5-openxpki/Makefile b/security/p5-openxpki/Makefile
index f05cc363f981..2db05b4ac18e 100644
--- a/security/p5-openxpki/Makefile
+++ b/security/p5-openxpki/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openxpki
-PORTVERSION=	0.19.0.1
+PORTVERSION=	0.20.0.1
 CATEGORIES=	security perl5
 PKGNAMEPREFIX=	p5-
 DIST_SUBDIR=	openxpki
@@ -13,6 +13,8 @@ COMMENT=	Perl based trustcenter software for PKI: server and deployment
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	\
+	p5-openxpki-i18n>=0.20.0.1:${PORTSDIR}/security/p5-openxpki-i18n \
+	openca-tools-forked>=1.4.0:${PORTSDIR}/security/openca-tools-forked \
 	p5-Workflow>=0.31:${PORTSDIR}/devel/p5-Workflow \
 	p5-CGI-Session>=0:${PORTSDIR}/www/p5-CGI-Session \
 	p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate \
@@ -46,13 +48,14 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 CONFLICTS=	\
 	p5-openxpki-client-[0-9]* \
 	p5-openxpki-client-scep-[0-9]* \
-	p5-openxpki-client-deployment-[0-9]*
+	p5-openxpki-client-deployment-[0-9]* \
+	p5-openxpki-client-html-mason-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openxpki
 GH_PROJECT=	openxpki
 GH_TAGNAME=	${GH_COMMIT}
-GH_COMMIT=	9d772a8
+GH_COMMIT=	d4dd0ab
 
 USE_OPENSSL=	yes
 USE_PERL5=	configure
diff --git a/security/p5-openxpki/distinfo b/security/p5-openxpki/distinfo
index 4fd6bf9ffe4b..f2bf4e129121 100644
--- a/security/p5-openxpki/distinfo
+++ b/security/p5-openxpki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openxpki/openxpki-0.19.0.1.tar.gz) = 7577bb39ee948f9969f5c5cfe4e14a9e12775e4e8d8f83555fc3d476c56c5e8c
-SIZE (openxpki/openxpki-0.19.0.1.tar.gz) = 2134438
+SHA256 (openxpki/openxpki-0.20.0.1.tar.gz) = 1777061581ff3493ba0b52f56357d60436bb785b41b9b3113ec068e2495603ef
+SIZE (openxpki/openxpki-0.20.0.1.tar.gz) = 2136470
diff --git a/security/p5-openxpki/pkg-descr b/security/p5-openxpki/pkg-descr
index 5a45cc1bbbf0..553624d809a7 100644
--- a/security/p5-openxpki/pkg-descr
+++ b/security/p5-openxpki/pkg-descr
@@ -1,14 +1,4 @@
-A collection of ports for the OpenXPKI suite - Perl based trustcenter 
-software for PKI: server and client parts along with deployment tools.
+Perl based trustcenter for arbitrary complex PKI:
+server and client parts.
 
-p5-openxpki: server part and deployment tools
-p5-openxpki-i18n: internationalization of the user interface
-p5-openxpki-client-html-mason: web interface to local OpenXPKI daemon
-
-Dependencies of OpenXPKI ports ("A --> B" means that port B depends on port A):
-
-  p5-openxpki-client-html-mason  <--  p5-openxpki  -->  p5-openxpki-i18n
-
-Notes: I18n is needed for the English interface too. 
-
-WWW: http://www.openxpki.org/
+WWW: http://www.openxpki.org
diff --git a/security/p5-openxpki/pkg-message b/security/p5-openxpki/pkg-message
index 9caf91ab6c30..3620eb479e9c 100644
--- a/security/p5-openxpki/pkg-message
+++ b/security/p5-openxpki/pkg-message
@@ -1,7 +1,10 @@
-================================ A piece of advice ===================================
-- Install port security/p5-i18n (needed for English interface too).
-- Install your favorite database (enable utf-8 support if needed) and a web server.
-- Perform deployment procedure for openxpki in a regular way.
-- When asked for the name of the "openxpki user" answer "openxpki",
-  and do not forget to add a line: "User openxpki" to the zone of your
-  OpenXPI-related (virtual) web server in your web server configuration file.
+==================================================================
+- SCEP prerequisite binary and i18n files for UI installed.
+- Enable utf8 locale (e.g. en_US.utf8) for the translation staff to work
+  (translation is needed even for English language).
+- Install your favorite database (enable utf8 support) and a web server.
+- Perform deployment procedure for OpenXPKI in a regular way.
+- This port has created user:group as openxpki:openxpki for use with OpenXPKI server.
+  Add a line: "User openxpki" to configuration of your OpenXPKI-related web server.
+- Choose from two versions of the handler: based on CGI or FastCGI modules of perl.
+==================================================================