CVS commit: pkgsrc/www/cppcms

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Dec 21 15:21:28 UTC 2022

Modified Files:
        pkgsrc/www/cppcms: Makefile PLIST distinfo
        pkgsrc/www/cppcms/patches: patch-booster_CMakeLists.txt
Removed Files:
        pkgsrc/www/cppcms/patches:
            patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp
            patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp
            patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp
            patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp
            patch-cppcms_string__key.h patch-src_cache__storage.cpp
            patch-src_json.cpp patch-src_util.cpp

Log Message:
cppcms: update to 1.2.1.

Major changes in this version:
    Redesigned applications pool and its API, now it wouldn't create
    more synchronous applications than threads available.
    New non-blocking I/O mode
    On-the-fly input content processing support
    Improved url-dispatching for better support of RESTful services
    Improved plugin support
    Independent of context use of cache and session interfaces
    Support of non-cookies based session handling
    Integration of session handling with 3rd part technologies:
    PHP, Java Servlet, Aps.Net and so on and contributed modules.
    Major performance and memory use improvements.
    New <% filter ... %> block specifying default escape filter.
    Headers and Source separation by templates compiler. Special
    thanks to Lee Elenbaas for the major contribution.


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/www/cppcms/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/cppcms/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/www/cppcms/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/cppcms/patches/patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp \
    pkgsrc/www/cppcms/patches/patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp \
    pkgsrc/www/cppcms/patches/patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp \
    pkgsrc/www/cppcms/patches/patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp \
    pkgsrc/www/cppcms/patches/patch-cppcms_string__key.h \
    pkgsrc/www/cppcms/patches/patch-src_cache__storage.cpp \
    pkgsrc/www/cppcms/patches/patch-src_json.cpp \
    pkgsrc/www/cppcms/patches/patch-src_util.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/cppcms/Makefile
diff -u pkgsrc/www/cppcms/Makefile:1.34 pkgsrc/www/cppcms/Makefile:1.35
--- pkgsrc/www/cppcms/Makefile:1.34     Wed Nov 23 16:21:18 2022
+++ pkgsrc/www/cppcms/Makefile  Wed Dec 21 15:21:28 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2022/11/23 16:21:18 adam Exp $
+# $NetBSD: Makefile,v 1.35 2022/12/21 15:21:28 wiz Exp $
 
-DISTNAME=      cppcms-1.0.4
-PKGREVISION=   29
+DISTNAME=      cppcms-1.2.1
 CATEGORIES=    www devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cppcms/}
 EXTRACT_SUFX=  .tar.bz2
@@ -9,11 +8,13 @@ EXTRACT_SUFX= .tar.bz2
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://cppcms.com/
 COMMENT=       High performance C++ web development framework
-LICENSE=       gnu-lgpl-v3
+LICENSE=       mit
 
 USE_LANGUAGES= c gnu++11
 USE_CMAKE=     yes
 
+PYTHON_VERSIONS_ACCEPTED=      27
+
 CMAKE_ARGS+=   -DPYTHON=${PYTHONBIN} -DDISABLE_GCRYPT=yes
 
 LDFLAGS+=      ${EXPORT_SYMBOLS_LDFLAGS}

Index: pkgsrc/www/cppcms/PLIST
diff -u pkgsrc/www/cppcms/PLIST:1.1 pkgsrc/www/cppcms/PLIST:1.2
--- pkgsrc/www/cppcms/PLIST:1.1 Tue Jul 16 10:12:48 2013
+++ pkgsrc/www/cppcms/PLIST     Wed Dec 21 15:21:28 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2013/07/16 10:12:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/12/21 15:21:28 wiz Exp $
 bin/cppcms_config_find_param
 bin/cppcms_make_key
 bin/cppcms_run
@@ -19,6 +19,7 @@ include/booster/aio/stream_socket.h
 include/booster/aio/types.h
 include/booster/assert.h
 include/booster/atomic_counter.h
+include/booster/auto_ptr_inc.h
 include/booster/backtrace.h
 include/booster/bad_weak_ptr.h
 include/booster/build_config.h
@@ -52,6 +53,7 @@ include/booster/locale/encoding_utf.h
 include/booster/locale/format.h
 include/booster/locale/formatting.h
 include/booster/locale/generator.h
