15 files changed, 3 insertions, 302 deletions

diff --git a/MOVED b/MOVED
index 92d1ef26616b..08c6e21d0a83 100644
--- a/MOVED
+++ b/MOVED
@@ -6371,3 +6371,6 @@ sysutils/readlink||2014-08-03|Has expired: All features implemented in the base
 net-mgmt/bsd-airtools||2014-08-04|Has expired: "broken by removal of wicontrol ioctls from if_wavelan_ieee.h; domain disappeared"
 www/moodle||2014-08-04|Has expired: Upstream support ended
 databases/bucardo|databases/p5-Bucardo|2014-08-04|Dupplicate
+security/p5-openxpki-client|security/p5-openxpki|2014-08-04|Has expired: now incorporated within security/p5-openxpki
+security/p5-openxpki-client-scep|security/p5-openxpki|2014-08-04|Has expired: now incorporated within security/p5-openxpki
+security/p5-openxpki-deployment|security/p5-openxpki|2014-08-04|Has expired: now incorporated within security/p5-openxpki
diff --git a/security/Makefile b/security/Makefile
index 04b7562c0a71..f577827ba1f2 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -598,10 +598,7 @@
     SUBDIR += p5-Yahoo-BBAuth
     SUBDIR += p5-dicewaregen
     SUBDIR += p5-openxpki
-    SUBDIR += p5-openxpki-client
     SUBDIR += p5-openxpki-client-html-mason
-    SUBDIR += p5-openxpki-client-scep
-    SUBDIR += p5-openxpki-deployment
     SUBDIR += p5-openxpki-i18n
     SUBDIR += pad
     SUBDIR += pam-mysql
