Date: Thu, 18 Sep 2014 15:15:39 +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: r368474 - in head/www/libecap: . files Message-ID: <201409181515.s8IFFdj0092070@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Sep 18 15:15:39 2014 New Revision: 368474 URL: http://svnweb.freebsd.org/changeset/ports/368474 QAT: https://qat.redports.org/buildarchive/r368474/ Log: - Drop .la files, no dependees require them - Add LICENSE_FILE - Add patches to build with clang, drop USE_GCC (which breaks squid) Approved by: portmgr blanket Added: head/www/libecap/files/ head/www/libecap/files/patch-src__libecap__common__area.cc (contents, props changed) head/www/libecap/files/patch-src__libecap__common__area.h (contents, props changed) head/www/libecap/files/patch-src__libecap__common__memory.h (contents, props changed) Modified: head/www/libecap/Makefile head/www/libecap/pkg-plist Modified: head/www/libecap/Makefile ============================================================================== --- head/www/libecap/Makefile Thu Sep 18 15:14:00 2014 (r368473) +++ head/www/libecap/Makefile Thu Sep 18 15:15:39 2014 (r368474) @@ -3,7 +3,7 @@ PORTNAME= libecap PORTVERSION= 0.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www security MASTER_SITES= http://www.measurement-factory.com/tmp/ecap/ @@ -11,14 +11,14 @@ MAINTAINER= tmseck@FreeBSD.org COMMENT= Library for module based network content analysis LICENSE= BSD2CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE OPTIONS_DEFINE= DOCS -USES= libtool:keepla +USES= libtool GNU_CONFIGURE= yes USE_LDCONFIG= yes -USE_GCC= any INSTALL_TARGET= install-strip PORTDOCS= CREDITS LICENSE NOTICE README Added: head/www/libecap/files/patch-src__libecap__common__area.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libecap/files/patch-src__libecap__common__area.cc Thu Sep 18 15:15:39 2014 (r368474) @@ -0,0 +1,13 @@ +--- src/libecap/common/area.cc.orig 2010-12-17 21:08:50.000000000 +0300 ++++ src/libecap/common/area.cc 2014-09-12 15:11:20.000000000 +0400 +@@ -14,8 +14,8 @@ + + + libecap::Area libecap::Area::FromTempString(const std::string &tmp) { +- shared_ptr<StdStringAreaDetails> details(new StdStringAreaDetails(tmp)); +- return Area(details->owner_.data(), details->owner_.size(), details); ++ shared_ptr<StdStringAreaDetails> detls(new StdStringAreaDetails(tmp)); ++ return Area(detls->owner_.data(), detls->owner_.size(), detls); + } + + libecap::Area libecap::Area::FromTempBuffer(const char *start, libecap::size_type size) { Added: head/www/libecap/files/patch-src__libecap__common__area.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libecap/files/patch-src__libecap__common__area.h Thu Sep 18 15:15:39 2014 (r368474) @@ -0,0 +1,25 @@ +--- src/libecap/common/area.h.orig 2011-02-17 21:04:23.000000000 +0300 ++++ src/libecap/common/area.h 2014-09-12 15:16:00.000000000 +0400 +@@ -45,7 +45,8 @@ + Details details; // creator-defined + + private: +- bool does_not_support_comparisons() const; // not implemented ++ template<typename T> bool operator==(const T&) {} ++ template<typename T> bool operator!=(const T&) {} + }; + + // this stub can be enhanced by area creators to optimize area operations +@@ -57,10 +58,8 @@ + std::ostream &operator <<(std::ostream &os, const Area &area); + + /* make Area comparisons illegal by default */ +-template <typename T> bool operator ==(const Area &a, const T &) { return a.does_not_support_comparisons(); } +-template <typename T> bool operator !=(const Area &a, const T &) { return a.does_not_support_comparisons(); } +-template <typename T> bool operator ==(const T &, const Area &a) { return a.does_not_support_comparisons(); } +-template <typename T> bool operator !=(const T &, const Area &a) { return a.does_not_support_comparisons(); } ++template <typename T> bool operator ==(const T &t, const Area &a) { return a == t; } ++template <typename T> bool operator !=(const T &t, const Area &a) { return a != t; } + + } // namespace libecap + Added: head/www/libecap/files/patch-src__libecap__common__memory.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/libecap/files/patch-src__libecap__common__memory.h Thu Sep 18 15:15:39 2014 (r368474) @@ -0,0 +1,26 @@ +--- src/libecap/common/memory.h.orig 2010-05-26 01:27:41.000000000 +0400 ++++ src/libecap/common/memory.h 2014-09-12 15:06:36.000000000 +0400 +@@ -4,14 +4,23 @@ + #define LIBECAP__COMMON_MEMORY_H + + #include <libecap/common/libecap.h> ++#if defined(_LIBCPP_VERSION) ++#include <memory> ++#else + #include <tr1/memory> ++#endif + + // TODO: add support for boost pointers if std::tr1 is not available + + namespace libecap { + ++#if defined(_LIBCPP_VERSION) ++using std::weak_ptr; ++using std::shared_ptr; ++#else + using std::tr1::weak_ptr; + using std::tr1::shared_ptr; ++#endif + + } // namespace libecap + Modified: head/www/libecap/pkg-plist ============================================================================== --- head/www/libecap/pkg-plist Thu Sep 18 15:14:00 2014 (r368473) +++ head/www/libecap/pkg-plist Thu Sep 18 15:15:39 2014 (r368474) @@ -22,7 +22,6 @@ include/libecap/common/version.h include/libecap/host/host.h include/libecap/host/xaction.h lib/libecap.a -lib/libecap.la lib/libecap.so lib/libecap.so.2 lib/libecap.so.2.0.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409181515.s8IFFdj0092070>