From owner-svn-ports-head@FreeBSD.ORG Tue Sep 2 21:34:31 2014 Return-Path: Delivered-To: svn-ports-head@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 9AECFBF5; Tue, 2 Sep 2014 21:34:31 +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 6D07D17DD; Tue, 2 Sep 2014 21:34:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82LYVkt075225; Tue, 2 Sep 2014 21:34:31 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82LYVQr075224; Tue, 2 Sep 2014 21:34:31 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201409022134.s82LYVQr075224@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 2 Sep 2014 21:34:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367083 - head/databases/mysql-workbench52 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-1 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: Tue, 02 Sep 2014 21:34:31 -0000 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}|' \