git: a27ee53ee549 - main - net/deviceatlas-enterprise-c: Update to 3.2.3

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Zsolt Udvari <uzsolt_at_FreeBSD.org>
Date: Sun, 03 Nov 2024 14:50:44 UTC
The branch main has been updated by uzsolt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a27ee53ee549b0b15a31f8df8345eabb5adbb979

commit a27ee53ee549b0b15a31f8df8345eabb5adbb979
Author:     David Carlier <devnexen@gmail.com>
AuthorDate: 2024-11-03 14:49:51 +0000
Commit:     Zsolt Udvari <uzsolt@FreeBSD.org>
CommitDate: 2024-11-03 14:49:51 +0000

    net/deviceatlas-enterprise-c: Update to 3.2.3
    
    Add patches to correct permissions of installed binaries.
    Strip installed binaries too.
    Add post-install-EXAMPLES-on target.
    Add ssl to USES.
    Change MAINTAINER's email.
    Switch to DISTVERSION.
    
    PR:             257963
    Approved by:    submitter is maintainer
---
 net/deviceatlas-enterprise-c/Makefile              | 19 ++++--
 net/deviceatlas-enterprise-c/distinfo              |  6 +-
 .../patch-extra-tools_JsonConverter_CMakeLists.txt | 11 ++++
 .../patch-extra-tools_Scheduler_CMakeLists.txt     | 13 ++++
 net/deviceatlas-enterprise-c/pkg-plist             | 75 ++++++++++++++--------
 5 files changed, 87 insertions(+), 37 deletions(-)

diff --git a/net/deviceatlas-enterprise-c/Makefile b/net/deviceatlas-enterprise-c/Makefile
index db994d8c9170..bf0efd8d741c 100644
--- a/net/deviceatlas-enterprise-c/Makefile
+++ b/net/deviceatlas-enterprise-c/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	deviceatlas-enterprise-c
-PORTVERSION=	2.3.4
+DISTVERSION=	3.2.3
 CATEGORIES=	net devel
 MASTER_SITES=	#
 
-MAINTAINER=	dcarlier@afilias.info
+MAINTAINER=	dcarlier@deviceatlas.com
 COMMENT=	DeviceAtlas Device Detection C API
 WWW=		https://www.deviceatlas.com
 
