svn commit: r366225 - in head/databases/mysql-workbench52: . files

[Adam Weinberger]

Author: adamw
Date: Tue Aug 26 16:51:36 2014
New Revision: 366225
URL: http://svnweb.freebsd.org/changeset/ports/366225
QAT: https://qat.redports.org/buildarchive/r366225/

Log:
  Allow the build to get much farther before it fails. Now it fails on
  boost-related stuff.

Added:
  head/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp   (contents, props changed)
Modified:
  head/databases/mysql-workbench52/Makefile

Modified: head/databases/mysql-workbench52/Makefile
==============================================================================
--- head/databases/mysql-workbench52/Makefile	Tue Aug 26 16:50:55 2014	(r366224)
+++ head/databases/mysql-workbench52/Makefile	Tue Aug 26 16:51:36 2014	(r366225)
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	PYTHON_UTILS UNIXODBC
 PYTHON_UTILS_DESC=	Python scripts useful for administering MySQL
 
 USES=		desktop-file-utils gettext gmake libtool lua:51 pathfix pkgconfig \
-		shebangfix shared-mime-info
+		shebangfix shared-mime-info python:2 compiler:gcc-c++11-lib
 SHEBANG_FILES=	ext/ctemplate/ctemplate-src/src/htmlparser/*.py \
 		ext/mysql-utilities/*.py \
 		ext/mysql-utilities/scripts/*.py \
@@ -49,12 +49,12 @@ SHEBANG_FILES=	ext/ctemplate/ctemplate-s
 USE_GCC=	any
 USE_GL=		gl
 USE_GNOME=	gnomehier gtk20 libxml2
-USE_PYTHON=	2
 USE_MYSQL=	client
 USE_SQLITE=	3
 USE_AUTOTOOLS=	libtoolize aclocal automake autoheader autoconf
 LIBTOOLIZE_ARGS=--copy --force
 AUTOMAKE_ARGS=	--add-missing --copy --force-missing --foreign
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LUA_CFLAGS="$$(pkg-config --cflags lua-${LUA_VER})" \
 		LUA_LIBS="$$(pkg-config --libs lua-${LUA_VER})" \
 		TINYXML_CFLAGS="-I${LOCALBASE}/include" \
@@ -115,8 +115,7 @@ post-install:
 		-d ${PREFIX} -f ${i})
 .endfor
 .if ${PORT_OPTIONS:MPYTHON_UTILS}
-	(cd ${WRKSRC}/ext && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} install-utils install-connector)
+	${DO_MAKE_BUILD} -C ${WRKSRC}/ext install-utils install-connector
 	@(cd ${STAGEDIR}/${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PREFIX} -f share/mysql-workbench/python)
 .endif

Added: head/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/mysql-workbench52/files/patch-library__canvas__src__mdc_draw_util.cpp	Tue Aug 26 16:51:36 2014	(r366225)
@@ -0,0 +1,10 @@
+--- ./library/canvas/src/mdc_draw_util.cpp.orig	2014-08-26 12:45:54.802730992 -0400
++++ ./library/canvas/src/mdc_draw_util.cpp	2014-08-26 12:46:32.638126992 -0400
+@@ -24,6 +24,7 @@
+ #endif
+ 
+ #include "mdc_draw_util.h"
++#include <cstdlib>
+ 
+ using namespace base;
+