From owner-svn-ports-all@FreeBSD.ORG Tue Mar 25 14:55:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97FE2E55; Tue, 25 Mar 2014 14:55:40 +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 6D1B479C; Tue, 25 Mar 2014 14:55:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PEtet7039737; Tue, 25 Mar 2014 14:55:40 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PEteoS039736; Tue, 25 Mar 2014 14:55:40 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201403251455.s2PEteoS039736@svn.freebsd.org> From: Hajimu UMEMOTO Date: Tue, 25 Mar 2014 14:55:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349149 - head/security/cyrus-sasl2/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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Mar 2014 14:55:40 -0000 Author: ume Date: Tue Mar 25 14:55:39 2014 New Revision: 349149 URL: http://svnweb.freebsd.org/changeset/ports/349149 QAT: https://qat.redports.org/buildarchive/r349149/ Log: Fix build with enabling SQLITE on recent 10-STABLE and later. Spotted by: Marc Fournier Modified: head/security/cyrus-sasl2/files/patch-configure Modified: head/security/cyrus-sasl2/files/patch-configure ============================================================================== --- head/security/cyrus-sasl2/files/patch-configure Tue Mar 25 14:41:18 2014 (r349148) +++ head/security/cyrus-sasl2/files/patch-configure Tue Mar 25 14:55:39 2014 (r349149) @@ -1,7 +1,7 @@ Index: configure diff -u configure.orig configure --- configure.orig 2012-11-07 04:21:37.000000000 +0900 -+++ configure 2013-01-06 17:10:15.920678021 +0900 ++++ configure 2014-03-25 18:24:59.021374856 +0900 @@ -2365,6 +2365,7 @@ fi { $as_echo "$as_me:$LINENO: result: yes" >&5 @@ -70,3 +70,27 @@ diff -u configure.orig configure cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF +@@ -14591,9 +14597,9 @@ + $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;; + *) + if test -d ${with_sqlite}/lib; then +- LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib" ++ LIB_SQLITE="-L${with_sqlite}/lib $andrew_cv_runpath_switch${with_sqlite}/lib" + else +- LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}" ++ LIB_SQLITE="-L${with_sqlite} $andrew_cv_runpath_switch${with_sqlite}" + fi + + LIB_SQLITE_DIR=$LIB_SQLITE +@@ -14721,9 +14727,9 @@ + $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;; + *) + if test -d ${with_sqlite3}/lib; then +- LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib" ++ LIB_SQLITE3="-L${with_sqlite3}/lib $andrew_cv_runpath_switch${with_sqlite3}/lib" + else +- LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}" ++ LIB_SQLITE3="-L${with_sqlite3} $andrew_cv_runpath_switch${with_sqlite3}" + fi + + LIB_SQLITE3_DIR=$LIB_SQLITE3