git: de46dbf2724c - main - devel/cbang: some fixes needed for CAMotics

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Sat, 21 May 2022 09:09:59 UTC
The branch main has been updated by thierry:

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

commit de46dbf2724c28e2c1a833e1e640be6e58d68900
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2022-05-21 08:44:40 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2022-05-21 08:44:40 +0000

    devel/cbang: some fixes needed for CAMotics
    
    - fix getExecutablePath
    
    - CAMotics needs some un-installed files from cbang: to avoid a dependency
      on devel/cbang:build, let’s store these missing bits.
---
 devel/cbang/Makefile                               |  8 +++
 .../files/patch-src_cbang_os_SystemUtilities.cpp   | 11 ++++
 devel/cbang/pkg-plist                              | 77 ++++++++++++++++++++++
 3 files changed, 96 insertions(+)

diff --git a/devel/cbang/Makefile b/devel/cbang/Makefile
index 1a19fcee7d9f..7a277be32f51 100644
--- a/devel/cbang/Makefile
+++ b/devel/cbang/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cbang
 PORTVERSION=	1.6.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -59,6 +60,13 @@ post-install:
 	cd ${STAGEDIR}${PREFIX}/lib &&	\
 		${LN} -sf libcbang0.so.${LIBVER} libcbang0.so	&&	\
 		${LN} -sf libcbang0.so.${LIBVER} libcbang0.so.1
+	# Needed to build CAMotics
+	${INSTALL_DATA} ${WRKSRC}/include/cbang/config.h	\
+		${STAGEDIR}${PREFIX}/include/cbang/
+	${INSTALL_DATA} ${WRKSRC}/lib/libcbang-boost.a	\
+		${STAGEDIR}${PREFIX}/lib
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} config ${STAGEDIR}${DATADIR}
 
 do-test:
 	(cd ${TEST_WRKSRC} && ${DO_MAKE_TEST} && ./testHarness)
diff --git a/devel/cbang/files/patch-src_cbang_os_SystemUtilities.cpp b/devel/cbang/files/patch-src_cbang_os_SystemUtilities.cpp
new file mode 100644
index 000000000000..8790b791c73c
--- /dev/null
+++ b/devel/cbang/files/patch-src_cbang_os_SystemUtilities.cpp
@@ -0,0 +1,11 @@
+--- src/cbang/os/SystemUtilities.cpp.orig	2021-08-10 22:46:49 UTC
++++ src/cbang/os/SystemUtilities.cpp
+@@ -388,7 +388,7 @@ namespace cb {
+       size_t len = PATH_MAX;
+       path[0] = path[PATH_MAX] = 0;
+ 
+-      if (sysctl(mib, 4, path, &len, 0, 0) || *path)
++      if (sysctl(mib, 4, path, &len, NULL, 0))
+         THROW("Failed to get executable path: " <<  SysError());
+ 
+       return (char *)path;
diff --git a/devel/cbang/pkg-plist b/devel/cbang/pkg-plist
index 1f99887662a8..f6ee3399e15b 100644
--- a/devel/cbang/pkg-plist
+++ b/devel/cbang/pkg-plist
@@ -26,6 +26,7 @@ include/cbang/auth/OAuth2.h
 include/cbang/buffer/Buffer.h
 include/cbang/buffer/BufferDevice.h
 include/cbang/buffer/MemoryBuffer.h
+include/cbang/config.h
 include/cbang/config/CommandLine.h
 include/cbang/config/Constraint.h
 include/cbang/config/EnumConstraint.h
@@ -390,9 +391,85 @@ include/cbang/xml/XMLReader.h
 include/cbang/xml/XMLSkipHandler.h
 include/cbang/xml/XMLValueMap.h
 include/cbang/xml/XMLWriter.h
+lib/libcbang-boost.a
 lib/libcbang.a
 lib/libcbang0.so
 lib/libcbang0.so.1
 lib/libcbang0.so.%%VER%%
+%%DATADIR%%/config/XML/__init__.py
+%%DATADIR%%/config/XML/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/ZLib/__init__.py
+%%DATADIR%%/config/ZLib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/__init__.py
+%%DATADIR%%/config/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/app/__init__.py
+%%DATADIR%%/config/app/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/build_info/__init__.py
+%%DATADIR%%/config/build_info/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/bzip2/__init__.py
+%%DATADIR%%/config/bzip2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/cbang/__init__.py
+%%DATADIR%%/config/cbang/__init__.py.orig
+%%DATADIR%%/config/cbang/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/chakra/__init__.py
+%%DATADIR%%/config/chakra/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/codesign/__init__.py
+%%DATADIR%%/config/codesign/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/compiler/__init__.py
+%%DATADIR%%/config/compiler/__init__.py.orig
+%%DATADIR%%/config/compiler/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/deb/__init__.py
+%%DATADIR%%/config/deb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/dist/__init__.py
+%%DATADIR%%/config/distpkg/__init__.py
+%%DATADIR%%/config/distpkg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/event/__init__.py
+%%DATADIR%%/config/event/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/expat/__init__.py
+%%DATADIR%%/config/expat/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/find_dlls/__init__.py
+%%DATADIR%%/config/find_dlls/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/flatdistpkg/__init__.py
+%%DATADIR%%/config/flatdistpkg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/freetype2/__init__.py
+%%DATADIR%%/config/leveldb/__init__.py
+%%DATADIR%%/config/leveldb/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/libyaml/__init__.py
+%%DATADIR%%/config/libyaml/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/malloc/__init__.py
+%%DATADIR%%/config/ninja/__init__.py
+%%DATADIR%%/config/ninja/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/notarize/__init__.py
+%%DATADIR%%/config/notarize/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/nsi/__init__.py
+%%DATADIR%%/config/nsi/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/opengl/__init__.py
+%%DATADIR%%/config/openssl/__init__.py
+%%DATADIR%%/config/openssl/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/osx/__init__.py
+%%DATADIR%%/config/osx/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/packager/__init__.py
+%%DATADIR%%/config/packager/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/pkg/__init__.py
+%%DATADIR%%/config/pkg/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/pthreads/__init__.py
+%%DATADIR%%/config/pthreads/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/python/__init__.py
+%%DATADIR%%/config/python/python-config.py
+%%DATADIR%%/config/re2/__init__.py
+%%DATADIR%%/config/re2/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/resources/__init__.py
+%%DATADIR%%/config/resources/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/rpm/__init__.py
+%%DATADIR%%/config/rpm/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/run_distutils/__init__.py
+%%DATADIR%%/config/sqlite3/__init__.py
+%%DATADIR%%/config/sqlite3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/test/__init__.py
+%%DATADIR%%/config/test/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/v8/__init__.py
+%%DATADIR%%/config/v8/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%DATADIR%%/config/valgrind/__init__.py
+%%DATADIR%%/config/valgrind/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/README.md