From owner-svn-ports-all@FreeBSD.ORG Sat Apr 18 00:00:32 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 874F75BC; Sat, 18 Apr 2015 00:00:32 +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 5B57617E; Sat, 18 Apr 2015 00:00:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3I00WC3075450; Sat, 18 Apr 2015 00:00:32 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3I00VH8075448; Sat, 18 Apr 2015 00:00:31 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201504180000.t3I00VH8075448@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sat, 18 Apr 2015 00:00:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384197 - in head/databases/tora: . 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-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Apr 2015 00:00:32 -0000 Author: amdmi3 Date: Sat Apr 18 00:00:31 2015 New Revision: 384197 URL: https://svnweb.freebsd.org/changeset/ports/384197 Log: - Redo previous fix in a much simpler way, also fix runtime by not mixing different c++ libraries and drop gcc requirement Suggested by: jbeich Added: head/databases/tora/files/patch-src_towaitevents.h (contents, props changed) Modified: head/databases/tora/Makefile Modified: head/databases/tora/Makefile ============================================================================== --- head/databases/tora/Makefile Fri Apr 17 23:52:55 2015 (r384196) +++ head/databases/tora/Makefile Sat Apr 18 00:00:31 2015 (r384197) @@ -3,7 +3,7 @@ PORTNAME= tora PORTVERSION= 2.1.3 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SF @@ -23,7 +23,7 @@ OPTIONS_DEFAULT= PGSQL MYSQL USE_AUTOTOOLS= aclocal automake autoconf autoheader libtoolize USE_QT4= gui corelib sql xml network linguist moc_build uic_build rcc_build -USES= compiler:features gmake libtool makeinfo +USES= gmake libtool makeinfo GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-pcre=${LOCALBASE} LDFLAGS+= -L${LOCALBASE}/lib @@ -31,11 +31,7 @@ INSTALL_TARGET= install-strip PREFIX2FIX= doc/help/preferences.texi doc/help/preferences.html -.include - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36 -USE_GCC= yes -.endif +.include .if ${PORT_OPTIONS:MDOCS} USES+= makeinfo @@ -70,4 +66,4 @@ pre-configure: ${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am .endif -.include +.include Added: head/databases/tora/files/patch-src_towaitevents.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tora/files/patch-src_towaitevents.h Sat Apr 18 00:00:31 2015 (r384197) @@ -0,0 +1,10 @@ +--- src/towaitevents.h.orig 2009-10-23 16:19:33 UTC ++++ src/towaitevents.h +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include + #include