Index: head/databases/hypertable/Makefile =================================================================== --- head/databases/hypertable/Makefile (revision 267026) +++ head/databases/hypertable/Makefile (revision 267027) @@ -1,137 +1,135 @@ # New ports collection makefile for: hypertable # Date created: 20 Aug 2010 # Whom: Sergey Skvortsov # # $FreeBSD$ # PORTNAME= hypertable DISTVERSION= 0.9.3.4-alpha CATEGORIES= databases MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= skv@FreeBSD.org COMMENT= High performance distributed data storage system RUN_DEPENDS= bash>=3.0:${PORTSDIR}/shells/bash LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ thrift.0:${PORTSDIR}/devel/thrift \ event:${PORTSDIR}/devel/libevent \ log4cpp:${PORTSDIR}/devel/log4cpp \ boost_thread:${PORTSDIR}/devel/boost-libs \ rrd:${PORTSDIR}/databases/rrdtool \ art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \ sigar:${PORTSDIR}/sysutils/hyperic-sigar BUILD_DEPENDS= ${RUN_DEPENDS} \ ant:${PORTSDIR}/devel/apache-ant -BROKEN= does not build - OPTIONS= TCMALLOC "Use Tcmalloc" on \ HOARD "Use Hoard" off \ PYTHONLIBS "Add Python binding" off \ THRIFT_PERL "Thrift binding for Perl" off \ THRIFT_PYTHON "Thrift binding for Python" off \ THRIFT_RUBY "Thrift binding for Ruby" off USE_BDB= yes WANT_BDB_VER= 48 USE_CMAKE= yes CMAKE_BUILD_TYPE= RelWithDebinfo CMAKE_INSTALL_PREFIX= ${PREFIX}/hypertable CMAKE_SOURCE_PATH= ${WRKDIR}/${PORTNAME}-${DISTVERSION} CMAKE_ARGS+= -DINSTALL_EXCLUDE_DEPENDENT_LIBS=1 PATCH_WRKSRC= ${CMAKE_SOURCE_PATH} WRKSRC= ${WRKDIR}/build USE_GMAKE= yes USE_LDCONFIG= ${PREFIX}/hypertable/lib DONT_DETECT= Doxygen Kfs Ceph Ant JNI PHP5Thrift .include .if defined(WITH_TCMALLOC) LIB_DEPENDS+= tcmalloc.0:${PORTSDIR}/devel/google-perftools PLIST_SUB+= TCMALLOC="" .else DONT_DETECT+= Tcmalloc PLIST_SUB+= TCMALLOC="@comment " .endif .if defined(WITH_HOARD) LIB_DEPENDS+= hoard.so.1:${PORTSDIR}/devel/libhoard PLIST_SUB+= HOARD="" .else DONT_DETECT+= Hoard PLIST_SUB+= HOARD="@comment " .endif .if defined(WITH_PYTHONLIBS) USE_PYTHON= yes LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs .else DONT_DETECT+= PythonLibs .endif .if defined(WITH_THRIFT_PERL) BUILD_DEPENDS+= p5-Thrift>=0:${PORTSDIR}/devel/p5-Thrift .else DONT_DETECT+= PerlThrift .endif .if defined(WITH_THRIFT_PYTHON) USE_PYTHON= yes BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}thrift>=0:${PORTSDIR}/devel/py-thrift .else DONT_DETECT+= PythonThrift .endif .if defined(WITH_THRIFT_RUBY) BUILD_DEPENDS+= ruby-thrift>=0:${PORTSDIR}/devel/ruby-thrift .else DONT_DETECT+= RubyThrift .endif pre-everything:: .if defined(WITH_THRIFT_PERL) && !defined(WITH_THRIFT) @${ECHO_CMD} "please enable THRIFT option to use THRIFT_PERL" @${FALSE} .endif .if defined(WITH_THRIFT_PYTHON) && !defined(WITH_THRIFT) @${ECHO_CMD} "please enable THRIFT option to use THRIFT_PYTHON" @${FALSE} .endif .if defined(WITH_THRIFT_RUBY) && !defined(WITH_THRIFT) @${ECHO_CMD} "please enable THRIFT option to use THRIFT_RUBY" @${FALSE} .endif .include post-patch: @${REINPLACE_CMD} -i '' -e 's=/opt/local=${LOCALBASE}=' \ ${PATCH_WRKSRC}/cmake/*.cmake @${REINPLACE_CMD} -i '' -e 's=/usr/local/BerkeleyDB.4.8/include=${BDB_INCLUDE_DIR}=; \ s=/usr/local/BerkeleyDB.4.8/lib=${BDB_LIB_DIR}=' \ ${PATCH_WRKSRC}/cmake/FindBerkeleyDB.cmake @${REINPLACE_CMD} -i '' -E '/^set\(CMAKE_INSTALL_PREFIX/d' \ ${PATCH_WRKSRC}/CMakeLists.txt @${FIND} ${PATCH_WRKSRC} -name "*.orig" -delete pre-configure: @${MKDIR} ${WRKSRC} .for _D in ${DONT_DETECT} @${REINPLACE_CMD} -i '' -E '/^find_package\(${_D}\)/d' \ ${PATCH_WRKSRC}/CMakeLists.txt .endfor test: build (cd ${WRKSRC} && ${GMAKE} alltests) .include Property changes on: head/databases/hypertable/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc =================================================================== --- head/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc (nonexistent) +++ head/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc (revision 267027) @@ -0,0 +1,29 @@ +--- src/cc/Hypertable/Lib/HqlInterpreter.cc.orig 2010-12-13 17:56:18.000000000 +0300 ++++ src/cc/Hypertable/Lib/HqlInterpreter.cc 2010-12-13 17:55:27.000000000 +0300 +@@ -272,7 +272,7 @@ + } + else { + out_fd = dup(fileno(outf)); +- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); ++ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); + } + + HT_ON_SCOPE_EXIT(&close_file, out_fd); +@@ -397,7 +397,7 @@ + } + else { + out_fd = dup(fileno(outf)); +- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); ++ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); + } + + HT_ON_SCOPE_EXIT(&close_file, out_fd); +@@ -488,7 +488,7 @@ + else { + if (outf) { + out_fd = dup(fileno(outf)); +- fout.push(boost::iostreams::file_descriptor_sink(out_fd)); ++ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle)); + } + else + fout.push(boost::iostreams::null_sink()); Property changes on: head/databases/hypertable/files/patch-src_cc_Hypertable_Lib_HqlInterpreter.cc ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h =================================================================== --- head/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h (nonexistent) +++ head/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h (revision 267027) @@ -0,0 +1,10 @@ +--- Source_Files/Network/Metaserver/network_metaserver.h.orig 2010-12-10 15:54:11.000000000 +0300 ++++ Source_Files/Network/Metaserver/network_metaserver.h 2010-12-10 15:54:23.000000000 +0300 +@@ -32,6 +32,7 @@ + #include + #include // auto_ptr + #include ++#include + + #include "Logging.h" + Property changes on: head/games/alephone/files/patch-Source_Files_Network_Metaserver_network_metaserver.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/games/spring/files/patch-rts-lib-lobby-Connection.h =================================================================== --- head/games/spring/files/patch-rts-lib-lobby-Connection.h (nonexistent) +++ head/games/spring/files/patch-rts-lib-lobby-Connection.h (revision 267027) @@ -0,0 +1,10 @@ +--- rts/lib/lobby/Connection.h.orig 2010-12-10 17:17:43.000000000 +0300 ++++ rts/lib/lobby/Connection.h 2010-12-10 17:19:28.000000000 +0300 +@@ -6,6 +6,7 @@ + #include + #include + #include ++#include + #include + + struct ClientStatus Property changes on: head/games/spring/files/patch-rts-lib-lobby-Connection.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/graphics/scantailor/files/patch-ProjectFilesDialog.cpp =================================================================== --- head/graphics/scantailor/files/patch-ProjectFilesDialog.cpp (nonexistent) +++ head/graphics/scantailor/files/patch-ProjectFilesDialog.cpp (revision 267027) @@ -0,0 +1,30 @@ +--- ProjectFilesDialog.cpp.orig 2010-04-03 23:47:33.000000000 +0400 ++++ ProjectFilesDialog.cpp 2010-12-10 20:05:23.000000000 +0300 +@@ -677,6 +677,17 @@ + endRemoveRows(); + } + ++namespace { ++ struct less_for_first_members_of_pairs ++ { ++ template ++ bool operator()(Pair const& left, Pair const& right) const ++ { ++ return left.first < right.first; ++ } ++ }; ++} ++ + void + ProjectFilesDialog::FileList::remove(QItemSelection const& selection) + { +@@ -699,7 +710,8 @@ + ); + std::sort( + sorted_ranges.begin(), sorted_ranges.end(), +- bind(&Range::first, _1) < bind(&Range::first, _2) ++ // bind(&Range::first, _1) < bind(&Range::first, _2) ++ less_for_first_members_of_pairs() + ); + + QVectorIterator it(sorted_ranges); Property changes on: head/graphics/scantailor/files/patch-ProjectFilesDialog.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net-p2p/hrktorrent/files/patch-hrktorrent.h =================================================================== --- head/net-p2p/hrktorrent/files/patch-hrktorrent.h (nonexistent) +++ head/net-p2p/hrktorrent/files/patch-hrktorrent.h (revision 267027) @@ -0,0 +1,10 @@ +--- hrktorrent.h.orig 2010-12-14 18:09:28.000000000 +0300 ++++ hrktorrent.h 2010-12-14 18:09:40.000000000 +0300 +@@ -6,6 +6,7 @@ + #include + #include + ++#include + #include + #include + #include Property changes on: head/net-p2p/hrktorrent/files/patch-hrktorrent.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp =================================================================== --- head/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp (nonexistent) +++ head/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp (revision 267027) @@ -0,0 +1,10 @@ +--- include/libtorrent/udp_socket.hpp.orig 2010-12-10 20:38:45.000000000 +0300 ++++ include/libtorrent/udp_socket.hpp 2010-12-10 20:39:05.000000000 +0300 +@@ -37,6 +37,7 @@ + #include "libtorrent/session_settings.hpp" + #include "libtorrent/buffer.hpp" + ++#include + #include + #include + #include Property changes on: head/net-p2p/libtorrent-rasterbar-14/files/patch-include_libtorrent_udp_socket.hpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net-p2p/libtorrent-rasterbar-15/files/patch-include_libtorrent_udp_socket.hpp =================================================================== --- head/net-p2p/libtorrent-rasterbar-15/files/patch-include_libtorrent_udp_socket.hpp (nonexistent) +++ head/net-p2p/libtorrent-rasterbar-15/files/patch-include_libtorrent_udp_socket.hpp (revision 267027) @@ -0,0 +1,10 @@ +--- include/libtorrent/udp_socket.hpp.orig 2010-12-10 20:38:45.000000000 +0300 ++++ include/libtorrent/udp_socket.hpp 2010-12-10 20:39:05.000000000 +0300 +@@ -37,6 +37,7 @@ + #include "libtorrent/session_settings.hpp" + #include "libtorrent/buffer.hpp" + ++#include + #include + #include + #include Property changes on: head/net-p2p/libtorrent-rasterbar-15/files/patch-include_libtorrent_udp_socket.hpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/net-p2p/qbittorrent-22/files/patch-src_main.cpp =================================================================== --- head/net-p2p/qbittorrent-22/files/patch-src_main.cpp (nonexistent) +++ head/net-p2p/qbittorrent-22/files/patch-src_main.cpp (revision 267027) @@ -0,0 +1,10 @@ +--- src/main.cpp.orig 2010-12-26 16:04:06.000000000 +0300 ++++ src/main.cpp 2010-12-26 16:05:49.000000000 +0300 +@@ -60,6 +60,7 @@ + #include "stacktrace.h" + #endif + ++#include + #include + #include "misc.h" + #include "preferences.h" Property changes on: head/net-p2p/qbittorrent-22/files/patch-src_main.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property