4 files changed, 30 insertions, 27 deletions

diff --git a/security/p5-openxpki-i18n/Makefile b/security/p5-openxpki-i18n/Makefile
index 77fee02cd461..a5ad07ed4f8c 100644
--- a/security/p5-openxpki-i18n/Makefile
+++ b/security/p5-openxpki-i18n/Makefile
@@ -1,24 +1,34 @@
-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
+# Created by: Sergei Vyshenski <svysh.fbsd@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	openxpki-i18n
-PORTVERSION=	0.9.1395
-PORTREVISION=	1
+PORTVERSION=	0.14.0.1
 CATEGORIES=	security perl5
-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
 PKGNAMEPREFIX=	p5-
+DISTNAME=	openxpki-${PORTVERSION}
 DIST_SUBDIR=	openxpki
 
 MAINTAINER=	svysh.fbsd@gmail.com
 COMMENT=	Perl based trustcenter software for PKI: i18n tools
 
-BUILD_DEPENDS=	\
-	p5-openxpki>=0:${PORTSDIR}/security/p5-openxpki
+LICENSE=	APACHE20
+
+BUILD_DEPENDS=	p5-openxpki>=0.14:${PORTSDIR}/security/p5-openxpki
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gettext gmake perl5
+USE_GITHUB=	yes
+GH_ACCOUNT=	openxpki
+GH_PROJECT=	openxpki
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	66ee052
+
 ### We can not go WITHOUT_NLS. Internationalization is needed
 ### even to use English language.
-ALL_TARGET=	default
+USES=		gettext gmake perl5
+ALL_TARGET=	scan default
+
+MAKE_JOBS_UNSAFE=	yes
+
+WRKSRC=	${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/core/i18n
 
 .include <bsd.port.mk>
diff --git a/security/p5-openxpki-i18n/distinfo b/security/p5-openxpki-i18n/distinfo
index e8d5791ee745..7877d99d4ad7 100644
--- a/security/p5-openxpki-i18n/distinfo
+++ b/security/p5-openxpki-i18n/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openxpki/openxpki-i18n-0.9.1395.tar.gz) = 5d56a4cd81548e40f3cb62277f69b40043f4ec51a713b43ae95885897a06cd20
-SIZE (openxpki/openxpki-i18n-0.9.1395.tar.gz) = 109837
+SHA256 (openxpki/openxpki-0.14.0.1.tar.gz) = cd55fa6790910ee9239ebcf4e5dfbe9ea5f5fded06474a145f75092d646ef8b3
+SIZE (openxpki/openxpki-0.14.0.1.tar.gz) = 2805627
diff --git a/security/p5-openxpki-i18n/pkg-descr b/security/p5-openxpki-i18n/pkg-descr
index 7236c8466d49..352181eb50d5 100644
--- a/security/p5-openxpki-i18n/pkg-descr
+++ b/security/p5-openxpki-i18n/pkg-descr
@@ -1,21 +1,14 @@
-A collection of ports for the OpenXPKI suite - Perl based trustcenter 
+A collection of ports for the OpenXPKI suite - Perl based trustcenter
 software for PKI: server and client parts along with deployment tools.
 
-p5-openxpki: core for server part
-p5-openxpki-client: base class for actual clients
+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
-p5-openxpki-client-scep: set of SCEP tools
-p5-openxpki-deployment: set or deployment tools
 
 Dependencies of OpenXPKI ports ("A --> B" means that port B depends on port A):
 
- p5-openxpki-client  <--  p5-openxpki (server)  -->  p5-openxpki-i18n
-           \
-            \     |  p5-openxpki-client-html-mason,
-             \--> |  p5-openxpki-client-scep, p5-openxpki-deployment.
-Notes: 
-I18n is needed for the English interface too. For effective use of deployment,
-it is recommended to install p5-openxpki-client-html-mason.
+  p5-openxpki-client-html-mason  <--  p5-openxpki  -->  p5-openxpki-i18n
 
-WWW: http://www.openxpki.org/download/freebsd.html
+Notes: I18n is needed for the English interface too.
+
+WWW: http://www.openxpki.org/
diff --git a/security/p5-openxpki-i18n/pkg-plist b/security/p5-openxpki-i18n/pkg-plist
index af10ce3747fc..73582c37dd72 100644
--- a/security/p5-openxpki-i18n/pkg-plist
+++ b/security/p5-openxpki-i18n/pkg-plist
@@ -2,9 +2,9 @@ share/locale/de_DE/LC_MESSAGES/openxpki.mo
 share/locale/en_GB/LC_MESSAGES/openxpki.mo
 share/locale/en_US/LC_MESSAGES/openxpki.mo
 share/locale/ru_RU/LC_MESSAGES/openxpki.mo
-@dirrmtry share/locale/ru_RU/LC_MESSAGES
-@dirrmtry share/locale/ru_RU
-@dirrmtry share/locale/en_US/LC_MESSAGES
-@dirrmtry share/locale/en_US
 @dirrmtry share/locale/de_DE/LC_MESSAGES
 @dirrmtry share/locale/de_DE
+@dirrmtry share/locale/en_US/LC_MESSAGES
+@dirrmtry share/locale/en_US
+@dirrmtry share/locale/ru_RU/LC_MESSAGES
+@dirrmtry share/locale/ru_RU