+include/booster/locale/generic_codecvt.h
 include/booster/locale/gnu_gettext.h
 include/booster/locale/hold_ptr.h
 include/booster/locale/info.h
@@ -59,6 +61,7 @@ include/booster/locale/localization_back
 include/booster/locale/message.h
 include/booster/locale/time_zone.h
 include/booster/locale/utf.h
+include/booster/locale/utf8_codecvt.h
 include/booster/locale/util.h
 include/booster/log.h
 include/booster/noncopyable.h
@@ -83,6 +86,7 @@ include/booster/system_error.h
 include/booster/thread.h
 include/booster/traits/enable_if.h
 include/booster/traits/is_base_of.h
+include/booster/traits/type_traits.h
 include/booster/weak_ptr.h
 include/cppcms/application.h
 include/cppcms/applications_pool.h
@@ -93,6 +97,7 @@ include/cppcms/base_content.h
 include/cppcms/base_view.h
 include/cppcms/cache_interface.h
 include/cppcms/cache_pool.h
+include/cppcms/capi/session.h
 include/cppcms/config.h
 include/cppcms/copy_filter.h
 include/cppcms/cppcms_error.h
@@ -103,6 +108,7 @@ include/cppcms/encoding.h
 include/cppcms/filters.h
 include/cppcms/form.h
 include/cppcms/forwarder.h
+include/cppcms/http_content_filter.h
 include/cppcms/http_content_type.h
 include/cppcms/http_context.h
 include/cppcms/http_cookie.h
@@ -114,6 +120,7 @@ include/cppcms/locale_fwd.h
 include/cppcms/localization.h
 include/cppcms/mem_bind.h
 include/cppcms/mount_point.h
+include/cppcms/plugin.h
 include/cppcms/rpc_json.h
 include/cppcms/serialization.h
 include/cppcms/serialization_classes.h
@@ -138,7 +145,7 @@ include/cppcms/xss.h
 lib/libbooster.a
 lib/libbooster.so
 lib/libbooster.so.0
-lib/libbooster.so.0.0.2
+lib/libbooster.so.0.2.0
 lib/libcppcms.a
 lib/libcppcms.so
 lib/libcppcms.so.1

Index: pkgsrc/www/cppcms/distinfo
diff -u pkgsrc/www/cppcms/distinfo:1.9 pkgsrc/www/cppcms/distinfo:1.10
--- pkgsrc/www/cppcms/distinfo:1.9      Tue Oct 26 11:29:23 2021
+++ pkgsrc/www/cppcms/distinfo  Wed Dec 21 15:21:28 2022
@@ -1,19 +1,11 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 11:29:23 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/12/21 15:21:28 wiz Exp $
 
-BLAKE2s (cppcms-1.0.4.tar.bz2) = 58a53624d96501491ebe2f742fc779dd78845fc5001093bcc4b95aa610eae690
-SHA512 (cppcms-1.0.4.tar.bz2) = 04c783d608f306071f8a77808547ec6c45e4f0bcaf8211737159e569d13b3aae5c9d0be7b109e582a9f7bea94584e36081056b225d709af29583100591721cf7
-Size (cppcms-1.0.4.tar.bz2) = 2331505 bytes
+BLAKE2s (cppcms-1.2.1.tar.bz2) = ad46486b58b212083ea72f0e98f207130b3910e23d1afe15eba9180a23f1acef
+SHA512 (cppcms-1.2.1.tar.bz2) = 62d199b7661549e5d33143ff44dbb6ac0342c7f6d9df75d251698c8662ef79051362f9591dac24fd0f3856b68db47632e8426eb48ebadea4d38f8805c909cd40
+Size (cppcms-1.2.1.tar.bz2) = 2234368 bytes
 SHA1 (patch-bin_cppcms__run) = 2b9033c82fab2c9aa11acbb200e9a44f9c6364cb
-SHA1 (patch-booster_CMakeLists.txt) = 25bfe48385f06f88a2edb10879da4ed53fdd2297
+SHA1 (patch-booster_CMakeLists.txt) = fb1fdeff6bc3e47263df2c0dfed94b2d7334893d
 SHA1 (patch-booster_lib_locale_test_test__std__formatting.cpp) = 62564e7e8bfcb90cd19195f5ce2296b8b03c02d6
 SHA1 (patch-booster_lib_system_src_posix__error.cpp) = 8f1e050ffb1b37b664893864d29508984e82e42c
