Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 13 Oct 2024 16:51:10 GMT
From:      Michael Reifenberger <mr@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ac1e9fccf815 - main - cad/Clipper2: Build shared lib
Message-ID:  <202410131651.49DGpAIq065521@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mr:

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

commit ac1e9fccf815f5c70361d8040530643952bf3615
Author:     Michael Reifenberger <mr@FreeBSD.org>
AuthorDate: 2024-10-13 16:47:03 +0000
Commit:     Michael Reifenberger <mr@FreeBSD.org>
CommitDate: 2024-10-13 16:50:56 +0000

    cad/Clipper2: Build shared lib
    
    Switch to shared library and improve port
    Bump PORTREVISION
    
    PR:             282056
    Reported by:    Daniel Engberg zzy@
---
 cad/Clipper2/Makefile       | 21 ++++++++++-----------
 cad/Clipper2/distinfo       |  8 +++-----
 cad/Clipper2/pkg-plist      |  8 ++++++--
 cad/openscad-devel/Makefile |  2 +-
 cad/openscad/Makefile       |  2 +-
 5 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/cad/Clipper2/Makefile b/cad/Clipper2/Makefile
index 6877c275f643..5b938cee1d94 100644
--- a/cad/Clipper2/Makefile
+++ b/cad/Clipper2/Makefile
@@ -1,25 +1,24 @@
 PORTNAME=	Clipper2
 DISTVERSION=	1.4.0
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
+MASTER_SITES=	https://github.com/AngusJohnson/${PORTNAME}/releases/download/${PORTNAME}_${DISTVERSION}/
+DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	mr@freebsd.org
 COMMENT=	A Polygon Clipping and Offsetting library (in C++, C# & Delphi)
 WWW=		https://github.com/AngusJohnson/Clipper2
 
 LICENSE=	BSL
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/../License.txt
 
-USES=	cmake
+USES=	cmake compiler:c++17-lang dos2unix pathfix zip
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	AngusJohnson google:gtest
-GH_PROJECT=	googletest:gtest
-GH_TAGNAME=	2b665ac 71815bb:gtest
-GH_SUBDIR=	CPP/Tests/googletest:gtest
+WRKSRC_SUBDIR=	CPP
+NO_WRKSUBDIR=	yes
 
-CMAKE_SOURCE_PATH= ${WRKSRC}/CPP
-#CMAKE_ON=	
-CMAKE_OFF=	INSTALL_GTEST
+CMAKE_OFF=	CLIPPER2_EXAMPLES \
+		CLIPPER2_TESTS 
+CMAKE_ON=	BUILD_SHARED_LIBS
 
 .include <bsd.port.mk>
diff --git a/cad/Clipper2/distinfo b/cad/Clipper2/distinfo
index 4326887a1487..2c9f3a3efe1c 100644
--- a/cad/Clipper2/distinfo
+++ b/cad/Clipper2/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1728687615
-SHA256 (AngusJohnson-Clipper2-1.4.0-2b665ac_GH0.tar.gz) = bf1553e085ebcfc501884a56087580b2a5b2ffa14826700b67489bcc3af79c19
-SIZE (AngusJohnson-Clipper2-1.4.0-2b665ac_GH0.tar.gz) = 619495
-SHA256 (google-googletest-71815bb_GH0.tar.gz) = 386281d4eddb10c6cf5f93ee02d56793fb075138cb584ca31b1e70ab38c7678c
-SIZE (google-googletest-71815bb_GH0.tar.gz) = 873787
+TIMESTAMP = 1728819583
+SHA256 (Clipper2_1.4.0.zip) = c327d65a9bc4970f5793cc5460756fc6a51d9233ad1941a303435d154f80accb
+SIZE (Clipper2_1.4.0.zip) = 1144261
diff --git a/cad/Clipper2/pkg-plist b/cad/Clipper2/pkg-plist
index 70f0f448017f..81676fedb663 100644
--- a/cad/Clipper2/pkg-plist
+++ b/cad/Clipper2/pkg-plist
@@ -10,7 +10,11 @@ lib/cmake/clipper2/Clipper2Config.cmake
 lib/cmake/clipper2/Clipper2ConfigVersion.cmake
 lib/cmake/clipper2/Clipper2Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/clipper2/Clipper2Targets.cmake
-lib/libClipper2.a
-lib/libClipper2Z.a
+lib/libClipper2.so
+lib/libClipper2.so.1
+lib/libClipper2.so.1.4.0
+lib/libClipper2Z.so
+lib/libClipper2Z.so.1
+lib/libClipper2Z.so.1.4.0
 libdata/pkgconfig/Clipper2.pc
 libdata/pkgconfig/Clipper2Z.pc
diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
index 0dc0bc577220..4fd19cdf56cf 100644
--- a/cad/openscad-devel/Makefile
+++ b/cad/openscad-devel/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openscad
 PORTVERSION=	2024.10.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 
diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile
index b3ed4fe0af64..de4a74e2c71b 100644
--- a/cad/openscad/Makefile
+++ b/cad/openscad/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openscad
 PORTVERSION=	2024.10.11
-#PORTREVISION=	1
+PORTREVISION=	1
 CATEGORIES=	cad
 
 #PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410131651.49DGpAIq065521>