git: 4a507bc80f75 - main - devel/argtable3: Improve port
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 18 Feb 2024 23:01:07 UTC
The branch main has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4a507bc80f751439bcb25cf3d683de49d31ea4a1
commit 4a507bc80f751439bcb25cf3d683de49d31ea4a1
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-02-18 22:58:27 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2024-02-18 22:58:27 +0000
devel/argtable3: Improve port
- Add CMAKE options for avoid compile not installable files
- Remove obsolete dependency
- Now this port installs static and shared libraries
- Bump PORTREVISION
Reported by: diizzy
---
devel/argtable3/Makefile | 9 +++++----
devel/argtable3/files/patch-src_CMakeLists.txt | 26 ++++++++++++++++++++++++++
devel/argtable3/pkg-plist | 3 +++
3 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/devel/argtable3/Makefile b/devel/argtable3/Makefile
index 40c226aefab2..2f7ec4449c1c 100644
--- a/devel/argtable3/Makefile
+++ b/devel/argtable3/Makefile
@@ -1,5 +1,6 @@
PORTNAME= argtable3
DISTVERSION= 3.2.2
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= acm@FreeBSD.org
@@ -9,14 +10,14 @@ WWW= https://www.argtable.org
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= bash>0:shells/bash
-
-USES= cmake compiler:c++11-lang shebangfix
+USES= cmake compiler:c++11-lang
USE_GITHUB= yes
GH_ACCOUNT= argtable
GH_TAGNAME= f319bb66252c6d32a0657c774534ba409567aa62
-SHEBANG_FILES= ${WRKSRC}/tools/build
+CMAKE_OFF= ARGTABLE3_ENABLE_TESTS \
+ ARGTABLE3_ENABLE_EXAMPLES
+CMAKE_ON= BUILD_SHARED_LIBS
post-patch:
${REINPLACE_CMD} '66d' ${WRKSRC}/tools/build
diff --git a/devel/argtable3/files/patch-src_CMakeLists.txt b/devel/argtable3/files/patch-src_CMakeLists.txt
new file mode 100644
index 000000000000..ceef232cf613
--- /dev/null
+++ b/devel/argtable3/files/patch-src_CMakeLists.txt
@@ -0,0 +1,26 @@
+--- src/CMakeLists.txt.orig 2024-02-18 21:34:25 UTC
++++ src/CMakeLists.txt
+@@ -73,7 +73,8 @@ if(BUILD_SHARED_LIBS AND WIN32)
+ add_library(argtable3 ${ARGTABLE3_SRC_FILES} "${PROJECT_BINARY_DIR}/src/version.rc")
+ target_compile_definitions(argtable3 INTERFACE argtable3_IMPORTS)
+ else()
+- add_library(argtable3 ${ARGTABLE3_SRC_FILES})
++ add_library(argtable3_static STATIC ${ARGTABLE3_SRC_FILES})
++ add_library(argtable3 SHARED ${ARGTABLE3_SRC_FILES})
+ endif()
+
+ add_library(${ARGTABLE3_PROJECT_NAME}::argtable3 ALIAS argtable3)
+@@ -94,6 +95,13 @@ elseif(WIN32)
+ endif()
+
+ install(TARGETS argtable3
++ EXPORT ${ARGTABLE3_PACKAGE_NAME}Config
++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++)
++
++install(TARGETS argtable3_static
+ EXPORT ${ARGTABLE3_PACKAGE_NAME}Config
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/devel/argtable3/pkg-plist b/devel/argtable3/pkg-plist
index 5acc3b510f53..7e6921835877 100644
--- a/devel/argtable3/pkg-plist
+++ b/devel/argtable3/pkg-plist
@@ -2,4 +2,7 @@ include/argtable3.h
lib/cmake/argtable3/Argtable3Config-release.cmake
lib/cmake/argtable3/Argtable3Config.cmake
lib/cmake/argtable3/Argtable3ConfigVersion.cmake
+lib/libargtable3.so
+lib/libargtable3.so.0
+lib/libargtable3.so.0.0.0
lib/libargtable3_static.a