From owner-svn-ports-head@FreeBSD.ORG Sun Jul 20 20:42:24 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 CD3ED617; Sun, 20 Jul 2014 20:42:24 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A0A9329F6; Sun, 20 Jul 2014 20:42:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6KKgOj0063282; Sun, 20 Jul 2014 20:42:24 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6KKgOgF063280; Sun, 20 Jul 2014 20:42:24 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407202042.s6KKgOgF063280@svn.freebsd.org> From: John Marino Date: Sun, 20 Jul 2014 20:42:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362369 - in head/databases/galera: . 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.18 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: Sun, 20 Jul 2014 20:42:24 -0000 Author: marino Date: Sun Jul 20 20:42:23 2014 New Revision: 362369 URL: http://svnweb.freebsd.org/changeset/ports/362369 QAT: https://qat.redports.org/buildarchive/r362369/ Log: databases/galera: change USE_PYTHON to USE_PYTHON_BUILD Also adjust RUN_DEPENDS and BUILD_DEPENDS and fix LD_LIBRARY_PATH PR: 190364 Submitted by: maintainer (Horia Racoviceanu) Modified: head/databases/galera/Makefile head/databases/galera/files/garb.in Modified: head/databases/galera/Makefile ============================================================================== --- head/databases/galera/Makefile Sun Jul 20 20:18:49 2014 (r362368) +++ head/databases/galera/Makefile Sun Jul 20 20:42:23 2014 (r362369) @@ -4,6 +4,7 @@ PORTNAME= galera PORTVERSION= 25.3.5 DISTVERSIONSUFFIX= -src +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= https://launchpadlibrarian.net/170877450/ @@ -23,7 +24,7 @@ USES= scons shebangfix USE_CXXSTD= c++11 USE_LDCONFIG= yes USE_OPENSSL= yes -USE_PYTHON= yes +USE_PYTHON_BUILD= yes MAKE_CMD= ${SCONS} -j${MAKE_JOBS_NUMBER} --config=force @@ -70,9 +71,11 @@ GARB_USE= RC_SUBR=garb .if ${OSVERSION} > 1000000 BUILD_DEPENDS+= asio>=0:${PORTSDIR}/net/asio -RUN_DEPENDS:= ${BUILD_DEPENDS} +RUN_DEPENDS+= asio>=0:${PORTSDIR}/net/asio +SUB_LIST= LD_LIBRARY_PATH=$$LD_LIBRARY_PATH .else USE_GCC= yes +SUB_LIST= LD_LIBRARY_PATH=${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH .endif .if ${OSVERSION} < 900506 @@ -91,10 +94,6 @@ MAKE_CMD+= bpostatic=${PREFIX}/lib/libbo MAKE_CMD+= debug=3 .endif -.if ${PORT_OPTIONS:MGARB} -SUB_LIST= LD_LIBRARY_PATH=${LOCALBASE}/lib/${CC}:$$LD_LIBRARY_PATH -.endif - post-patch: @${REINPLACE_CMD} -e '/-Werror/d' ${WRKSRC}/SConstruct Modified: head/databases/galera/files/garb.in ============================================================================== --- head/databases/galera/files/garb.in Sun Jul 20 20:18:49 2014 (r362368) +++ head/databases/galera/files/garb.in Sun Jul 20 20:42:23 2014 (r362369) @@ -45,7 +45,7 @@ command_args="-c -f -u nobody -p $garb_p start_precmd="${name}_prestart" start_postcmd="${name}_poststart" stop_precmd="${name}_prestop" -export %%LD_LIBRARY_PATH%% +export LD_LIBRARY_PATH=%%LD_LIBRARY_PATH%% garb_prestart() {