From owner-svn-ports-head@FreeBSD.ORG Tue Feb 18 15:37:31 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B6682EFF; Tue, 18 Feb 2014 15:37:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8760F1320; Tue, 18 Feb 2014 15:37:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1IFbVSt013791; Tue, 18 Feb 2014 15:37:31 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1IFbV14013790; Tue, 18 Feb 2014 15:37:31 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201402181537.s1IFbV14013790@svn.freebsd.org> From: Steve Wills Date: Tue, 18 Feb 2014 15:37:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344910 - head/lang/ruby20/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Feb 2014 15:37:31 -0000 Author: swills Date: Tue Feb 18 15:37:31 2014 New Revision: 344910 URL: http://svnweb.freebsd.org/changeset/ports/344910 QAT: https://qat.redports.org/buildarchive/r344910/ Log: - Correct mistake I made in the configure.in patch. No PORTREVISION bump since this should have no impact on generated binaries. Modified: head/lang/ruby20/files/patch-configure.in Modified: head/lang/ruby20/files/patch-configure.in ============================================================================== --- head/lang/ruby20/files/patch-configure.in Tue Feb 18 15:35:42 2014 (r344909) +++ head/lang/ruby20/files/patch-configure.in Tue Feb 18 15:37:31 2014 (r344910) @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-05-27 03:48:52.340695232 +0000 -+++ configure.in 2013-05-27 03:49:12.060695078 +0000 -@@ -1380,11 +1380,11 @@ +--- configure.in.orig 2014-02-17 23:37:01.241643774 +0000 ++++ configure.in 2014-02-17 23:38:03.349639470 +0000 +@@ -1386,11 +1386,11 @@ AC_CHECK_DECLS([sys_nerr], [], [], [$ac_includes_default @%:@include ]) @@ -10,14 +10,14 @@ -AC_CHECK_LIB(socket, socketpair) # SunOS/Solaris -AC_CHECK_LIB(rt, clock_gettime) # GNU/Linux +AC_SEARCH_LIBS(crypt, crypt) -+AC_SEARCH_LIBS(dl, dlopen) # Dynamic linking for SunOS/Solaris and SYSV -+AC_SEARCH_LIBS(dld, shl_load) # Dynamic linking for HP-UX -+AC_SEARCH_LIBS(socket, socketpair) # SunOS/Solaris -+AC_SEARCH_LIBS(rt, clock_gettime) # GNU/Linux ++AC_SEARCH_LIBS(dlopen, dl) # Dynamic linking for SunOS/Solaris and SYSV ++AC_SEARCH_LIBS(shl_load, dld) # Dynamic linking for HP-UX ++AC_SEARCH_LIBS(socketpair, socket) # SunOS/Solaris ++AC_SEARCH_LIBS(clock_gettime, rt) # GNU/Linux AS_CASE(["$target_cpu"], [alpha*|sh4|sh4el|sh4eb], [AS_CASE(["$target_os"::"$GCC"], -@@ -2074,7 +2074,7 @@ +@@ -2081,7 +2081,7 @@ fi if test x"$enable_pthread" = xyes; then @@ -26,7 +26,7 @@ AC_CHECK_LIB($pthread_lib, pthread_kill, rb_with_pthread=yes, rb_with_pthread=no) if test "$rb_with_pthread" = "yes"; then break; fi -@@ -2082,6 +2082,7 @@ +@@ -2089,6 +2089,7 @@ if test x"$rb_with_pthread" = xyes; then AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) @@ -34,7 +34,7 @@ AC_DEFINE(HAVE_LIBPTHREAD) AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include ]) AS_CASE([$pthread_lib], -@@ -2319,7 +2320,6 @@ +@@ -2326,7 +2327,6 @@ : ${LDSHARED='$(CC) -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -rdynamic" @@ -42,7 +42,7 @@ else test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable' fi -@@ -2703,6 +2703,7 @@ +@@ -2713,6 +2713,7 @@ [freebsd*|dragonfly*], [ SOLIBS='$(LIBS)' LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)'