Author: ranger
Date: Tue Sep 4 16:10:41 2007
New Revision: 941
URL:
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=941&repname=user%3a+ranger
Log:
fix from jfm, upped to new version, future-proofed against other ruby versions
Modified:
trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.info
trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.patch
Modified:
trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.info
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.info&rev=941&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.info
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.info Tue
Sep 4 16:10:41 2007
@@ -1,9 +1,9 @@
Info2: <<
Package: rubycocoa-rb%type_pkg[ruby]
-Version: 0.11.1
+Version: 0.12.0
Revision: 1
Type: ruby (1.8)
-Description: Ruby interface to Cocoa programming.
+Description: Ruby interface to Cocoa programming
Distribution: 10.4, 10.5
License: LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
@@ -12,13 +12,17 @@
BuildDepends: ruby%type_pkg[ruby]-dev
Source: mirror:sourceforge:rubycocoa/RubyCocoa-%v.tgz
-Source-MD5: a8d1518c337efec7e6e0ca2d801fb0df
-PatchScript: sed -e 's,@FINKPREFIX@,%p,g' %a/rubycocoa-rb.patch | patch -p1
+Source-MD5: e37a41cd9aad2129bad644e4c4de4b7d
+PatchScript: <<
+ sed -e 's,@FINKPREFIX@,%p,g' %a/rubycocoa-rb.patch | patch -p1
+ sed -i -e '/print0/s, rm", rm -f",' pre-install.rb
+ find . -type d -name .svn -exec rm -rf {} \; || :
+<<
CompileScript: <<
#!/bin/sh -ev
- ruby%type_raw[ruby] install.rb config --install-prefix="%i"
--install-root="%d" --frameworks=%p/lib/Frameworks
--xcode-extras="%p/share/doc/%N/XCode Extras"
--examples="%p/share/doc/%N/Examples"
--documentation="%p/share/doc/%N/Documentation"
+ ruby%type_raw[ruby] install.rb config --build-universal=no
--install-prefix="%i" --install-root="%d" --frameworks=%p/lib/Frameworks
--xcode-extras="%p/share/doc/%N/XCode Extras"
--examples="%p/share/doc/%N/Examples"
--documentation="%p/share/doc/%N/Documentation"
ruby%type_raw[ruby] install.rb setup
<<
# Install Phase:
@@ -27,6 +31,25 @@
# install
ruby%type_raw[ruby] install.rb install
+
+ mv %i/lib/Frameworks/RubyCocoa.framework/Versions/A
%i/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]
+ rm -f %i/lib/Frameworks/RubyCocoa.framework/Versions/Current
+
+ install_name_tool -id
"%p/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]/RubyCocoa" \
+
"%i/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]/RubyCocoa"
+ install_name_tool -change
"@executable_path/../Frameworks/RubyCocoa.framework/Versions/A/RubyCocoa" \
+
"%p/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]/RubyCocoa" \
+ %i/lib/ruby/site_ruby/1.8/*/rubycocoa.bundle
+<<
+
+PostInstScript: <<
+ %p/sbin/update-alternatives --install
"%p/lib/Frameworks/RubyCocoa.framework/Versions/Current" \
+ RubyCocoa-framework-version \
+
"%p/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]" %type_pkg[ruby]
+<<
+PreRmScript: <<
+ %p/sbin/update-alternatives --remove RubyCocoa-framework-version \
+ "%p/lib/Frameworks/RubyCocoa.framework/Versions/%type_raw[ruby]"
<<
DocFiles: ChangeLog LGPL ReadMe* VERSION doc/*
Modified:
trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.patch
URL:
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.patch&rev=941&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.patch
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/rubycocoa-rb.patch
Tue Sep 4 16:10:41 2007
@@ -1,6 +1,6 @@
-diff -uNr RubyCocoa-0.11.1/framework/src/ruby/osx/objc/oc_import.rb
RubyCocoa-0.11.1-new/framework/src/ruby/osx/objc/oc_import.rb
---- RubyCocoa-0.11.1/framework/src/ruby/osx/objc/oc_import.rb 2007-06-04
15:57:00.000000000 -0400
-+++ RubyCocoa-0.11.1-new/framework/src/ruby/osx/objc/oc_import.rb
2007-07-14 10:38:15.000000000 -0400
+diff -uNr RubyCocoa-0.12.0/framework/src/ruby/osx/objc/oc_import.rb
RubyCocoa-0.12.0-new/framework/src/ruby/osx/objc/oc_import.rb
+--- RubyCocoa-0.12.0/framework/src/ruby/osx/objc/oc_import.rb 2007-08-14
11:32:00.000000000 -0400
++++ RubyCocoa-0.12.0-new/framework/src/ruby/osx/objc/oc_import.rb
2007-09-04 09:13:23.000000000 -0400
@@ -10,11 +10,13 @@
module OSX
@@ -15,9 +15,9 @@
'/System/Library/BridgeSupport',
'/Library/BridgeSupport'
]
-diff -uNr RubyCocoa-0.11.1/misc/libffi/Makefile.rubycocoa
RubyCocoa-0.11.1-new/misc/libffi/Makefile.rubycocoa
---- RubyCocoa-0.11.1/misc/libffi/Makefile.rubycocoa 2007-06-04
15:57:00.000000000 -0400
-+++ RubyCocoa-0.11.1-new/misc/libffi/Makefile.rubycocoa 2007-07-14
10:38:46.000000000 -0400
+diff -uNr RubyCocoa-0.12.0/misc/libffi/Makefile.rubycocoa
RubyCocoa-0.12.0-new/misc/libffi/Makefile.rubycocoa
+--- RubyCocoa-0.12.0/misc/libffi/Makefile.rubycocoa 2007-08-14
11:31:55.000000000 -0400
++++ RubyCocoa-0.12.0-new/misc/libffi/Makefile.rubycocoa 2007-09-04
09:13:23.000000000 -0400
@@ -2,7 +2,7 @@
LIB = libffi.a
@@ -27,10 +27,10 @@
all: $(LIB)
-diff -uNr RubyCocoa-0.11.1/pre-config.rb RubyCocoa-0.11.1-new/pre-config.rb
---- RubyCocoa-0.11.1/pre-config.rb 2007-06-04 15:57:03.000000000 -0400
-+++ RubyCocoa-0.11.1-new/pre-config.rb 2007-07-14 10:38:15.000000000 -0400
-@@ -30,24 +30,9 @@
+diff -uNr RubyCocoa-0.12.0/pre-config.rb RubyCocoa-0.12.0-new/pre-config.rb
+--- RubyCocoa-0.12.0/pre-config.rb 2007-08-14 11:32:26.000000000 -0400
++++ RubyCocoa-0.12.0-new/pre-config.rb 2007-09-04 09:13:52.000000000 -0400
+@@ -32,7 +32,7 @@
# build options
cflags = '-fno-common -g -fobjc-exceptions'
@@ -38,21 +38,4 @@
+ldflags = '-undefined dynamic_lookup'
sdkroot = ''
--if @config['build-universal'] == 'yes'
-- cflags << ' -arch ppc -arch i386'
-- ldflags << ' -arch ppc -arch i386'
--
-- sdkroot = '/Developer/SDKs/MacOSX10.4u.sdk'
-- cflags << ' -isysroot ' << sdkroot
-- ldflags << ' -Wl,-syslibroot,' << sdkroot
--
-- # validation
-- raise "ERROR: SDK \"#{sdkroot}\" does not exist." unless
File.exist?(sdkroot)
-- #libruby_sdk = File.join(sdkroot, @config['libruby-path'])
-- libruby_sdk = @config['libruby-path']
-- raise "ERROR: library \"#{libruby_sdk}\" does not exists." unless
File.exist?(libruby_sdk)
--end
--
- if File.exist?('/usr/include/libxml2') and
File.exist?('/usr/lib/libxml2.dylib')
- cflags << ' -I/usr/include/libxml2 -DHAS_LIBXML2 '
- ldflags << ' -lxml2 '
+ if @config['build-universal'] == 'yes'
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
