Date: Sat, 18 Apr 2015 00:00:31 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384197 - in head/databases/tora: . files Message-ID: <201504180000.t3I00VH8075448@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> - -.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} < 36 -USE_GCC= yes -.endif +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} USES+= makeinfo @@ -70,4 +66,4 @@ pre-configure: ${REINPLACE_CMD} -e 's|test doc|test|' ${WRKSRC}/Makefile.am .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> 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 <list> + #include <map> + #include <algorithm> ++#include <ctime> + + #include <QWidget> + #include <QString>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504180000.t3I00VH8075448>