From nobody Sun Jul 16 15:05:00 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R3pRJ4xnXz4mkKJ; Sun, 16 Jul 2023 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R3pRJ2l9Nz4KYD; Sun, 16 Jul 2023 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689519900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHvkWbEXo92UeHkJUq4Hf8u3CP20LbEnNfOEgmOWMtg=; b=qdzbsOtFnv11Z6vrdWgpcUnpJKstTNI4C/Kovq0WrvgGGEYhBCrD4zMiGDdTwqzMCVw3ba gS209eq9GOsxJiq//+1/yjOd9e7J+oSLg10Cw/uLf0QHEfSpjeNLlgnW5jpmqkix0iZmKz IaFkiI++ulFLtZwudrVPA9dziI5EaYyIF/rPhuWk9zmWuUGIsa6tQHeQ2J4xVmhXQUXcXL G1tfsWF7a4HYlIfrB61PQV91QvwALPrDn5sZhwbaVvT65taVX0McyP3frRBobWIXcojzdf 7TPreIe8+6HMWAHWWHn99MG9cCLMLOriPPH8rK0r9eM74XnOx/ZD+WK8QH+0fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689519900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHvkWbEXo92UeHkJUq4Hf8u3CP20LbEnNfOEgmOWMtg=; b=SgYpNMWBkPp/Tc0nvAA2iuC/emIL8hlnB7fjfSOSysqWGpKA3WFqdz26LeJG80E/472GxH Hdyb3DIMDfzBHQynoCeqfHnLF7ht/MQYd84/m3Z6599x+7iIdXbWkUFnaJs4VWQ3m/ZF01 yha+R2fWlgK9OBdGQxT6HMXX+qyN4Ip2mqemZ28hRWyfo/5gNBkzfsCWyP1ZlXlUgNeW75 IyJ+vPP/avm/Yegv8GMuTP/7ElhJLlyHLRNcUyTygMbcQ3FWx25lfK3LlaUtqZNh7bhWAu V3wsM8ZrWgKVpuIn9TkOop4lgAPvq/+1bCdcM0HyZ5YzEJtDhdmw2tUhIW3NiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689519900; a=rsa-sha256; cv=none; b=Oz/LzBQqQP4RK5ap7diHEIhb2Ujnky35ECGa5vY1M2u2aUi1y70otkufD81dxN/JKC8Z0a 0OqB88HzGag4hIugbXr9GizkNETt05g7MvVv8W/vSW4baFWzueB1neaIvaqtUZG2wOwL6V m7MiPRbRwlYQQJummX6KGVCnOjS+GOS0By78jEIQZY5JPlTnr0bGfS0NwUk3rSp1gCWJOl plTjSbZYhUuAt0I7teb6sJ7PUxvF/3mDM/uCUxg5B2/8O/Nf0BAJu6fL6naZ9YLfWwVy7O 0QQTsbZezB6GPLd2Z2G1KvhdHLQbkuoqva05rm3MkaS9r21DWqLXCb5UjmlmGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R3pRJ15MvzmYp; Sun, 16 Jul 2023 15:05:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36GF5068030652; Sun, 16 Jul 2023 15:05:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36GF50Se030651; Sun, 16 Jul 2023 15:05:00 GMT (envelope-from git) Date: Sun, 16 Jul 2023 15:05:00 GMT Message-Id: <202307161505.36GF50Se030651@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Felix Palmen Subject: git: 1e4da4ba03aa - main - devel/poco: Modernize port Makefile List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zirias X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e4da4ba03aa0210cd1c9eed23f68053a41335c3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e4da4ba03aa0210cd1c9eed23f68053a41335c3 commit 1e4da4ba03aa0210cd1c9eed23f68053a41335c3 Author: Felix Palmen AuthorDate: 2023-07-15 12:12:51 +0000 Commit: Felix Palmen CommitDate: 2023-07-16 15:01:36 +0000 devel/poco: Modernize port Makefile * Replace CMAKE_ARGS and _CMAKE_[ON|OFF] by CMAKE_[ON|OFF] and _CMAKE_BOOL[_OFF] for handling cmake BOOL knobs * Drop a CONFLICTS to a port that was removed in 2019 * As advised by portclippy, put all options descriptions in their own block Approved by: portmgr (blanket) --- devel/poco/Makefile | 97 ++++++++++++++++++++++++----------------------------- 1 file changed, 43 insertions(+), 54 deletions(-) diff --git a/devel/poco/Makefile b/devel/poco/Makefile index f3df7c1dcc62..e5c9e874ce3f 100644 --- a/devel/poco/Makefile +++ b/devel/poco/Makefile @@ -15,73 +15,77 @@ LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ libexpat.so:textproc/expat2 USES= cmake compiler:c++14-lang cpe localbase pkgconfig tar:bz2 -USE_LDCONFIG= yes - -CONFLICTS= poco-ssl - CPE_VENDOR= pocoproject +USE_LDCONFIG= yes -CMAKE_ARGS= -DPOCO_UNBUNDLED:BOOL=ON +CMAKE_ON= POCO_UNBUNDLED SHLIB_MAJOR= 94 PLIST_SUB= SHLIB_MAJOR=${SHLIB_MAJOR} OPTIONS_DEFINE= ACTIVERECORD ENCODINGS JSON JWT MONGODB PAGECOMPILER \ PROMETHEUS REDIS SSL TEST XML ZIP -OPTIONS_RADIO= ODBC -OPTIONS_RADIO_ODBC= IODBC UNIXODBC -OPTIONS_GROUP= DB -OPTIONS_GROUP_DB= MYSQL PGSQL SQLITE OPTIONS_DEFAULT= ACTIVERECORD ENCODINGS JSON JWT MYSQL MONGODB \ PAGECOMPILER PGSQL PROMETHEUS REDIS SQLITE SSL \ XML ZIP +OPTIONS_GROUP= DB +OPTIONS_GROUP_DB= MYSQL PGSQL SQLITE +OPTIONS_RADIO= ODBC +OPTIONS_RADIO_ODBC= IODBC UNIXODBC OPTIONS_SUB= yes -# Database support +ACTIVERECORD_DESC= Enable ActiveRecord ORM and compiler DB_DESC= Database support +ENCODINGS_DESC= Enable Encodings component +JWT_DESC= Enable JWT (JSON Web Token) component +MONGODB_DESC= Enable MongoDB support +PAGECOMPILER_DESC= Enable PageCompiler and File2Page +PROMETHEUS_DESC= Enable Prometheus component +ZIP_DESC= Enable Zip support + +# Database support MYSQL_USES= mysql -MYSQL_CMAKE_OFF= -DENABLE_DATA_MYSQL:BOOL=OFF +MYSQL_CMAKE_BOOL= ENABLE_DATA_MYSQL PGSQL_USES= pgsql -PGSQL_CMAKE_OFF= -DENABLE_DATA_POSTGRESQL:BOOL=OFF +PGSQL_CMAKE_BOOL= ENABLE_DATA_POSTGRESQL SQLITE_USES= sqlite -SQLITE_CMAKE_OFF= -DENABLE_DATA_SQLITE:BOOL=OFF +SQLITE_CMAKE_BOOL= ENABLE_DATA_SQLITE IODBC_LIB_DEPENDS= libiodbc.so:databases/libiodbc IODBC_CMAKE_ON= -DODBC_INCLUDE_DIR:PATH=${LOCALBASE}/include/libiodbc \ -DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libiodbc.so UNIXODBC_LIB_DEPENDS= libodbc.so:databases/unixODBC -UNIXODBC_CMAKE_ON= -DODBC_INCLUDE_DIR:PATH=${LOCALBASE}/include \ - -DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so +UNIXODBC_CMAKE_ON= -DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so # Key-value store support -MONGODB_DESC= Enable MongoDB support -MONGODB_CMAKE_OFF= -DENABLE_MONGODB:BOOL=OFF -REDIS_CMAKE_OFF= -DENABLE_REDIS:BOOL=OFF +MONGODB_CMAKE_BOOL= ENABLE_MONGODB +REDIS_CMAKE_BOOL= ENABLE_REDIS # Components ACTIVERECORD_IMPLIES= XML -ACTIVERECORD_CMAKE_OFF= -DENABLE_ACTIVERECORD:BOOL=OFF \ - -DENABLE_ACTIVERECORD_COMPILER:BOOL=OFF -ACTIVERECORD_DESC= Enable ActiveRecord ORM and compiler -ENCODINGS_CMAKE_OFF= -DENABLE_ENCODINGS:BOOL=OFF -ENCODINGS_DESC= Enable Encodings component -JSON_CMAKE_OFF= -DENABLE_JSON:BOOL=OFF -JWT_CMAKE_OFF= -DENABLE_JWT:BOOL=OFF -JWT_DESC= Enable JWT (JSON Web Token) component +ACTIVERECORD_CMAKE_BOOL= ENABLE_ACTIVERECORD \ + ENABLE_ACTIVERECORD_COMPILER +ENCODINGS_CMAKE_BOOL= ENABLE_ENCODINGS +JSON_CMAKE_BOOL= ENABLE_JSON JWT_IMPLIES= JSON SSL -PAGECOMPILER_CMAKE_OFF= -DENABLE_PAGECOMPILER:BOOL=OFF \ - -DENABLE_PAGECOMPILER_FILE2PAGE:BOOL=OFF -PAGECOMPILER_DESC= Enable PageCompiler and File2Page -PROMETHEUS_CMAKE_OFF= -DENABLE_PROMETHEUS:BOOL=OFF -PROMETHEUS_DESC= Enable Prometheus component +JWT_CMAKE_BOOL= ENABLE_JWT +PAGECOMPILER_CMAKE_BOOL= ENABLE_PAGECOMPILER \ + ENABLE_PAGECOMPILER_FILE2PAGE +PROMETHEUS_CMAKE_BOOL= ENABLE_PROMETHEUS SSL_USES= ssl -SSL_CMAKE_OFF= -DENABLE_CRYPTO:BOOL=OFF \ - -DENABLE_NETSSL:BOOL=OFF \ - -DENABLE_JWT:BOOL=OFF -TEST_CMAKE_ON= -DENABLE_TESTS:BOOL=ON +SSL_CMAKE_BOOL= ENABLE_CRYPTO ENABLE_NETSSL TEST_IMPLIES= JSON SQLITE SSL XML +TEST_CMAKE_BOOL= ENABLE_TESTS TEST_TEST_TARGET= test -XML_CMAKE_OFF= -DENABLE_XML:BOOL=OFF -ZIP_CMAKE_OFF= -DENABLE_ZIP:BOOL=OFF -ZIP_DESC= Enable Zip support +XML_CMAKE_BOOL= ENABLE_XML +ZIP_CMAKE_BOOL= ENABLE_ZIP + +post-patch: + @${REINPLACE_CMD} -e \ + 's|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""|' \ + ${WRKSRC}/cmake/DefinePlatformSpecifc.cmake + +# Avoid conflict with archivers/arc +post-install-ACTIVERECORD-on: + @${MV} ${STAGEDIR}${PREFIX}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc-poco .include @@ -94,23 +98,8 @@ PLIST_SUB+= DATA="@comment " .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC} PLIST_SUB+= ODBC="" .else -CMAKE_ARGS+= -DENABLE_DATA_ODBC:BOOL=OFF +CMAKE_OFF+= ENABLE_DATA_ODBC PLIST_SUB+= ODBC="@comment " .endif -.for opt in ${_ALL_OPTIONS} -.if !${OPTIONS_DEFINE:M${opt}} -PLIST_SUB+= ${opt}="@comment " -.endif -.endfor - -post-patch: - @${REINPLACE_CMD} -e \ - 's|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""|' \ - ${WRKSRC}/cmake/DefinePlatformSpecifc.cmake - -# Avoid conflict with archivers/arc -post-install-ACTIVERECORD-on: - @${MV} ${STAGEDIR}${PREFIX}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc-poco - .include