Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 2 Sep 2014 21:34:31 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367083 - head/databases/mysql-workbench52
Message-ID:  <201409022134.s82LYVQr075224@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Tue Sep  2 21:34:30 2014
New Revision: 367083
URL: http://svnweb.freebsd.org/changeset/ports/367083
QAT: https://qat.redports.org/buildarchive/r367083/

Log:
  - Add USES=iconv and link with -liconv
  - Remove USE_GCC=any because there's already USES=compiler:gcc-c++11-lib
  - Use default LIBTOOLIZE_ARGS
  
  Reported by:	antoine

Modified:
  head/databases/mysql-workbench52/Makefile

Modified: head/databases/mysql-workbench52/Makefile
==============================================================================
--- head/databases/mysql-workbench52/Makefile	Tue Sep  2 21:26:37 2014	(r367082)
+++ head/databases/mysql-workbench52/Makefile	Tue Sep  2 21:34:30 2014	(r367083)
@@ -33,8 +33,9 @@ RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/
 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 python:2 compiler:gcc-c++11-lib
+USES=		compiler:gcc-c++11-lib desktop-file-utils gettext gmake iconv \
+		libtool lua:51 pathfix pkgconfig python:2 shared-mime-info \
+		shebangfix
 SHEBANG_FILES=	ext/ctemplate/ctemplate-src/src/htmlparser/*.py \
 		ext/mysql-utilities/*.py \
 		ext/mysql-utilities/scripts/*.py \
@@ -46,13 +47,11 @@ SHEBANG_FILES=	ext/ctemplate/ctemplate-s
 		plugins/wb.admin/gen-opt/recat/*.py \
 		plugins/wb.query.analysis/*.py \
 		po/*.py
-USE_GCC=	any
 USE_GL=		gl
 USE_GNOME=	gnomehier gtk20 libxml2
 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})" \
@@ -97,6 +96,9 @@ post-patch:
 		's|-O0 -g3||' \
 		${WRKSRC}/ext/scintilla/gtk/Makefile.am
 	@${REINPLACE_CMD} -e \
+		'/^wbcopytables_LDADD=/s/$$/ ${ICONV_LIB}/' \
+		${WRKSRC}/plugins/migration/Makefile.am
+	@${REINPLACE_CMD} -e \
 		'/f.write/s|bash -i|sh -i| ; \
 		 /call/s|/bin/bash|/bin/sh| ; \
 		 /paths/s|/usr/local|${LOCALBASE}|' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409022134.s82LYVQr075224>