Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 15 Nov 2018 08:56:15 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r485007 - head/shells/jailkit
Message-ID:  <201811150856.wAF8uF61022530@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Thu Nov 15 08:56:15 2018
New Revision: 485007
URL: https://svnweb.freebsd.org/changeset/ports/485007

Log:
  shells/jailkit: Avoid accidentally picking up procmail
  
  When configure sees procmail in the environment building of
  jk_procmailwrapper is enabled.  Add a new non-default PROCMAIL
  option to make it explicit.
  
  PR:		230132
  Submitted by:	John Hein <z7dr6ut7gs@snkmail.com>
  Approved by:	woodsb02 (maintainer timeout, 3.5 months)

Modified:
  head/shells/jailkit/Makefile
  head/shells/jailkit/pkg-plist

Modified: head/shells/jailkit/Makefile
==============================================================================
--- head/shells/jailkit/Makefile	Thu Nov 15 08:17:31 2018	(r485006)
+++ head/shells/jailkit/Makefile	Thu Nov 15 08:56:15 2018	(r485007)
@@ -3,7 +3,7 @@
 
 PORTNAME=	jailkit
 PORTVERSION=	2.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
@@ -19,8 +19,15 @@ CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
 
 PORTDOCS=	COPYRIGHT README.txt
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS PROCMAIL
+OPTIONS_SUB=	yes
 
+PROCMAIL_DESC=	Build procmail(1) wrapper
+
+PROCMAIL_CONFIGURE_ENV_OFF=	ac_cv_path_PROCMAILPATH=no
+PROCMAIL_BUILD_DEPENDS=	procmail:mail/procmail
+PROCMAIL_RUN_DEPENDS=	procmail:mail/procmail
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
@@ -29,5 +36,8 @@ post-install:
 		${STAGEDIR}${PREFIX}/sbin/jk_chrootlaunch \
 		${STAGEDIR}${PREFIX}/sbin/jk_chrootsh \
 		${STAGEDIR}${PREFIX}/sbin/jk_lsh
+
+post-install-PROCMAIL-on:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/jk_procmailwrapper
 
 .include <bsd.port.mk>

Modified: head/shells/jailkit/pkg-plist
==============================================================================
--- head/shells/jailkit/pkg-plist	Thu Nov 15 08:17:31 2018	(r485006)
+++ head/shells/jailkit/pkg-plist	Thu Nov 15 08:56:15 2018	(r485007)
@@ -16,6 +16,7 @@ man/man8/jk_init.8.gz
 man/man8/jk_jailuser.8.gz
 man/man8/jk_list.8.gz
 man/man8/jk_lsh.8.gz
+%%PROCMAIL%%man/man8/jk_procmailwrapper.8.gz
 man/man8/jk_socketd.8.gz
 man/man8/jk_uchroot.8.gz
 man/man8/jk_update.8.gz
@@ -28,6 +29,7 @@ sbin/jk_init
 sbin/jk_jailuser
 sbin/jk_list
 sbin/jk_lsh
+%%PROCMAIL%%sbin/jk_procmailwrapper
 sbin/jk_socketd
 sbin/jk_update
 %%DATADIR%%/jk_lib.py



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811150856.wAF8uF61022530>