From owner-svn-ports-all@freebsd.org Sat Aug 31 07:57:49 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 954C9C8965; Sat, 31 Aug 2019 07:57:49 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46L7xT2VHDz4CRM; Sat, 31 Aug 2019 07:57:49 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 36193DBEA; Sat, 31 Aug 2019 07:57:49 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7V7vnUA002825; Sat, 31 Aug 2019 07:57:49 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7V7vnot002824; Sat, 31 Aug 2019 07:57:49 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201908310757.x7V7vnot002824@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 31 Aug 2019 07:57:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r510355 - head/security/metasploit X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/security/metasploit X-SVN-Commit-Revision: 510355 X-SVN-Commit-Repository: ports 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.29 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: Sat, 31 Aug 2019 07:57:49 -0000 Author: sunpoet Date: Sat Aug 31 07:57:48 2019 New Revision: 510355 URL: https://svnweb.freebsd.org/changeset/ports/510355 Log: Remove outdated RUBY_VER check With hat: ruby Modified: head/security/metasploit/Makefile Modified: head/security/metasploit/Makefile ============================================================================== --- head/security/metasploit/Makefile Sat Aug 31 07:57:43 2019 (r510354) +++ head/security/metasploit/Makefile Sat Aug 31 07:57:48 2019 (r510355) @@ -51,6 +51,7 @@ RUN_DEPENDS= nmap:security/nmap \ rubygem-sshkey>=0:security/rubygem-sshkey \ rubygem-bit-struct>=0:devel/rubygem-bit-struct \ rubygem-windows_error>=0:devel/rubygem-windows_error \ + rubygem-xmlrpc>=0:net/rubygem-xmlrpc \ rubygem-pdf-reader>=0:print/rubygem-pdf-reader \ rubygem-ruby-macho>=0:devel/rubygem-ruby-macho \ rubygem-dnsruby>=0:dns/rubygem-dnsruby \ @@ -125,21 +126,12 @@ SHEBANG_FILES= data/exploits/CVE-2017-17562/build.sh \ tools/hardware/killerbee_msfrelay.py \ tools/modules/aws-aggregator-userdata.sh -.include - -.if ${RUBY_VER} >= 2.4 -RUN_DEPENDS+= rubygem-xmlrpc>=0:net/rubygem-xmlrpc -.endif - post-patch: ${REINPLACE_CMD} 's,git ls-files,find . ! -type d | sed "s|^./||", ; \ /rb-readline/d' \ ${WRKSRC}/metasploit-framework.gemspec ${REINPLACE_CMD} "/pg/s|, '0.20.0'||; \ /concurrent-ruby/s|,'1.0.5'||" ${WRKSRC}/metasploit-framework.gemspec -.if ${RUBY_VER} < 2.4 - ${REINPLACE_CMD} '/xmlrpc/d' ${WRKSRC}/metasploit-framework.gemspec -.endif do-build: ${RM} ${WRKSRC}/Gemfile.lock @@ -160,4 +152,4 @@ post-install: @${FIND} -ds ${STAGEDIR}${DATADIR} -type d -empty | \ ${SED} 's,${STAGEDIR}${PREFIX}/,, ; s,^,@dir ,' >> ${TMPPLIST} -.include +.include