[csw-devel] SF.net SVN: gar:[13520] csw/mgar/pkg/ruby18/trunk

[bdwalton at users.sourceforge.net]

Revision: 13520
          http://gar.svn.sourceforge.net/gar/?rev=13520&view=rev
Author:   bdwalton
Date:     2011-03-02 03:12:32 +0000 (Wed, 02 Mar 2011)

Log Message:
-----------
ruby18/trunk: patch a few more usr/local references (dln.c this time)

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

Added Paths:
-----------
    csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch

Modified: csw/mgar/pkg/ruby18/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-02 02:30:02 UTC (rev 13519)
+++ csw/mgar/pkg/ruby18/trunk/Makefile	2011-03-02 03:12:32 UTC (rev 13520)
@@ -88,6 +88,7 @@
 PATCHFILES = rdoc_parse_order_fix.patch
 PATCHFILES += 0002-Correct-potential-segfault-caused-during-garbage-col.patch
 PATCHFILES += 0003-Force-ld-to-embed-the-proper-SONAME-for-libruby.patch
+PATCHFILES += 0004-Patch-a-few-more-usr-local-references.patch
 
 CONFIGURE_ARGS  = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-pthread
@@ -130,7 +131,7 @@
 CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/lib/ruby/1.8/fileutils.rb
 CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/ruby.1
 CHECKPKG_OVERRIDES_CSWruby += file-with-bad-content|/usr/local|root/opt/csw/bin/ri
-CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content|/usr/local
+CHECKPKG_OVERRIDES_CSWrubydoc += file-with-bad-content
 
 include gar/category.mk
 

Added: csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch
===================================================================
--- csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch	                        (rev 0)
+++ csw/mgar/pkg/ruby18/trunk/files/0004-Patch-a-few-more-usr-local-references.patch	2011-03-02 03:12:32 UTC (rev 13520)
@@ -0,0 +1,40 @@
+From 02889f366c472ec30d6f19cfd882385fd936b734 Mon Sep 17 00:00:00 2001
+From: Ben Walton <bwalton at opencsw.org>
+Date: Wed, 2 Mar 2011 04:10:08 +0100
+Subject: [PATCH] Patch a few more usr/local references
+
+Set default DLN paths
+
+Signed-off-by: Ben Walton <bwalton at opencsw.org>
+---
+ dln.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dln.c b/dln.c
+index 93d912c..4711d4c 100644
+--- a/dln.c
++++ b/dln.c
+@@ -156,7 +156,7 @@ init_funcname_len(buf, file)
+ #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:."
+ #endif
+ 
+ #include <errno.h>
+@@ -1663,9 +1663,9 @@ dln_find_exe(fname, path)
+ 
+     if (!path) {
+ #if defined(MSDOS) || defined(_WIN32) || defined(__human68k__) || defined(__MACOS__)
+-	path = "/usr/local/bin;/usr/ucb;/usr/bin;/bin;.";
++	path = "/opt/csw/bin;/usr/ucb;/usr/bin;/bin;.";
+ #else
+-	path = "/usr/local/bin:/usr/ucb:/usr/bin:/bin:.";
++	path = "/opt/csw/bin:/usr/ucb:/usr/bin:/bin:.";
+ #endif
+     }
+     return dln_find_1(fname, path, 1);
+-- 
+1.7.3.2
+


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