svn commit: r357691 - in head/security/p5-openxpki-deployment: . files

[John Marino]

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 <svysh at pn.sinp.msu.ru>
+# Created by: Sergei Vyshenski <svysh.fbsd at gmail.com>
 # $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 at 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
- at dirrmtry share/openxpki/templates/quickstart/notification
- at dirrmtry share/openxpki/templates/quickstart
 @dirrmtry share/openxpki/templates/default/notification/en
 @dirrmtry share/openxpki/templates/default/notification
 @dirrmtry share/openxpki/templates/default
+ at dirrmtry share/openxpki/templates/quickstart/notification
+ at dirrmtry share/openxpki/templates/quickstart
 @dirrmtry share/openxpki/templates
 @dirrmtry share/openxpki