SF.net SVN: gar:[23461] csw/mgar/pkg/ruby18/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23461
          http://sourceforge.net/p/gar/code/23461
Author:   dmichelsen
Date:     2014-04-22 08:57:37 +0000 (Tue, 22 Apr 2014)
Log Message:
-----------
ruby18/trunk: Reenable RubyTk by reverting r22977 and r22978

Revision Links:
--------------
    http://sourceforge.net/p/gar/code/22977
    http://sourceforge.net/p/gar/code/22978

Modified Paths:
--------------
    csw/mgar/pkg/ruby18/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2014-04-22 07:47:21 UTC (rev 23460)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2014-04-22 08:57:37 UTC (rev 23461)
@@ -9,11 +9,11 @@
 TEST_SCRIPTS =
 TEST_ARGS = test-all
 
-BUILD_DEP_PKGS =  CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev
+BUILD_DEP_PKGS =  CSWbdb48devel CSWlibgdbm-dev CSWcoreutils CSWlibiconv-dev
 BUILD_DEP_PKGS += CSWlibreadline-dev CSWlibz-dev CSWlibssl-dev
 BUILD_DEP_PKGS += CSWlibncurses-dev
 
-PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-dev CSWruby18-mode
+PACKAGES = CSWruby18 CSWruby18-doc CSWruby18-tk CSWruby18-dev CSWruby18-mode
 PACKAGES += CSWruby18-mode-el CSWlibruby18-1 CSWruby18-gcc4
 
 EXTRA_MODULATORS = COMPILER
@@ -23,6 +23,7 @@
 
 OBSOLETED_BY_CSWruby18 = CSWruby
 OBSOLETED_BY_CSWruby18-doc = CSWrubydoc
+OBSOLETED_BY_CSWruby18-tk = CSWrubytk
 OBSOLETED_BY_CSWruby18-dev = CSWrubydev
 OBSOLETED_BY_CSWruby18-mode = CSWrubymode
 OBSOLETED_BY_CSWruby18-mode-el = CSWrubymodeel
@@ -40,7 +41,7 @@
 
 LICENSE = COPYING
 
-RUNTIME_DEP_PKGS_CSWruby18 = CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1
+RUNTIME_DEP_PKGS_CSWruby18 = CSWbdb48 CSWlibgdbm4 CSWlibiconv2 CSWlibruby18-1
 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibncurses5 CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWruby18 += CSWlibreadline6 CSWlibz1
 
@@ -48,11 +49,13 @@
 
 RUNTIME_DEP_PKGS_CSWruby18-doc = CSWruby18
 
+RUNTIME_DEP_PKGS_CSWruby18-tk = CSWruby18 CSWtk CSWtcl CSWlibruby18-1
+
 RUNTIME_DEP_PKGS_CSWruby18-dev = CSWruby18 CSWlibruby18-1 CSWcoreutils
 
-RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacs-common
+RUNTIME_DEP_PKGS_CSWruby18-mode = CSWemacscommon
 
-RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacs-common
+RUNTIME_DEP_PKGS_CSWruby18-mode-el = CSWemacscommon
 
 DESCRIPTION = An object-oriented language for quick and easy programming.
 define BLURB
@@ -73,6 +76,8 @@
 
 SPKG_DESC_CSWruby18-doc = Documentation for Ruby 1.8
 
+SPKG_DESC_CSWruby18-tk = Ruby 1.8 Tcl/TK Extension
+
 SPKG_DESC_CSWruby18-dev = Ruby 1.8 Extension Development Files
 
 SPKG_DESC_CSWruby18-mode = Ruby 1.8 major mode for Emacs
@@ -83,6 +88,8 @@
 
 PKGFILES_CSWruby18-gcc4 = $(libdir)/ruby/1.8/$(GARCH)-solaris2.10/.*gcc4
 
+PKGFILES_CSWruby18-tk = $(libdir)/.*/tcl.* $(libdir)/.*/tk.* $(libdir)/.*-tk.rb
+
 PKGFILES_CSWruby18-dev = $(libdir)/.*\.h $(libdir)/.*/mkmf.rb $(libdir)/.*static.a
 PKGFILES_CSWruby18-dev += /opt/csw/lib/libruby.*.so
 
@@ -90,8 +97,6 @@
 
 PKGFILES_CSWruby18-mode-el = $(datadir)/emacs/site-lisp/.*el$
 
-EXTRA_PKGFILES_EXCLUDED_CSWruby18 += $(libdir)/ruby/1.8/test/unit/ui/tk/.*
-
 PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1
 PKGFILES_CSWlibruby18-1 += /opt/csw/lib/libruby.*.so.1.*
 
@@ -104,7 +109,7 @@
 
 DISTFILES  = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.bz2
 DISTFILES += CSWruby.cswreleasenotes
-DISTFILES += CSWrubydoc.cswreleasenotes
+DISTFILES += CSWrubydoc.cswreleasenotes CSWrubytk.cswreleasenotes
 
 # See: http://rubyforge.org/tracker/index.php?func=detail&aid=17607&group_id=426&atid=1698
 PATCHFILES = rdoc_parse_order_fix.patch
@@ -116,6 +121,8 @@
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-shared
 CONFIGURE_ARGS += --program-suffix=18
+# Needed for conformity with Tk
+CONFIGURE_ARGS += --enable-pthread
 EXTRA_CONFIGURE_ARGS_isa-default-compiler-sun = --enable-install-doc
 
 INSTALL_ARGS = install
@@ -180,7 +187,7 @@
 	@echo "Copying in sample code..."
 	@mkdir -p $(PKGROOT)$(docdir)/ruby18/
 	@cp -R $(WORKSRC_FIRSTMOD)/sample $(PKGROOT)$(docdir)/ruby18/
-	@for ext in bigdecimal dl; do \
+	@for ext in bigdecimal dl tk ; do \
 		cp -R $(WORKSRC_FIRSTMOD)/ext/$$ext/sample \
 			$(PKGROOT)$(docdir)/ruby18/sample/$$ext ; \
 	done

Copied: csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes (from rev 19644, csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes)
===================================================================
--- csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes	                        (rev 0)
+++ csw/mgar/pkg/ruby18/trunk/files/CSWrubytk.cswreleasenotes	2014-04-22 08:57:37 UTC (rev 23461)
@@ -0,0 +1,2 @@
+* /usr/share reference in dialog.rb is in a comment
+* /usr/local references are both in comments

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.