From owner-svn-ports-head@freebsd.org Tue Feb 21 10:47:21 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EEB2DCE84E6; Tue, 21 Feb 2017 10:47:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 BE2421A90; Tue, 21 Feb 2017 10:47:21 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1LAlK7G022511; Tue, 21 Feb 2017 10:47:20 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1LAlKoI022510; Tue, 21 Feb 2017 10:47:20 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201702211047.v1LAlKoI022510@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 21 Feb 2017 10:47:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434517 - head/net-mgmt/cricket X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Feb 2017 10:47:22 -0000 Author: amdmi3 Date: Tue Feb 21 10:47:20 2017 New Revision: 434517 URL: https://svnweb.freebsd.org/changeset/ports/434517 Log: - Properly handle p5-CGI dependency, the module was unbundled from perl in 5.21 - While here, minor style fixes PR: 217167 Submitted by: fullermd@over-yonder.net Modified: head/net-mgmt/cricket/Makefile Modified: head/net-mgmt/cricket/Makefile ============================================================================== --- head/net-mgmt/cricket/Makefile Tue Feb 21 10:45:26 2017 (r434516) +++ head/net-mgmt/cricket/Makefile Tue Feb 21 10:47:20 2017 (r434517) @@ -19,7 +19,7 @@ USES= perl5 shebangfix SHEBANG_FILES= util/metaQuery.pl HAS_CONFIGURE= yes NO_BUILD= yes -PLIST_SUB+= VERSION=${PORTVERSION} +PLIST_SUB= VERSION=${PORTVERSION} SUB_FILES= pkg-message # UID and username comes from ports/UIDs. @@ -29,13 +29,13 @@ GROUPS= www CRICKETBASE= ${STAGEDIR}${PREFIX}/cricket post-patch: - ${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \ + @${REINPLACE_CMD} -e 's,/home/cricket,${PREFIX},g' \ ${WRKSRC}/cricket-conf.pl.sample - ${REINPLACE_CMD} -e 's,/usr/local/net/bin/ssh,/usr/bin/ssh,g' \ + @${REINPLACE_CMD} -e 's,/usr/local/net/bin/ssh,/usr/bin/ssh,g' \ ${WRKSRC}/sample-config/news-server/Defaults do-install: - ${MKDIR} -m 755 ${CRICKETBASE}/cricket-${PORTVERSION} + @${MKDIR} ${CRICKETBASE}/cricket-${PORTVERSION} ${CP} -R ${WRKSRC}/* ${CRICKETBASE}/cricket-${PORTVERSION} ${FIND} ${CRICKETBASE}/cricket-${PORTVERSION} -name \*.orig -or \ -name \*.bak | ${XARGS} ${RM} @@ -48,4 +48,10 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/cricket-conf.pl.sample \ ${STAGEDIR}${PREFIX}/etc/cricket-conf.pl.dist -.include +.include + +.if ${PERL_LEVEL} >= 502200 +RUN_DEPENDS+= p5-CGI>0:www/p5-CGI +.endif + +.include