summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorstas <stas@FreeBSD.org>2008-04-06 08:58:21 +0000
committerstas <stas@FreeBSD.org>2008-04-06 08:58:21 +0000
commit6fbde8aaf51fc0bcaf991519b739b0592c98f740 (patch)
tree280ebf175af2693f172cb9dc5674fa73fb5992d3 /security
parentf29755f74021d623e3671b29c948ead5c3e33715 (diff)
downloadFreeBSD-ports-6fbde8aaf51fc0bcaf991519b739b0592c98f740.zip
FreeBSD-ports-6fbde8aaf51fc0bcaf991519b739b0592c98f740.tar.gz
- Add ruby 1.9 support
- Implement new knobs for gems and rake (these are included in ruby 1.9 distribution already). Also move gem bits from ruby-gems/Makefile.common to bsd.ruby.mk[1]. Now to depend on gems or rake you should define USE_RUBYGEMS/USE_RAKE accordingly. Also RAKE_BIN variable is provided for pointing to the right rake executable. - Rewrite RUBY_SCHEBANG in awk to eliminate build dependency on ruby. Discussed with: Jonathan Weiss <jw@innerewut.de> [1] (gems maintainer) Tested by: ports@
Diffstat (limited to 'security')
-rw-r--r--security/metasploit/Makefile5
-rw-r--r--security/rubygem-net-sftp/Makefile7
-rw-r--r--security/rubygem-net-ssh/Makefile2
3 files changed, 9 insertions, 5 deletions
diff --git a/security/metasploit/Makefile b/security/metasploit/Makefile
index 429fa97..b15c689 100644
--- a/security/metasploit/Makefile
+++ b/security/metasploit/Makefile
@@ -15,7 +15,6 @@ MAINTAINER= onatan@gmail.com
COMMENT= Exploit-Framework for Penetration-Testing
RUN_DEPENDS= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion \
- ${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems \
${LOCALBASE}/lib/ruby/gems/1.8/specifications/activerecord-1.15.6.gemspec:${PORTSDIR}/databases/rubygem-activerecord
SCRIPTS= msfcli msfconsole msfd msfencode msflicense msfopcode \
@@ -28,6 +27,10 @@ USE_RUBY= yes
.include <bsd.port.pre.mk>
+.if ${RUBY_VER} == 1.9
+RUN_DEPENDS+= ${LOCALBASE}/bin/gem:${PORTSDIR}/devel/ruby-gems
+.endif
+
.if defined(WITH_MSFGUI)
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/wxruby.so:${PORTSDIR}/x11-toolkits/ruby-wx
SCRIPTS+= msfgui
diff --git a/security/rubygem-net-sftp/Makefile b/security/rubygem-net-sftp/Makefile
index b6a529a..e7c0b95 100644
--- a/security/rubygem-net-sftp/Makefile
+++ b/security/rubygem-net-sftp/Makefile
@@ -17,6 +17,7 @@ COMMENT= Implementation of the SFTP client protocol
RUN_DEPENDS= ${LOCALBASE}/${SPEC_DIR}/net-ssh-1.1.2.gemspec:${PORTSDIR}/security/rubygem-net-ssh
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
-.include <bsd.port.post.mk>
+USE_RUBY= yes
+USE_RUBYGEMS= yes
+
+.include <bsd.port.mk>
diff --git a/security/rubygem-net-ssh/Makefile b/security/rubygem-net-ssh/Makefile
index 7efa8d4..ed4a9f1 100644
--- a/security/rubygem-net-ssh/Makefile
+++ b/security/rubygem-net-ssh/Makefile
@@ -21,6 +21,7 @@ OPTIONSFILE?= ${PORT_DBDIR}/rubygem-${PORTNAME}/options
# to get RUBY_SITEARCHLIBDIR
USE_RUBY= yes
+USE_RUBYGEMS= yes
.include <bsd.port.pre.mk>
@@ -28,5 +29,4 @@ USE_RUBY= yes
RUN_DEPENDS+= ${RUBY_SITEARCHLIBDIR}/termios.so:${PORTSDIR}/comms/ruby-termios
.endif
-.include "${PORTSDIR}/devel/ruby-gems/Makefile.common"
.include <bsd.port.post.mk>
OpenPOWER on IntegriCloud