summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsno <sno@pkgsrc.org>2018-11-11 20:09:56 +0000
committersno <sno@pkgsrc.org>2018-11-11 20:09:56 +0000
commit6f36b3af4f30ff10828a80fe17006bf693200f5c (patch)
treef1711436b385485a41e8dbbd003857232a3bf1e7
parent8ad5fd67a7843e520ad4a036e81b15a9d2302ca4 (diff)
downloadpkgsrc-6f36b3af4f30ff10828a80fe17006bf693200f5c.tar.gz
Updating package for Log4CPlus in devel/log4cplus from 1.1.1 to 2.0.2
# log4cplus 2.0.2 - Allow setting thread pool size using new function `setThreadPoolSize()`. Allow setting the size from `log4cplus.properties` using `log4cplus.threadPoolSize` property. Lower initial thread pool size by half to `std::thread::hardware_concurrency()` threads. GitHub issue #315. - Fix Autotools based build for MinGW. GitHub issue #317. - Add `configure` script option `--enable-lto` to allow easier LTO builds. - Optimization of `getFormattedTime()`. (Alexey Vishtak) - Introduction of `LOG4CPLUS_MACRO_FILE()` used in logging macros to allow users to redefine it and consequently hide source file names from their compiled executables and logging output. # log4cplus 2.0.1 - Update to Automake 1.16.1. - Adjust `spi::LoggerFactory` to allow custom `spi::LoggerImpl`. GitHub issue #309. - Fix MacOS X compilation. GitHub issue #312. # log4cplus 2.0 - CMake improvements: Automate export of includes if building as Cmake sub-module. (Rodion Malinovsky) - Debian spec file improvements: Use parallel build. Fix installation path on 64bit. (Michal Marek) - CMake improvements: Use `${CMAKE_INSTALL_LIBDIR}` instead of hardcoding lib. (Radek Dostál) - Experimental Windows 10 ARM support through CMAKE # log4cplus 2.0-RC2 - Avoid copying whole message just to prepend message length in `SocketAppender`. Instead, use OS specific "gather" socket write. - Fixed GitHub issue #136. - `FileAppender` classes now have `TextMode` property that can be set to `Binary` or `Text` (default) to specify underlying IO stream behavior with respect to end-of-line handling. (Patch by raphaelmarcucci). - Fixed compilation issues when building log4cplus with Visual Studio and Clang toolchain. - Fixed various shutdown and initialization related deadlocks and crashes. GitHub issues #251, #253. - Fixed GitHub issue #243. Single-threaded build with Visual Studio and CMake were not single-threaded. - Fixed GitHub issue #250. Creating WiX based installer using CPack does not work because of missing license file. # log4cplus 2.0-RC1 - **IMPORTANT**: Implementation language is now C++11. OS specific implementations have been replaced by C++11 facilities wherever possible. This lowers complexity of the library and improves maintainability but it also brings limitations to when the library can be used. Specifically, the library should not be used before `main()` is entered and after `main()` is left. Even more specifically, the library should not be used during global objects construction and destruction. - log4cplus uses Catch unit testing framework and has unit tests. - log4cplus supports IPv6. - Autotools based build system is now partially generated from templates by the Autogen tool. - Autotools based build system can build both `wchar_t` and plain `char` variants at once.
-rw-r--r--devel/log4cplus/Makefile19
-rw-r--r--devel/log4cplus/PLIST15
-rw-r--r--devel/log4cplus/distinfo12
-rw-r--r--devel/log4cplus/patches/patch-aa12
-rw-r--r--devel/log4cplus/patches/patch-ab21
5 files changed, 64 insertions, 15 deletions
diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index f9f58a64609..b25591c0799 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2013/09/23 13:55:50 obache Exp $
+# $NetBSD: Makefile,v 1.7 2018/11/11 20:09:56 sno Exp $
#
-DISTNAME= log4cplus-1.1.1
-PKGREVISION= 1
+DISTNAME= log4cplus-2.0.2
CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=log4cplus/}
+GITHUB_RELEASE= REL_2_0_2
+MASTER_SITES= ${MASTER_SITE_GITHUB:=log4cplus/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= reed@reedmedia.net
@@ -14,7 +14,14 @@ LICENSE= apache-2.0 AND 2-clause-bsd
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_LANGUAGES= c c++ # C for configure
+USE_TOOLS+= pkg-config autoconf automake autoreconf gmake
+USE_LANGUAGES= c99 c++11 # C for configure
+
+CONFIGURE_ARGS+= --with-iconv
+CONFIGURE_ARGS+= --without-wchar_t-support
+CONFIGURE_ARGS+= --without-qt
+CONFIGURE_ARGS+= --without-qt5
+CONFIGURE_ARGS+= --without-python
.include "../../mk/compiler.mk"
.if !empty(PKGSRC_COMPILER:Mclang)
@@ -24,6 +31,7 @@ CPPFLAGS+= -Werror=ignored-attributes
CHECK_BUILTIN.pthread:= yes
.include "../../mk/pthread.builtin.mk"
CHECK_BUILTIN.pthread:= no
+CONFIGURE_ARGS+= --enable-threads
# TLS is not supported by NetBSD<6
.if !empty(MACHINE_PLATFORM:MNetBSD-[0-5].*-*)
@@ -31,4 +39,5 @@ CONFIGURE_ENV+= ac_cv_thread_local=no
CONFIGURE_ENV+= ac_cv__thread_keyword=no
.endif
+.include "../../converters/libiconv/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/log4cplus/PLIST b/devel/log4cplus/PLIST
index e70e6f031df..56f97f9a89a 100644
--- a/devel/log4cplus/PLIST
+++ b/devel/log4cplus/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2013/07/02 08:59:03 sno Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/11/11 20:09:56 sno Exp $
include/log4cplus/appender.h
include/log4cplus/asyncappender.h
include/log4cplus/boost/deviceappender.hxx
+include/log4cplus/callbackappender.h
+include/log4cplus/clfsappender.h
include/log4cplus/clogger.h
include/log4cplus/config.hxx
include/log4cplus/config/defines.hxx
@@ -13,14 +15,13 @@ include/log4cplus/consoleappender.h
include/log4cplus/fileappender.h
include/log4cplus/fstreams.h
include/log4cplus/helpers/appenderattachableimpl.h
+include/log4cplus/helpers/connectorthread.h
include/log4cplus/helpers/fileinfo.h
include/log4cplus/helpers/lockfile.h
include/log4cplus/helpers/loglog.h
-include/log4cplus/helpers/logloguser.h
include/log4cplus/helpers/pointer.h
include/log4cplus/helpers/property.h
include/log4cplus/helpers/queue.h
-include/log4cplus/helpers/sleep.h
include/log4cplus/helpers/snprintf.h
include/log4cplus/helpers/socket.h
include/log4cplus/helpers/socketbuffer.h
@@ -29,20 +30,24 @@ include/log4cplus/helpers/thread-config.h
include/log4cplus/helpers/timehelper.h
include/log4cplus/hierarchy.h
include/log4cplus/hierarchylocker.h
+include/log4cplus/initializer.h
include/log4cplus/internal/cygwin-win32.h
include/log4cplus/internal/env.h
include/log4cplus/internal/internal.h
include/log4cplus/internal/socket.h
include/log4cplus/layout.h
+include/log4cplus/log4cplus.h
include/log4cplus/log4judpappender.h
include/log4cplus/logger.h
include/log4cplus/loggingmacros.h
include/log4cplus/loglevel.h
include/log4cplus/mdc.h
+include/log4cplus/msttsappender.h
include/log4cplus/ndc.h
include/log4cplus/nteventlogappender.h
include/log4cplus/nullappender.h
include/log4cplus/qt4debugappender.h
+include/log4cplus/qt5debugappender.h
include/log4cplus/socketappender.h
include/log4cplus/spi/appenderattachable.h
include/log4cplus/spi/factory.h
@@ -55,9 +60,9 @@ include/log4cplus/spi/rootlogger.h
include/log4cplus/streams.h
include/log4cplus/syslogappender.h
include/log4cplus/tchar.h
+include/log4cplus/thread/impl/syncprims-cxx11.h
include/log4cplus/thread/impl/syncprims-impl.h
-include/log4cplus/thread/impl/syncprims-pthreads.h
-include/log4cplus/thread/impl/syncprims-win32.h
+include/log4cplus/thread/impl/syncprims-pmsm.h
include/log4cplus/thread/impl/threads-impl.h
include/log4cplus/thread/impl/tls.h
include/log4cplus/thread/syncprims-pub-impl.h
diff --git a/devel/log4cplus/distinfo b/devel/log4cplus/distinfo
index 1b1df3f487b..9e77cef2b33 100644
--- a/devel/log4cplus/distinfo
+++ b/devel/log4cplus/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.3 2015/11/03 03:27:47 agc Exp $
+$NetBSD: distinfo,v 1.4 2018/11/11 20:09:56 sno Exp $
-SHA1 (log4cplus-1.1.1.tar.bz2) = 3a86b2e124091c9345ee1bac81ca1fb3773fad60
-RMD160 (log4cplus-1.1.1.tar.bz2) = 44b15552265bc59387b33ea59549fdc2a7a61339
-SHA512 (log4cplus-1.1.1.tar.bz2) = ae9ba65072bcfb4a1dee8b878722a808e3ad1d6403c7c5485d0876522359830ea9392484769674f56442bd8c95fde1ddc24a2f0d07ef5a4970724cea2f3ce9f2
-Size (log4cplus-1.1.1.tar.bz2) = 538692 bytes
+SHA1 (log4cplus-2.0.2.tar.bz2) = f34573c7356a6f5b78a61ff5ee9f9ba4a5dace8f
+RMD160 (log4cplus-2.0.2.tar.bz2) = 547fa298a76faf7bc607aa7f780047ffe177dfbf
+SHA512 (log4cplus-2.0.2.tar.bz2) = 0951a7255fea8f0efe9d0eb5889507fc0293c3baffa05bd7313ee3182e702c971b4a7fab47f6a1c3010310c08797fb780e0719e3b7df5df3d9a76ad57484ec9f
+Size (log4cplus-2.0.2.tar.bz2) = 958644 bytes
+SHA1 (patch-aa) = 1386014633cc299f2edf78de58a485feb41a27de
+SHA1 (patch-ab) = 8211edea6d3b78caf1185443aede8bd01a37adc3
diff --git a/devel/log4cplus/patches/patch-aa b/devel/log4cplus/patches/patch-aa
new file mode 100644
index 00000000000..ead88c4fc62
--- /dev/null
+++ b/devel/log4cplus/patches/patch-aa
@@ -0,0 +1,12 @@
+diff --git a/src/clogger.cxx b/src/clogger.cxx
+index b3d29752..bf534f07 100644
+--- src/clogger.cxx
++++ src/clogger.cxx
+@@ -44,7 +44,6 @@ using namespace log4cplus::helpers;
+ LOG4CPLUS_EXPORT void *
+ log4cplus_initialize(void)
+ {
+- Initializer * initializer = 0;
+ try
+ {
+ return new Initializer();
diff --git a/devel/log4cplus/patches/patch-ab b/devel/log4cplus/patches/patch-ab
new file mode 100644
index 00000000000..35796bae916
--- /dev/null
+++ b/devel/log4cplus/patches/patch-ab
@@ -0,0 +1,21 @@
+diff --git a/include/log4cplus/config.hxx b/include/log4cplus/config.hxx
+index 57ac533d..667c47cd 100644
+--- include/log4cplus/config.hxx
++++ include/log4cplus/config.hxx
+@@ -31,7 +31,6 @@
+ #else
+ # include <log4cplus/config/defines.hxx>
+ #endif
+-#include <cstddef>
+
+ # if ! defined (LOG4CPLUS_WORKING_LOCALE) \
+ && ! defined (LOG4CPLUS_WORKING_C_LOCALE) \
+@@ -178,6 +178,8 @@
+ #endif
+
+ #if defined(__cplusplus)
++#include <cstddef>
++
+ namespace log4cplus
+ {
+