From owner-svn-ports-all@FreeBSD.ORG Fri Jun 13 15:27:15 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 285BEC08; Fri, 13 Jun 2014 15:27:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 15AAB2717; Fri, 13 Jun 2014 15:27:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5DFRE94065529; Fri, 13 Jun 2014 15:27:14 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5DFREaQ065526; Fri, 13 Jun 2014 15:27:14 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201406131527.s5DFREaQ065526@svn.freebsd.org> From: John Marino Date: Fri, 13 Jun 2014 15:27:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r357691 - in head/security/p5-openxpki-deployment: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Jun 2014 15:27:15 -0000 Author: marino Date: Fri Jun 13 15:27:14 2014 New Revision: 357691 URL: http://svnweb.freebsd.org/changeset/ports/357691 QAT: https://qat.redports.org/buildarchive/r357691/ Log: 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) Modified: head/security/p5-openxpki-deployment/Makefile head/security/p5-openxpki-deployment/files/openxpki.in head/security/p5-openxpki-deployment/pkg-plist Modified: head/security/p5-openxpki-deployment/Makefile ============================================================================== --- head/security/p5-openxpki-deployment/Makefile Fri Jun 13 15:22:27 2014 (r357690) +++ head/security/p5-openxpki-deployment/Makefile Fri Jun 13 15:27:14 2014 (r357691) @@ -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 Modified: head/security/p5-openxpki-deployment/files/openxpki.in ============================================================================== --- head/security/p5-openxpki-deployment/files/openxpki.in Fri Jun 13 15:22:27 2014 (r357690) +++ head/security/p5-openxpki-deployment/files/openxpki.in Fri Jun 13 15:27:14 2014 (r357691) @@ -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" Modified: head/security/p5-openxpki-deployment/pkg-plist ============================================================================== --- head/security/p5-openxpki-deployment/pkg-plist Fri Jun 13 15:22:27 2014 (r357690) +++ head/security/p5-openxpki-deployment/pkg-plist Fri Jun 13 15:27:14 2014 (r357691) @@ -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/work 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