[49828] trunk/dports/lang/ruby

kimuraw at macports.org kimuraw at macports.org
Sat Apr 18 10:27:48 PDT 2009


Revision: 49828
          http://trac.macports.org/changeset/49828
Author:   kimuraw at macports.org
Date:     2009-04-18 10:27:48 -0700 (Sat, 18 Apr 2009)
Log Message:
-----------
lang/ruby: ruby-1.8.7-p160_1
  - enable to install without autoconf
  - re-added +tk, +mactk variants

Modified Paths:
--------------
    trunk/dports/lang/ruby/Portfile
    trunk/dports/lang/ruby/files/patch-bug19050.diff
    trunk/dports/lang/ruby/files/patch-vendordir.diff

Modified: trunk/dports/lang/ruby/Portfile
===================================================================
--- trunk/dports/lang/ruby/Portfile	2009-04-18 17:27:01 UTC (rev 49827)
+++ trunk/dports/lang/ruby/Portfile	2009-04-18 17:27:48 UTC (rev 49828)
@@ -4,6 +4,7 @@
 
 name			ruby
 version			1.8.7-p160
+revision		1
 
 categories		lang ruby
 maintainers		kimuraw
@@ -26,8 +27,6 @@
 
 platforms		darwin
 
-depends_build	port:autoconf
-
 depends_lib		port:libiconv \
 				port:readline \
 				port:openssl \
@@ -46,15 +45,12 @@
 # http://chopine.be/lrz/ruby-osx-patches/ignore-gsetcontext.diff
 patchfiles-append patch-node.h.diff
 
-use_autoconf	yes
-autoconf.cmd	autoreconf
-autoconf.args	-fvi
-
 use_parallel_build		yes
 
 configure.args	--enable-shared \
 				--mandir="${prefix}/share/man" \
 				--enable-pthread \
+				--without-tk \
 				--with-vendordir=${prefix}/lib/ruby/vendor_ruby
 # ignore minor version for archdir, like i686-darwin9
 configure.env	UNAME_RELEASE=${os.major}
@@ -90,6 +86,17 @@
 	configure.args-delete	--enable-pthread
 }
 
+variant tk conflicts mactk description "enable tk support" {
+	configure.args-delete	--without-tk
+	configure.args-append	--with-tk
+	depends_lib-append		port:tcl port:tk
+}
+
+variant mactk conflicts tk description "enable MacTk (Tk.framework without X11) support" {
+	configure.args-delete	--without-tk
+	configure.args-append	--enable-tcltk-framework
+}
+
 variant thread_hooks description "apply Apple's thread_hooks patch" {
 	patchfiles-append		patch-thread-hooks.diff
 }

Modified: trunk/dports/lang/ruby/files/patch-bug19050.diff
===================================================================
--- trunk/dports/lang/ruby/files/patch-bug19050.diff	2009-04-18 17:27:01 UTC (rev 49827)
+++ trunk/dports/lang/ruby/files/patch-bug19050.diff	2009-04-18 17:27:48 UTC (rev 49828)
@@ -1,6 +1,6 @@
---- ../ruby-1.8.7-p160.org/configure.in	2009-01-19 18:25:38.000000000 +0900
-+++ ./configure.in	2009-04-18 00:13:45.000000000 +0900
-@@ -1213,7 +1213,7 @@
+--- configure.orig	2009-04-09 13:44:36.000000000 +0900
++++ configure	2009-04-19 01:54:14.000000000 +0900
+@@ -16760,7 +16760,7 @@
  	rhapsody*)	: ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
  			: ${LDFLAGS=""}
  			rb_cv_dlopen=yes ;;
@@ -9,7 +9,7 @@
  			: ${LDFLAGS=""}
  			: ${LIBPATHENV=DYLD_LIBRARY_PATH}
  			rb_cv_dlopen=yes ;;
-@@ -1526,7 +1526,7 @@
+@@ -17473,7 +17473,7 @@
  	;;
      darwin*)
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(MAJOR).$(MINOR).$(TEENY).dylib'

Modified: trunk/dports/lang/ruby/files/patch-vendordir.diff
===================================================================
--- trunk/dports/lang/ruby/files/patch-vendordir.diff	2009-04-18 17:27:01 UTC (rev 49827)
+++ trunk/dports/lang/ruby/files/patch-vendordir.diff	2009-04-18 17:27:48 UTC (rev 49828)
@@ -1,61 +1,12 @@
-diff -ur ../ruby-1.8.7-p160.org/Makefile.in ./Makefile.in
---- ../ruby-1.8.7-p160.org/Makefile.in	2008-05-31 23:57:11.000000000 +0900
-+++ ./Makefile.in	2009-04-17 23:20:20.000000000 +0900
-@@ -24,6 +24,8 @@
- arch = @arch@
- sitearch = @sitearch@
- sitedir = @sitedir@
-+vendorarch = @vendorarch@
-+vendordir = @vendordir@
- 
- TESTUI = console
- TESTS =
-diff -ur ../ruby-1.8.7-p160.org/configure.in ./configure.in
---- ../ruby-1.8.7-p160.org/configure.in	2009-01-19 18:25:38.000000000 +0900
-+++ ./configure.in	2009-04-17 23:24:01.000000000 +0900
-@@ -1753,6 +1753,7 @@
- AC_SUBST(arch)dnl
- AC_SUBST(sitearch)dnl
- AC_SUBST(sitedir)dnl
-+AC_SUBST(vendorarch)dnl
- AC_SUBST(vendordir)dnl
- 
- configure_args=$ac_configure_args
-@@ -1775,8 +1776,10 @@
- fi
- 
- case "$target_os" in
--  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt" ;;
--  *) sitearch="${arch}" ;;
-+  mingw*) sitearch="$target_cpu-$rb_cv_msvcrt"
-+  	  vendorarch="$target_cpu-$rb_cv_msvcrt" ;;
-+  *) sitearch="${arch}"
-+     vendorarch="${arch}" ;;
- esac
- 
- AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
-Only in .: configure.in.orig
-diff -ur ../ruby-1.8.7-p160.org/lib/mkmf.rb ./lib/mkmf.rb
---- ../ruby-1.8.7-p160.org/lib/mkmf.rb	2009-03-31 18:37:22.000000000 +0900
-+++ ./lib/mkmf.rb	2009-04-17 23:27:44.000000000 +0900
-@@ -1330,6 +1330,7 @@
- RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
- arch = #{CONFIG['arch']}
- sitearch = #{CONFIG['sitearch']}
-+vendorarch = #{CONFIG['vendorarch']}
- ruby_version = #{Config::CONFIG['ruby_version']}
- ruby = #{$ruby}
- RUBY = $(ruby#{sep})
 diff -ur ../ruby-1.8.7-p160.org/mkconfig.rb ./mkconfig.rb
 --- ../ruby-1.8.7-p160.org/mkconfig.rb	2008-06-06 19:39:57.000000000 +0900
-+++ ./mkconfig.rb	2009-04-17 23:28:08.000000000 +0900
-@@ -147,6 +147,13 @@
++++ ./mkconfig.rb	2009-04-19 01:21:16.000000000 +0900
+@@ -147,6 +147,12 @@
    CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
    CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
    CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(sitearch)"
 +  # macports -rvendor-specific support
 +  if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
-+    CONFIG["sitearch"] = CONFIG["vendorarch"]
 +    CONFIG["sitedir"] = CONFIG["vendordir"]
 +    CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
 +    CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090418/7557c821/attachment-0001.html>


More information about the macports-changes mailing list