Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Feb 2005 15:52:30 +0300 (MSK)
From:      Alexander Novitsky <alecn2002@yandex.ru>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        alecn2002@yandex.ru
Subject:   ports/77924: [MAINTAINER-UPDATE] devel/ruby18-freeride: update to 0.9.3
Message-ID:  <200502221252.j1MCqUSD046205@server.v42of.icc-vvd.ru>
Resent-Message-ID: <200502221300.j1MD0ZCc078578@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         77924
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] devel/ruby18-freeride: update to 0.9.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 22 13:00:35 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Novitsky
>Release:        FreeBSD 5.2-RELEASE i386
>Organization:
Inzhcomcentre VVD
>Environment:
System: FreeBSD server.v42of.icc-vvd.ru 5.2-RELEASE FreeBSD 5.2-RELEASE #2: Mon Jul 12 21:45:44 MSD 2004
>Description:
- Update to 0.9.3

Port maintainer (alecn2002@yandex.ru) is cc'd.

Please delete PR ports/77866 - it doesn't work with included RRB;
please also take a look at PR ports/77923

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- ruby18-freeride-0.9.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/freeride.orig/Makefile /usr/ports/devel/freeride/Makefile
--- /usr/ports/devel/freeride.orig/Makefile	Mon Feb 21 18:46:43 2005
+++ /usr/ports/devel/freeride/Makefile	Tue Feb 22 15:48:27 2005
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	freeride
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.3
 CATEGORIES=	devel ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/2185/
+MASTER_SITES=	http://rubyforge.org/frs/download.php/3148/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DIST_SUBDIR=	ruby
 
@@ -16,7 +16,8 @@
 COMMENT=	Ruby Integrated Developement Environment written in Ruby
 
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/fox12.so:${PORTSDIR}/x11-toolkits/ruby-fox-devel \
-		${RUBY_SITELIBDIR}/freebase/freebase.rb:${PORTSDIR}/devel/freebase
+		${RUBY_SITELIBDIR}/freebase/freebase.rb:${PORTSDIR}/devel/freebase \
+		${LOCALBASE}/bin/rrb:${PORTSDIR}/devel/ruby-rrb
 
 USE_RUBY=	yes
 NO_BUILD=	yes
@@ -25,7 +26,7 @@
 	${CP} ${FILESDIR}/install.rb ${WRKSRC}/
 
 do-install:
-	cd ${WRKSRC}; ${RUBY} install.rb
+	cd ${WRKSRC}; ${RUBY} install.rb --prefix=${PREFIX}
 
 post-install:
 	${INSTALL_SCRIPT} ${FILESDIR}/freeride ${PREFIX}/bin
diff -ruN --exclude=CVS /usr/ports/devel/freeride.orig/distinfo /usr/ports/devel/freeride/distinfo
--- /usr/ports/devel/freeride.orig/distinfo	Mon Feb 21 18:46:43 2005
+++ /usr/ports/devel/freeride/distinfo	Mon Feb 21 18:51:25 2005
@@ -1,2 +1,2 @@
-MD5 (ruby/freeride-0.9.2.tar.gz) = 04a9802f712074085349eac6d0d1483d
-SIZE (ruby/freeride-0.9.2.tar.gz) = 496043
+MD5 (ruby/freeride-0.9.3.tar.gz) = 3377004028f027454af4d4de0a7c9e1f
+SIZE (ruby/freeride-0.9.3.tar.gz) = 501458
diff -ruN --exclude=CVS /usr/ports/devel/freeride.orig/files/install.rb /usr/ports/devel/freeride/files/install.rb
--- /usr/ports/devel/freeride.orig/files/install.rb	Mon Feb 21 18:46:43 2005
+++ /usr/ports/devel/freeride/files/install.rb	Tue Feb 22 15:41:08 2005
@@ -1,21 +1,51 @@
 require 'rbconfig'
 require 'find'
 require 'ftools'
