Date: Mon, 24 Jun 2013 20:21:17 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321714 - in head/graphics/graphviz: . files Message-ID: <201306242021.r5OKLHcF023926@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Mon Jun 24 20:21:17 2013 New Revision: 321714 URL: http://svnweb.freebsd.org/changeset/ports/321714 Log: - fix build of option RUBY with ruby19 Added: head/graphics/graphviz/files/patch-config_ruby.rb (contents, props changed) Modified: head/graphics/graphviz/Makefile Modified: head/graphics/graphviz/Makefile ============================================================================== --- head/graphics/graphviz/Makefile Mon Jun 24 20:16:33 2013 (r321713) +++ head/graphics/graphviz/Makefile Mon Jun 24 20:21:17 2013 (r321714) @@ -431,8 +431,9 @@ post-patch: ${XARGS} ${REINPLACE_CMD} \ -e 's|libdir=@libdir@|libdir=@libdir@/@PACKAGE@|'; @${REINPLACE_CMD} -e "s|/usr/include/php|${LOCALBASE}/include/php|g" \ - -e "s|vendorarch|installsitearch|g" \ + -e "s|vendorarchdir|sitearchdir|g" \ -e "s|-lruby|-lruby${RUBY_SUFFIX}|g" \ + -e "s|Config::|RbConfig::|" \ -e '/if test/ s| == | = |g' ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|#include "gui.h"|#include "gui/gui.h"|' \ ${WRKSRC}/cmd/smyrna/tvnodes.h Added: head/graphics/graphviz/files/patch-config_ruby.rb ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/graphviz/files/patch-config_ruby.rb Mon Jun 24 20:21:17 2013 (r321714) @@ -0,0 +1,27 @@ +--- config/config_ruby.rb.orig 2013-02-14 14:27:39.000000000 +0100 ++++ config/config_ruby.rb 2013-06-24 18:34:23.000000000 +0200 +@@ -1,18 +1,18 @@ + require 'rbconfig' + +-CONFIG = Config::MAKEFILE_CONFIG ++CONFIG = RbConfig::MAKEFILE_CONFIG + + + case ARGV[0] + when "archdir" +- puts Config::expand(CONFIG["archdir"]) ++ puts RbConfig::expand(CONFIG["archdir"]) + when "lib" +- puts Config::expand(CONFIG["libdir"]) ++ puts RbConfig::expand(CONFIG["libdir"]) + when "vendorarchdir" +- puts Config::expand(CONFIG["vendorarchdir"]) ++ puts RbConfig::expand(CONFIG["vendorarchdir"]) + when "sitearchdir" +- puts Config::expand(CONFIG["sitearchdir"]) ++ puts RbConfig::expand(CONFIG["sitearchdir"]) + when "sitelib" +- puts Config::expand(CONFIG["sitedir"]) ++ puts RbConfig::expand(CONFIG["sitedir"]) + end +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306242021.r5OKLHcF023926>