@@ -14,13 +14,14 @@ LICENSE_TEXT=	The free of charge offering has a restricted use license, for own
 		Contact us (http://www.deviceatlas.com/contact-us) to upgrade or to enable usage as part of a service offering.
 LICENSE_PERMS=	none
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libzip.so:archivers/libzip
 
-USES=		cmake zip
+USES=		cmake ssl zip
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DDOCSDIR=${DOCSDIR} -DEXAMPLESDIR=${EXAMPLESDIR}
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${DISTVERSION}
 
 REGISTRATION_URL=	https://deviceatlas.com/deviceatlas-haproxy-module
 
@@ -34,6 +35,12 @@ IGNORE?=	you must manually fetch the DeviceAtlas Device Detection C API from ${R
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libda.so \
-		${STAGEDIR}${PREFIX}/lib/libci.so
+		${STAGEDIR}${PREFIX}/lib/libci.so \
+		${STAGEDIR}${PREFIX}/bin/dajsonconv \
+		${STAGEDIR}${PREFIX}/bin/dadwsch
+
+post-install-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/Examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/deviceatlas-enterprise-c/distinfo b/net/deviceatlas-enterprise-c/distinfo
index e1a93179286a..d1c787ffadb3 100644
--- a/net/deviceatlas-enterprise-c/distinfo
+++ b/net/deviceatlas-enterprise-c/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614369523
-SHA256 (deviceatlas-enterprise-c-2.3.4.zip) = ccb8200fef9c36b6f95cc06f6e9e7a44c3163f2e5413440548f2679a2c22c021
-SIZE (deviceatlas-enterprise-c-2.3.4.zip) = 91533
+TIMESTAMP = 1730578098
+SHA256 (deviceatlas-enterprise-c-3.2.3.zip) = adf04a41158b873c099744d6227c0f4c86285922c6015de53d1baff7f12a51c7
+SIZE (deviceatlas-enterprise-c-3.2.3.zip) = 755114
diff --git a/net/deviceatlas-enterprise-c/files/patch-extra-tools_JsonConverter_CMakeLists.txt b/net/deviceatlas-enterprise-c/files/patch-extra-tools_JsonConverter_CMakeLists.txt
new file mode 100644
index 000000000000..9cef0abe423d
--- /dev/null
+++ b/net/deviceatlas-enterprise-c/files/patch-extra-tools_JsonConverter_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- extra-tools/JsonConverter/CMakeLists.txt.orig	2024-11-03 14:28:34 UTC
++++ extra-tools/JsonConverter/CMakeLists.txt
+@@ -9,5 +9,7 @@ if (UNIX)
+ 
+ if (UNIX)
+     include(GNUInstallDirs)
+-    install(FILES ${CMAKE_BINARY_DIR}/bin/dajsonconv PERMISSIONS WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
++    install(FILES ${CMAKE_BINARY_DIR}/bin/dajsonconv
++      PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++      WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+ endif()
diff --git a/net/deviceatlas-enterprise-c/files/patch-extra-tools_Scheduler_CMakeLists.txt b/net/deviceatlas-enterprise-c/files/patch-extra-tools_Scheduler_CMakeLists.txt
new file mode 100644
index 000000000000..e09858458eef
--- /dev/null
+++ b/net/deviceatlas-enterprise-c/files/patch-extra-tools_Scheduler_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- extra-tools/Scheduler/CMakeLists.txt.orig	2024-11-03 14:27:43 UTC
++++ extra-tools/Scheduler/CMakeLists.txt
+@@ -16,7 +16,9 @@ if (CURL_FOUND AND (ZLIB_FOUND OR NOT "${ZIPINC}" STRE
+ 
+     if (UNIX)
+         include(GNUInstallDirs)
+-        install(FILES ${CMAKE_BINARY_DIR}/bin/dadwsch PERMISSIONS WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
++        install(FILES ${CMAKE_BINARY_DIR}/bin/dadwsch PERMISSIONS
++          OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
++          WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
+     endif()
+ else()
+     message(STATUS "${PROJECT_NAME} needs curl, zlib and/or zip libraries") 
diff --git a/net/deviceatlas-enterprise-c/pkg-plist b/net/deviceatlas-enterprise-c/pkg-plist
index c8e5b76fa5a3..d47d848169a4 100644
--- a/net/deviceatlas-enterprise-c/pkg-plist
+++ b/net/deviceatlas-enterprise-c/pkg-plist
@@ -1,36 +1,55 @@
+bin/dadwsch
+bin/dajsonconv
 include/ci.h
 include/ci_fwd.h
 include/ci_priv.h
 include/dac.h
 include/dac_json.h
+include/dacommon.h
+include/dadwarc.h
+include/dadwcom.h
+include/dadwcurl.h
+include/import/cache.hpp
+include/import/cache_policy.hpp
+include/import/lru_cache_policy.hpp
+include/import/xxhash.h
 lib/libci.so
-lib/libci.so.1.1.1
+lib/libci.so.1
+lib/libci.so.1.4.1
 lib/libda.so
 lib/libda.so.%%PORTVERSION%%
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/carrier/ci-getproperties/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/carrier/ci-getproperties/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/carrier/ci-getproperties/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/daexutil.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/dumpjson/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/dumpjson/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/dumpjson/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getproperties/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getproperties/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getproperties/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getpropertiesclientsideandlanguage/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getpropertiesclientsideandlanguage/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/getpropertiesclientsideandlanguage/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/jsonloads/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/jsonloads/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/jsonloads/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/processualist/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/processualist/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/processualist/list_of_uas.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/processualist/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/uastats/CMakeLists.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/uastats/README.md
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/uastats/list_of_uas.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/device/uastats/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Examples/util.c
+lib/libda.so.3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/assets/css/style.css
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/assets/js/jquery-3.7.0-min.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/assets/js/jquery.tablesorter-2.31.3.min.js
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/headers.json
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/main.cpp
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/templates/main.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/analytics/templates/result.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ci-getproperties/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ci-getproperties/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ci-getproperties/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/daexutil.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/downloadjson/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/downloadjson/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/downloadjson/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpjson/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpjson/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dumpjson/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getproperties/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getproperties/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/getproperties/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonloads/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonloads/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/jsonloads/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/processualist/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/processualist/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/processualist/list_of_uas.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/processualist/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uastats/CMakeLists.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uastats/README.md
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uastats/list_of_uas.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/uastats/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/util.c