+require 'getoptlong'
+
+def usage( exit_code = 1 )
+	printf "Usage: #{ARGV[0]} [--prefix <PATH>] [--no-harm]\n"
+	exit( exit_code )
+end
 
 Dir.chdir ".." if Dir.pwd =~ /bin.?$/
 
+opts = GetoptLong.new( 
+	["--prefix", "-p", GetoptLong::REQUIRED_ARGUMENT ],
+	["--no-harm", "-n", GetoptLong::NO_ARGUMENT ]
+)
+$my_prefix = nil
+no_harm = false
+opts.each { |opt, arg|
+	case opt
+	when "--prefix"
+		$my_prefix = arg
+	when "--no-harm"
+		no_harm = true
+	else
+		usage()
+	end
+}
+
+def prefixize( str )
+	$my_prefix ?
+		str.gsub( Regexp::compile( "^#{Regexp::escape($prefix)}" ), $my_prefix ) :
+		str
+end
+
 include Config
 
 FREERIDE = "freeride"
-$srcdir = CONFIG["srcdir"]
+$prefix = CONFIG["prefix"]
+$srcdir = prefixize( CONFIG["srcdir"] )
 $version = CONFIG["MAJOR"]+"."+CONFIG["MINOR"]
-$libdir = File.join(CONFIG["libdir"], "ruby", $version)
-$archdir = File.join($libdir, CONFIG["arch"])
-$site_libdir = CONFIG["sitelibdir"]
-
-$libdir = ["config", "plugins", "redist"]
-$libdir_excl = [ /i[36]86-mswin32/ ]
-$libdir_subst = [ [/i686-linux/, CONFIG["arch"] ] ]
+$libdir = prefixize( CONFIG["rubylibdir"] )
+$archdir = prefixize( CONFIG["archdir"] )
+$site_libdir = prefixize( CONFIG["sitelibdir"] )
+
+$libdir_list = ["config", "plugins", "redist"]
+$libdir_excl = [ /i[36]86-mswin32/, /i[36]86-linux/ ]
+$libdir_subst = [ ]
 
 class Array
   def contains?
@@ -72,7 +102,7 @@
 end
 
 def install_rb(noharm = false, srcdir = nil)
-  libdir = $libdir
+  libdir = $libdir_list
   libdir_excl = $libdir_excl
   libdir.collect! { |ld|
     File.join(srcdir, ld)
@@ -99,8 +129,6 @@
   $stdout.flush
 end
 
-no_harm = (ARGV.include_like?(/\A^-[a-zA-Z0-9]*n/) or ARGV.include?("--no-harm"))
 $stderr << "No-harm install\n" if no_harm
 $stderr.flush
 install_rb( no_harm )
-
diff -ruN --exclude=CVS /usr/ports/devel/freeride.orig/pkg-plist /usr/ports/devel/freeride/pkg-plist
--- /usr/ports/devel/freeride.orig/pkg-plist	Mon Feb 21 18:46:43 2005
+++ /usr/ports/devel/freeride/pkg-plist	Mon Feb 21 19:06:48 2005
@@ -123,6 +123,10 @@
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_fox_gui/fxscintilla/colour.rb
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_fox_gui/fxscintilla/util/iface_gen.rb
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_fox_gui/fxscintilla/util/Scintilla.iface
+%%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb/icons/irb.png
+%%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb/plugin.yaml
+%%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb/fxirb.rb
+%%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb/fox_irb.rb
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_commands/plugin.yaml
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_commands/key_manager.rb
 %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_commands/core_commands.rb
@@ -193,6 +197,8 @@
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_script_runner
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_file_browser/icons
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_file_browser
+@dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb/icons
+@dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_irb
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_debugger/icons
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_debugger
 @dirrm %%RUBY_SITELIBDIR%%/freeride/plugins/rubyide_tools_fox_databus_inspector
--- ruby18-freeride-0.9.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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