pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

angelscript: Build and install via CMake, and install shared library



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Wed Jan 18 22:13:27 2023 -0800
Changeset:	d696348497ed952508c2f92b918841f4d68001a2

Modified Files:
	angelscript/Makefile
	angelscript/PLIST
Removed Files:
	angelscript/patches/patch-angelscript_projects_gnuc_Makefile

Log Message:
angelscript: Build and install via CMake, and install shared library

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d696348497ed952508c2f92b918841f4d68001a2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 angelscript/Makefile                                | 21 ++++++---------------
 angelscript/PLIST                                   |  7 +++++--
 .../patch-angelscript_projects_gnuc_Makefile        | 13 -------------
 3 files changed, 11 insertions(+), 30 deletions(-)

diffs:
diff --git a/angelscript/Makefile b/angelscript/Makefile
index 1f928bdc3e..b32e2ff311 100644
--- a/angelscript/Makefile
+++ b/angelscript/Makefile
@@ -1,8 +1,7 @@
 # $NetBSD$
 
-PKGNAME=	angelscript-${VERSION}
-DISTNAME=	angelscript_${VERSION}
-VERSION=	2.36.0
+DISTNAME=	angelscript_2.36.0
+PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	lang
 MASTER_SITES=	http://angelcode.com/angelscript/sdk/files/
 EXTRACT_SUFX=	.zip
@@ -12,18 +11,10 @@ HOMEPAGE=	https://angelcode.com/angelscript/
 COMMENT=	The AngelScript programming language
 LICENSE=	zlib
 
-WRKSRC=		${WRKDIR}/sdk
-USE_LANGUAGES=	c++
-USE_TOOLS+=	gmake
-NO_CONFIGURE=	yes
-AUTO_MKDIRS=	yes
+WRKSRC=		${WRKDIR}/sdk/angelscript/projects/cmake
+USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
 
-REAL_SOURCE_DIR=	${WRKSRC}/angelscript/projects/gnuc
-BUILD_DIRS+=		${REAL_SOURCE_DIR}
-INSTALL_DIRS+=		${REAL_SOURCE_DIR}
-
-INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX}
-INSTALL_MAKE_FLAGS+=	DESTDIR=${DESTDIR}
-INSTALL_TARGET=		install install_shared
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS=ON
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/angelscript/PLIST b/angelscript/PLIST
index 1c73e2ad6f..499d3a1051 100644
--- a/angelscript/PLIST
+++ b/angelscript/PLIST
@@ -1,5 +1,8 @@
 @comment $NetBSD$
 include/angelscript.h
-lib/libangelscript.a
+lib/cmake/Angelscript/AngelscriptConfig.cmake
+lib/cmake/Angelscript/AngelscriptConfigVersion.cmake
+lib/cmake/Angelscript/AngelscriptTargets-noconfig.cmake
+lib/cmake/Angelscript/AngelscriptTargets.cmake
 lib/libangelscript.so
-lib/libangelscript.so.2.36.0
+lib/libangelscript.so.${PKGVERSION}
diff --git a/angelscript/patches/patch-angelscript_projects_gnuc_Makefile b/angelscript/patches/patch-angelscript_projects_gnuc_Makefile
deleted file mode 100644
index 2bfdb34de2..0000000000
--- a/angelscript/patches/patch-angelscript_projects_gnuc_Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-Use a more portable invocation of cp(1) which does not follow symlinks.
---- angelscript/projects/gnuc/Makefile.orig	2018-09-23 19:11:04.669903070 -0700
-+++ angelscript/projects/gnuc/Makefile	2018-09-23 19:11:18.281487151 -0700
-@@ -43,7 +43,7 @@
- INSTALL_SHLIB = $(INSTALL) -m 755
- INSTALL_ARLIB = $(INSTALL) -m 644
- INSTALL_HEADER = $(INSTALL) -m 644
--CP_SYMLINK = cp --no-dereference --preserve=links
-+CP_SYMLINK = cp -P
- CP_R = cp -R
- 
- 


Home | Main Index | Thread Index | Old Index