SF.net SVN: gar:[24242] csw/mgar/pkg/ruby20/trunk

[tosmi at users.sourceforge.net]

Revision: 24242
          http://sourceforge.net/p/gar/code/24242
Author:   tosmi
Date:     2014-11-04 20:06:44 +0000 (Tue, 04 Nov 2014)
Log Message:
-----------
clean libruby package name, added csw patch to dln

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

Added Paths:
-----------
    csw/mgar/pkg/ruby20/trunk/files/0001-add-csw-paths-to-dln.c-and-dln_find.c.patch

Modified: csw/mgar/pkg/ruby20/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby20/trunk/Makefile	2014-11-04 19:33:43 UTC (rev 24241)
+++ csw/mgar/pkg/ruby20/trunk/Makefile	2014-11-04 20:06:44 UTC (rev 24242)
@@ -16,7 +16,7 @@
 MASTER_SITES = http://ftp.ruby-lang.org/pub/ruby/$(SHORTVER)/
 DISTFILES  = ruby-$(DISTVERSION)-$(PATCHLEVEL).tar.gz
 
-RUNTIME_DEP_PKGS_CSWruby20 = CSWlibruby20-2
+RUNTIME_DEP_PKGS_CSWruby20 = CSWlibruby2-0-0
 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibssl1-0-0
 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibffi5
 RUNTIME_DEP_PKGS_CSWruby20 += CSWlibtk8-5
@@ -31,11 +31,6 @@
 CHECKPKG_OVERRIDES_CSWruby20 += missing-dependency|CSWlibruby1-9-1-1|or|CSWruby|or|CSWruby18|or|CSWruby191
 
 CHECKPKG_OVERRIDES_CSWruby20 += file-with-bad-content|/usr/local|root/opt/csw/lib/libruby2.0.0.so.2
-CHECKPKG_OVERRIDES_CSWruby20 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.0.0.so
-CHECKPKG_OVERRIDES_CSWruby20 += shared-lib-pkgname-mismatch|file=opt/csw/lib/libruby2.0.0.so.2|soname=libruby2.0.0.so.2|pkgname=CSWruby20|expected=CSWlibruby2-0-0-2
-CHECKPKG_OVERRIDES_CSWruby20 += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libruby2.0.0.so
-CHECKPKG_OVERRIDES_CSWruby20 += missing-dependency|CSWlibgdbm4
-CHECKPKG_OVERRIDES_CSWruby20 += missing-dependency|CSWlibreadline6
 
 # these files include a reference to /usr/local in comments
 CHECKPKG_OVERRIDES_CSWruby20 += file-with-bad-content|/usr/share|root/opt/csw/lib/ruby/2.0.0/tk/dialog.rb
@@ -47,11 +42,13 @@
 
 BUILD_DEP_PKGS   = CSWlibssl-dev
 
-PACKAGES = CSWruby20 CSWruby20-dev CSWruby20-ri CSWlibruby20-2
+PACKAGES = CSWruby20 CSWruby20-dev CSWruby20-ri CSWlibruby2-0-0
 
-PKGFILES_CSWlibruby20-2 += /opt/csw/lib/libruby.*.so.2
-PKGFILES_CSWlibruby20-2 += /opt/csw/lib/libruby.*.so.2.*
+PATCHFILES += 0001-add-csw-paths-to-dln.c-and-dln_find.c.patch
 
+PKGFILES_CSWlibruby2-0-0 += /opt/csw/lib/libruby.*.so.2
+PKGFILES_CSWlibruby2-0-0 += /opt/csw/lib/libruby.*.so.2.*
+
 PKGFILES_CSWruby20-dev = $(includedir)/.* 
 PKGFILES_CSWruby20-ri  =  $(datadir)/ri/.* $(bindir)/ri$(API_SHORT)
 
@@ -71,6 +68,7 @@
 SPKG_DESC_CSWruby20 = $(DESCRIPTION)
 SPKG_DESC_CSWruby20-dev = Ruby 2.0 Extension Development Files
 SPKG_DESC_CSWruby20-ri = Documentation for Ruby 2.0
+SPKG_DESC_CSWlibruby2-0-0 = Ruby 2.0 Runtime Library
 
 ALTERNATIVES_CSWruby20 = ruby20
 ALTERNATIVE_ruby20  = $(bindir)/ruby ruby $(bindir)/ruby$(SHORTVER) 20 

Added: csw/mgar/pkg/ruby20/trunk/files/0001-add-csw-paths-to-dln.c-and-dln_find.c.patch
===================================================================
--- csw/mgar/pkg/ruby20/trunk/files/0001-add-csw-paths-to-dln.c-and-dln_find.c.patch	                        (rev 0)
+++ csw/mgar/pkg/ruby20/trunk/files/0001-add-csw-paths-to-dln.c-and-dln_find.c.patch	2014-11-04 20:06:44 UTC (rev 24242)
@@ -0,0 +1,39 @@
+From d272bb6dea02518e2da14619cb5df229dfac4706 Mon Sep 17 00:00:00 2001
+From: Toni Schmidbauer <toni at stderr.at>
+Date: Tue, 4 Nov 2014 21:01:35 +0100
+Subject: [PATCH] add csw paths to dln.c and dln_find.c
+
+---
+ dln.c      | 2 +-
+ dln_find.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dln.c b/dln.c
+index 9eb659c..4ab882f 100644
+--- a/dln.c
++++ b/dln.c
+@@ -157,7 +157,7 @@ static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX
+ #endif
+ 
+ #ifndef DLN_DEFAULT_LIB_PATH
+-#  define DLN_DEFAULT_LIB_PATH "/lib:/usr/lib:/usr/local/lib:."
++#  define DLN_DEFAULT_LIB_PATH "/lib:/usr/lib:/opt/csw/lib:/usr/local/lib:."
+ #endif
+ 
+ #include <errno.h>
+diff --git a/dln_find.c b/dln_find.c
+index 12f05fb..3e38e47 100644
+--- a/dln_find.c
++++ b/dln_find.c
+@@ -87,7 +87,7 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
+ #if defined(_WIN32)
+ 	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
+ #else
+-	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
++	path = "/opt/csw/bin:/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
+ #endif
+     }
+     buf = dln_find_1(fname, path, buf, size, 1);
+-- 
+2.0.3
+

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