-SHA1 (patch-cppcms__boost_cppcms__boost_detail_container__fwd.hpp) = 1de84e42f0b0dfbb9b8c9013c1c515727a917998
-SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_containers_container_container__fwd.hpp) = 77de309397fc180556ac80031fffe70a0aa24e86
-SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_detail_managed__memory__impl.hpp) = 434d6c50cb3a8f5a1ae00d83e63341f6c24dbfcd
-SHA1 (patch-cppcms__boost_cppcms__boost_interprocess_interprocess__fwd.hpp) = 2a17e6659095d5406f63743479aab8f259086ffd
-SHA1 (patch-cppcms_string__key.h) = 5532ffc158c6c8d7766a69a7600eea351382a7f4
 SHA1 (patch-private_posix__util.h) = 87b7af8f1aee64f74b002a837f3ae4a456d116d8
-SHA1 (patch-src_cache__storage.cpp) = 0d3e6f559032a0e6aa352c5d88664edc02890d4e
-SHA1 (patch-src_json.cpp) = 4ef9bc4d65c493046b3847a85892ab65cab74add
-SHA1 (patch-src_util.cpp) = a27f4b164555d68aad950460ffd66fc9329ced62
 SHA1 (patch-tests_encryptor__test.cpp) = c05549567c2b93572efa77be4891f9853db75377

Index: pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt
diff -u pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt:1.1 pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt:1.2
--- pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt:1.1  Fri Oct  4 18:27:48 2013
+++ pkgsrc/www/cppcms/patches/patch-booster_CMakeLists.txt      Wed Dec 21 15:21:28 2022
@@ -1,25 +1,25 @@
-$NetBSD: patch-booster_CMakeLists.txt,v 1.1 2013/10/04 18:27:48 joerg Exp $
+$NetBSD: patch-booster_CMakeLists.txt,v 1.2 2022/12/21 15:21:28 wiz Exp $
 
---- booster/CMakeLists.txt.orig        2013-10-02 10:28:22.012853400 +0000
+--- booster/CMakeLists.txt.orig        2018-05-16 15:05:27.000000000 +0000
 +++ booster/CMakeLists.txt
 @@ -251,6 +251,7 @@ endif()
  
- if(IS_WINDOWS)
-       find_library(WS2_32 ws2_32)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS}")
+ 
 +      find_library(WSOCK32 wsock32)
- else()
-       check_function_exists(socket HAVE_SOCKET)
-       if(NOT HAVE_SOCKET)
-@@ -326,7 +327,7 @@ check_cxx_source_compiles(
+ #############################################################################
+ #
+ # Set default RelWithDebInfo build
+@@ -393,7 +394,7 @@ check_cxx_source_compiles(
        BOOSTER_HAVE_INTTYPES_H)
  
  if(IS_WINDOWS)
 -      set(CMAKE_REQUIRED_LIBRARIES ${WS2_32})
 +      set(CMAKE_REQUIRED_LIBRARIES ${WS2_32} ${WSOCK32})
        check_cxx_source_compiles(
-       "#include <winsock2.h>
-       #include <windows.h>
-@@ -531,9 +532,6 @@ foreach(ALIB ${LINK_LIBS})
+       "#include <ws2tcpip.h>
+     #include <winsock2.h>
+@@ -599,9 +600,6 @@ foreach(ALIB ${LINK_LIBS})
        if(LIB_PTHREAD)
                target_link_libraries(${ALIB} ${LIB_PTHREAD})
        endif(LIB_PTHREAD)
@@ -29,7 +29,7 @@ $NetBSD: patch-booster_CMakeLists.txt,v 
        target_link_libraries(${ALIB} ${PCRE_LIB})
  
        if(NOT DISABLE_ICU_LOCALE)
-@@ -556,6 +554,8 @@ foreach(ALIB ${LINK_LIBS})
+@@ -624,6 +622,8 @@ foreach(ALIB ${LINK_LIBS})
  
        if(IS_WINDOWS)
                target_link_libraries(${ALIB} psapi)
@@ -37,4 +37,4 @@ $NetBSD: patch-booster_CMakeLists.txt,v 
 +              target_link_libraries(${ALIB} wsock32)
        endif()
        
-       if(USE_STLPORT AND STLPORT_LIB)
+       if(STLPORT_LIB)