svn commit: r362369 - in head/databases/galera: . files

[John Marino]

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()
 {