From a0643d9080329736437c6ec9e8bccc517e194d42 Mon Sep 17 00:00:00 2001 From: marino Date: Fri, 13 Jun 2014 15:27:14 +0000 Subject: security/p5-openxpki-deployment: Unbreak by adding Stage support In addition to changes related to staging: * Adds LICENSE (ART20) * Fixes rc.d script for new rules * remove BROKEN definition (added due to lack of staging) What the patch does not do is fix the build on FreeBSD 10+ This will be dealt with in a following patch. Testing without poudriere and redports (F8 and F9, x4). PR: 190960 Submitted by: maintainer (Sergei Vyshenski) --- security/p5-openxpki-deployment/Makefile | 13 +++++-------- security/p5-openxpki-deployment/files/openxpki.in | 20 ++++++++------------ security/p5-openxpki-deployment/pkg-plist | 8 ++++++-- 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/security/p5-openxpki-deployment/Makefile b/security/p5-openxpki-deployment/Makefile index 9436868..af75475 100644 --- a/security/p5-openxpki-deployment/Makefile +++ b/security/p5-openxpki-deployment/Makefile @@ -1,9 +1,9 @@ -# Created by: Sergei Vyshenski +# Created by: Sergei Vyshenski # $FreeBSD$ PORTNAME= openxpki-deployment PORTVERSION= 0.9.1386 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security perl5 MASTER_SITES= SF/openxpki/openxpki/0.9.1300 PKGNAMEPREFIX= p5- @@ -12,7 +12,8 @@ DIST_SUBDIR= openxpki MAINTAINER= svysh.fbsd@gmail.com COMMENT= Perl based enterprise class trustcenter software for PKI -BROKEN= not staged +LICENSE= ART20 + BUILD_DEPENDS= \ p5-openxpki-client>=0:${PORTSDIR}/security/p5-openxpki-client \ p5-Config-Std>=0:${PORTSDIR}/devel/p5-Config-Std \ @@ -20,16 +21,12 @@ BUILD_DEPENDS= \ bash:${PORTSDIR}/shells/bash RUN_DEPENDS:= ${BUILD_DEPENDS} -MAN1= openxpki-configure.1 \ - openxpki-metaconf.1 \ - openxpkiadm.1 \ - openxpkictl.1 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". -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|>/dev/null 2>&1 | |' ${WRKSRC}/configure diff --git a/security/p5-openxpki-deployment/files/openxpki.in b/security/p5-openxpki-deployment/files/openxpki.in index acb2aa9..e35e316 100644 --- a/security/p5-openxpki-deployment/files/openxpki.in +++ b/security/p5-openxpki-deployment/files/openxpki.in @@ -12,25 +12,21 @@ # to ensure that openxpki starts at boot time. # # DO NOT CHANGE THESE DEFAULT VALUES HERE +# SET THEM IN THE /etc/rc.conf FILE # -# openxpki_flags (Set as needed) - -openxpki_enable="${openxpki_enable-NO}" -openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" - -case "$1" in - *start) command_args="start";; -esac . /etc/rc.subr -name="openxpki" +name=openxpki rcvar=openxpki_enable +load_rc_config $name command="%%PREFIX%%/bin/openxpkictl" -procname="openxpkid" -load_rc_config $name +openxpki_enable="${openxpki_enable-NO}" +openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" + +procname=openxpkid -pidfile="${openxpki_pidfile}" +pidfile=${openxpki_pidfile} run_rc_command "$1" diff --git a/security/p5-openxpki-deployment/pkg-plist b/security/p5-openxpki-deployment/pkg-plist index c7ed6e8..cd791f7 100644 --- a/security/p5-openxpki-deployment/pkg-plist +++ b/security/p5-openxpki-deployment/pkg-plist @@ -2,6 +2,10 @@ 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 @@ -65,10 +69,10 @@ 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/quickstart/notification -@dirrmtry share/openxpki/templates/quickstart @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 -- cgit v1.1