diff --git a/security/p5-openxpki-client-scep/Makefile b/security/p5-openxpki-client-scep/Makefile
deleted file mode 100644
index c3445fb9dfbd..000000000000
--- a/security/p5-openxpki-client-scep/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
-# $FreeBSD$
-
-PORTNAME=	openxpki-client-scep
-PORTVERSION=	0.9.1313
-PORTREVISION=	1
-CATEGORIES=	security perl5
-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
-PKGNAMEPREFIX=	p5-
-DISTNAME=	OpenXPKI-Client-SCEP-${PORTVERSION}
-DIST_SUBDIR=	openxpki
-
-MAINTAINER=	svysh.fbsd@gmail.com
-COMMENT=	Client for SCEP requests to openxpki server
-
-BUILD_DEPENDS=	\
-	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
-	p5-NetAddr-IP>=0:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		perl5 gmake
-USE_PERL5=	configure
-
-DEPRECATED=	This port was merged with security/p5-openxpki
-EXPIRATION_DATE=	2014-09-03
-
-.include <bsd.port.mk>
diff --git a/security/p5-openxpki-client-scep/distinfo b/security/p5-openxpki-client-scep/distinfo
deleted file mode 100644
index 5e1a4f689bd0..000000000000
--- a/security/p5-openxpki-client-scep/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openxpki/OpenXPKI-Client-SCEP-0.9.1313.tar.gz) = 7da72362dba1e945c64306bc60951539f8a8970b87bb8464a02eee26d098dc2b
-SIZE (openxpki/OpenXPKI-Client-SCEP-0.9.1313.tar.gz) = 13519
diff --git a/security/p5-openxpki-client-scep/pkg-descr b/security/p5-openxpki-client-scep/pkg-descr
deleted file mode 100644
index 7236c8466d49..000000000000
--- a/security/p5-openxpki-client-scep/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-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-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.
-
-WWW: http://www.openxpki.org/download/freebsd.html
diff --git a/security/p5-openxpki-client-scep/pkg-plist b/security/p5-openxpki-client-scep/pkg-plist
deleted file mode 100644
index 4fa1db4e9fe2..000000000000
--- a/security/p5-openxpki-client-scep/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%SITE_PERL%%/OpenXPKI/Client/SCEP.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SCEP/.packlist
-%%PERL5_MAN3%%/OpenXPKI::Client::SCEP.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/SCEP
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI
-@dirrmtry %%SITE_PERL%%/OpenXPKI/Client
-@dirrmtry %%SITE_PERL%%/OpenXPKI
diff --git a/security/p5-openxpki-client/Makefile b/security/p5-openxpki-client/Makefile
deleted file mode 100644
index baced6385cb2..000000000000
--- a/security/p5-openxpki-client/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-# Created by: Sergei Vyshenski <svysh@pn.sinp.msu.ru>
-# $FreeBSD$
-
-PORTNAME=	openxpki-client
-PORTVERSION=	0.9.1284
-PORTREVISION=	1
-CATEGORIES=	security perl5
-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
-PKGNAMEPREFIX=	p5-
-DISTNAME=	OpenXPKI-Client-${PORTVERSION}
-DIST_SUBDIR=	openxpki
-
-MAINTAINER=	svysh.fbsd@gmail.com
-COMMENT=	Perl based trustcenter software for PKI: base class for actual clients
-
-BUILD_DEPENDS=	\
-	p5-openxpki>=0:${PORTSDIR}/security/p5-openxpki
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		perl5 gmake
-USE_PERL5=	configure
-
-DEPRECATED=	This port was merged with security/p5-openxpki
-EXPIRATION_DATE=	2014-09-03
-
-.include <bsd.port.mk>
diff --git a/security/p5-openxpki-client/distinfo b/security/p5-openxpki-client/distinfo
deleted file mode 100644
index 344dbb83b245..000000000000
--- a/security/p5-openxpki-client/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openxpki/OpenXPKI-Client-0.9.1284.tar.gz) = 00dfad74ec834bf76fdad99b2259ef0c6b2fc28784a98a5af6ba971da395368b
-SIZE (openxpki/OpenXPKI-Client-0.9.1284.tar.gz) = 13409
diff --git a/security/p5-openxpki-client/pkg-descr b/security/p5-openxpki-client/pkg-descr
deleted file mode 100644
index 7236c8466d49..000000000000
--- a/security/p5-openxpki-client/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-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-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.
-
-WWW: http://www.openxpki.org/download/freebsd.html
diff --git a/security/p5-openxpki-client/pkg-plist b/security/p5-openxpki-client/pkg-plist
deleted file mode 100644
index 27392a9f2e92..000000000000
--- a/security/p5-openxpki-client/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%SITE_PERL%%/OpenXPKI/Client.pm
-%%SITE_PERL%%/OpenXPKI/Client/API.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client/.packlist
-%%PERL5_MAN3%%/OpenXPKI::Client.3.gz
-%%PERL5_MAN3%%/OpenXPKI::Client::API.3.gz
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI/Client
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/OpenXPKI
-@dirrmtry %%SITE_PERL%%/OpenXPKI/Client
-@dirrmtry %%SITE_PERL%%/OpenXPKI
diff --git a/security/p5-openxpki-deployment/Makefile b/security/p5-openxpki-deployment/Makefile
deleted file mode 100644
index fc5e513e043b..000000000000
--- a/security/p5-openxpki-deployment/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# Created by: Sergei Vyshenski <svysh.fbsd@gmail.com>
-# $FreeBSD$
-
-PORTNAME=	openxpki-deployment
-PORTVERSION=	0.9.1386
-PORTREVISION=	3
-CATEGORIES=	security perl5
-MASTER_SITES=	SF/openxpki/openxpki/0.9.1300
-PKGNAMEPREFIX=	p5-
-DIST_SUBDIR=	openxpki
-
-MAINTAINER=	svysh.fbsd@gmail.com
-COMMENT=	Perl based enterprise class trustcenter software for PKI
-
-LICENSE=	ART20
-
-BUILD_DEPENDS=	\
-	p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \
-	p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \
-	p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit \
-	bash:${PORTSDIR}/shells/bash
-RUN_DEPENDS:=	${BUILD_DEPENDS}
-
-USES=		perl5 gmake
-USE_RC_SUBR=	openxpki
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix ${PREFIX}
-# Do not prepend PREFIX with STAGEDIR here, it is not a "destination".
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|>/dev/null 2>&1 | |' ${WRKSRC}/configure
-
-post-install:
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "================================ A piece of advice ==================================="
-	@${ECHO_MSG} "===> Install your favorite database (enable utf-8 support if needed) and a web server."
-	@${ECHO_MSG} "===> Perform deployment procedure for openxpki in a regular way."
-	@${ECHO_MSG} "===> When asked for the name of the \"openxpki user\" answer \"openxpki\","
-	@${ECHO_MSG} "===> and do not forget to add a line: \"User openxpki\" to the zone of your"
-	@${ECHO_MSG} "===> OpenXPI-related (virtual) web server in your Apache configuration file."
-	@${ECHO_MSG} ""
-.if !defined(BATCH)
-	@sleep 9
-.endif
-
-DEPRECATED=	This port was merged with security/p5-openxpki
-EXPIRATION_DATE=	2014-09-03
-
-.include <bsd.port.mk>
diff --git a/security/p5-openxpki-deployment/distinfo b/security/p5-openxpki-deployment/distinfo
deleted file mode 100644
index c94ab25bdf9d..000000000000
--- a/security/p5-openxpki-deployment/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openxpki/openxpki-deployment-0.9.1386.tar.gz) = 2d56b4915cc6f556cb65c552b193d2e267b1913985573f4ea9eeeb8458adc70c
-SIZE (openxpki/openxpki-deployment-0.9.1386.tar.gz) = 63687
diff --git a/security/p5-openxpki-deployment/files/openxpki.in b/security/p5-openxpki-deployment/files/openxpki.in
deleted file mode 100644
index e35e316ea2b3..000000000000
--- a/security/p5-openxpki-deployment/files/openxpki.in
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-# PROVIDE: openxpki
-# REQUIRE: LOGIN
-# REQUIRE: postgresql
-# REQUIRE: mysql
-# KEYWORD: shutdown
-
-# Define this variable in the file /etc/rc.conf:
-# openxpki_enable="YES"
-# to ensure that openxpki starts at boot time.
-#
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
-# SET THEM IN THE /etc/rc.conf FILE
-#
-
-. /etc/rc.subr
-
-name=openxpki
-rcvar=openxpki_enable
-load_rc_config $name
-command="%%PREFIX%%/bin/openxpkictl"
-
-openxpki_enable="${openxpki_enable-NO}"
-openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid"
-
-procname=openxpkid
-
-pidfile=${openxpki_pidfile}
-
-run_rc_command "$1"
diff --git a/security/p5-openxpki-deployment/pkg-descr b/security/p5-openxpki-deployment/pkg-descr
deleted file mode 100644
index 7236c8466d49..000000000000
--- a/security/p5-openxpki-deployment/pkg-descr
+++ /dev/null
@@ -1,21 +0,0 @@
-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-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.
-
-WWW: http://www.openxpki.org/download/freebsd.html
diff --git a/security/p5-openxpki-deployment/pkg-plist b/security/p5-openxpki-deployment/pkg-plist
deleted file mode 100644
index cd791f7f3adc..000000000000
--- a/security/p5-openxpki-deployment/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-bin/openxpki-configure
-bin/openxpki-metaconf
-bin/openxpkiadm
-bin/openxpkictl
-man/man1/openxpki-configure.1.gz
-man/man1/openxpki-metaconf.1.gz
-man/man1/openxpkiadm.1.gz
-man/man1/openxpkictl.1.gz
-share/openxpki/templates/default/acl.xml
-share/openxpki/templates/default/auth.xml
-share/openxpki/templates/default/config.xml
-share/openxpki/templates/default/database.xml
-share/openxpki/templates/default/ldappublic.xml
-share/openxpki/templates/default/log.conf
-share/openxpki/templates/default/log_database.xml
-share/openxpki/templates/default/notification.xml
-share/openxpki/templates/default/notification/en/certificate_issued_correspond.txt
-share/openxpki/templates/default/notification/en/csr_approvals_canceled_comment.txt
-share/openxpki/templates/default/notification/en/csr_approved_comment.txt
-share/openxpki/templates/default/notification/en/csr_created_comment.txt
-share/openxpki/templates/default/notification/en/csr_created_correspond.txt
-share/openxpki/templates/default/notification/en/csr_rejected_correspond.txt
-share/openxpki/templates/default/openxpki.conf
-share/openxpki/templates/default/profile.xml
-share/openxpki/templates/default/token.xml
-share/openxpki/templates/default/workflow.xml
-share/openxpki/templates/default/workflow_activity_certificate_issuance.xml
-share/openxpki/templates/default/workflow_activity_certificate_ldap_publishing.xml
-share/openxpki/templates/default/workflow_activity_certificate_revocation_request.xml
-share/openxpki/templates/default/workflow_activity_certificate_signing_request.xml
-share/openxpki/templates/default/workflow_activity_crl_issuance.xml
-share/openxpki/templates/default/workflow_activity_dataexchange.xml
-share/openxpki/templates/default/workflow_activity_null.xml
-share/openxpki/templates/default/workflow_activity_password_safe.xml
-share/openxpki/templates/default/workflow_activity_scep_request.xml
-share/openxpki/templates/default/workflow_activity_smartcard_personalization.xml
-share/openxpki/templates/default/workflow_condition.xml
-share/openxpki/templates/default/workflow_def_certificate_issuance.xml
-share/openxpki/templates/default/workflow_def_certificate_ldap_publishing.xml
-share/openxpki/templates/default/workflow_def_certificate_revocation_request.xml
-share/openxpki/templates/default/workflow_def_certificate_signing_request.xml
-share/openxpki/templates/default/workflow_def_crl_issuance.xml
-share/openxpki/templates/default/workflow_def_password_safe.xml
-share/openxpki/templates/default/workflow_def_scep_request.xml
-share/openxpki/templates/default/workflow_def_smartcard_personalization.xml
-share/openxpki/templates/default/workflow_validator_certificate_revocation_request.xml
-share/openxpki/templates/default/workflow_validator_certificate_signing_request.xml
-share/openxpki/templates/default/workflow_validator_password_safe.xml
-share/openxpki/templates/quickstart/acl.xml
-share/openxpki/templates/quickstart/auth.xml
-share/openxpki/templates/quickstart/config.xml
-share/openxpki/templates/quickstart/database.xml
-share/openxpki/templates/quickstart/log.conf
-share/openxpki/templates/quickstart/log_database.xml
-share/openxpki/templates/quickstart/notification.xml
-share/openxpki/templates/quickstart/openxpki.conf
-share/openxpki/templates/quickstart/profile.xml
-share/openxpki/templates/quickstart/token.xml
-share/openxpki/templates/quickstart/workflow.xml
-share/openxpki/templates/quickstart/workflow_activity_certificate_issuance.xml
-share/openxpki/templates/quickstart/workflow_activity_certificate_revocation_request.xml
-share/openxpki/templates/quickstart/workflow_activity_certificate_signing_request.xml
-share/openxpki/templates/quickstart/workflow_activity_crl_issuance.xml
-share/openxpki/templates/quickstart/workflow_activity_null.xml
-share/openxpki/templates/quickstart/workflow_condition.xml
-share/openxpki/templates/quickstart/workflow_def_certificate_issuance.xml
-share/openxpki/templates/quickstart/workflow_def_certificate_revocation_request.xml
-share/openxpki/templates/quickstart/workflow_def_certificate_signing_request.xml
-share/openxpki/templates/quickstart/workflow_def_crl_issuance.xml
-share/openxpki/templates/quickstart/workflow_validator_certificate_revocation_request.xml
-share/openxpki/templates/quickstart/workflow_validator_certificate_signing_request.xml
-@dirrmtry share/openxpki/templates/default/notification/en
-@dirrmtry share/openxpki/templates/default/notification
-@dirrmtry share/openxpki/templates/default
-@dirrmtry share/openxpki/templates/quickstart/notification
-@dirrmtry share/openxpki/templates/quickstart
-@dirrmtry share/openxpki/templates
-@dirrmtry share/openxpki