svn commit: r468995 - head/ports-mgmt/poudriere

[Bryan Drewery]

Author: bdrewery
Date: Thu May  3 23:10:11 2018
New Revision: 468995
URL: https://svnweb.freebsd.org/changeset/ports/468995

Log:
  - Add DIALOG4PORTS option (default on) to install it for 'options' command [1].
  - Add CERTS option (default on) to allow disabling cert dependencies.
  - Reword QEMU_DESC to match poudriere-devel.
  - Only install ZSH files if the option is enabled.
  
  PR:		225457 [1]
  Submitted by:	Yasuhiro KIMURA <yasu at utahime.org> [1] (based on)

Modified:
  head/ports-mgmt/poudriere/Makefile

Modified: head/ports-mgmt/poudriere/Makefile
==============================================================================
--- head/ports-mgmt/poudriere/Makefile	Thu May  3 22:53:24 2018	(r468994)
+++ head/ports-mgmt/poudriere/Makefile	Thu May  3 23:10:11 2018	(r468995)
@@ -2,7 +2,7 @@
 
 PORTNAME=	poudriere
 DISTVERSION=	3.2.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -21,14 +21,18 @@ GH_ACCOUNT=	freebsd
 GNU_CONFIGURE=	yes
 ETCDIR=		${PREFIX}/etc/poudriere.d
 
-OPTIONS_DEFINE=	ZSH QEMU EXAMPLES
-OPTIONS_DEFAULT=ZSH
+OPTIONS_DEFINE=	CERTS DIALOG4PORTS ZSH QEMU EXAMPLES
+OPTIONS_DEFAULT=CERTS DIALOG4PORTS ZSH
 OPTIONS_SUB=	yes
 
-RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
-RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
+CERTS_DESC=		Install checksum and SSL certificates for jail creation
+CERTS_RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
+CERTS_RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 
-QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
+DIALOG4PORTS_DESC=	Install dialog4ports for options command
+DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
+
+QEMU_DESC=	Add qemu-user-static for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
 .include <bsd.port.options.mk>
@@ -52,10 +56,12 @@ post-patch:
 	${REINPLACE_CMD} '/.PHONY: poudriere/d' ${WRKSRC}/Makefile.*
 
 post-install:
+	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS
+
+post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
 	    ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
-	${LN} -fs ${LOCALBASE}/share/freebsd/MANIFESTS \
-	    ${STAGEDIR}${DATADIR}/MANIFESTS
 
 .include <bsd.port.mk>