git: a32c552ee44d - main - games/irrlamb: chase upstream move, minor refactoring

The branch main has been updated by amdmi3:

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

commit a32c552ee44d146720a03a57f5a407c54bbae99a
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-05-06 18:05:34 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-05-14 01:44:10 +0000

    games/irrlamb: chase upstream move, minor refactoring
    
    - Chase upstream move to gitlab. No change in source tarball contents,
      minor changes in cmake tarball.
    - Switch to USES=sqlite [1]
    - Switch to pkg-plist
    
    PR:             278738 [1]
    Submitted by:   diizzy [1]
---
 games/irrlamb/Makefile                        | 23 +++++++++--------------
 games/irrlamb/distinfo                        | 10 +++++-----
 games/irrlamb/files/patch-cmake_version.cmake | 21 ++++++++++++---------
 games/irrlamb/pkg-plist                       |  4 ++++
 4 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/games/irrlamb/Makefile b/games/irrlamb/Makefile
index 80e34d4311db..4ca8bf2bc761 100644
--- a/games/irrlamb/Makefile
+++ b/games/irrlamb/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	irrlamb
-PORTVERSION=	1.0.3
-PORTREVISION=	4
 DISTVERSIONPREFIX=	v
+DISTVERSION=	1.0.3
+PORTREVISION=	4
 CATEGORIES=	games
+DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	3D physics-based puzzle game
-WWW=		https://github.com/jazztickets/irrlamb
+WWW=		https://gitlab.com/irrlamb/code
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -14,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
-		libsqlite3.so:databases/sqlite3 \
 		libpng.so:graphics/png \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libIrrlicht.so:x11-toolkits/irrlicht \
@@ -22,11 +22,11 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libccd.so:math/libccd
 BUILD_DEPENDS=	${LOCALBASE}/include/glm/vec3.hpp:math/glm
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	jazztickets
-GH_TUPLE:=	${GH_ACCOUNT}:cmake:6e3586a:cmake/cmake
-
-USES=		cmake compiler:c++11-lib gl jpeg openal xorg lua:53
+USES=		cmake compiler:c++11-lib gl jpeg openal sqlite xorg lua:53
+USE_GITLAB=	yes
+GL_ACCOUNT=	irrlamb
+GL_PROJECT=	code
+GL_TUPLE=	jazztickets:cmake:486362ce74eaf6b26067576a8b6b03dcad27a7a5:cmake/cmake
 USE_XORG=	x11 xrandr xext xxf86vm
 USE_GL=		gl
 CONFIGURE_ENV=	LOCALBASE="${LOCALBASE}"
@@ -38,11 +38,6 @@ CXXFLAGS+=	-DGLM_ENABLE_EXPERIMENTAL  # GLM_GTX_rotate_vector is an experimental
 PORTDOCS=	*
 PORTDATA=	*
 
-PLIST_FILES=	bin/irrlamb \
-		share/applications/irrlamb.desktop \
-		share/icons/hicolor/256x256/apps/irrlamb.png \
-		share/metainfo/irrlamb.xml
-
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
diff --git a/games/irrlamb/distinfo b/games/irrlamb/distinfo
index 4b99803f3d1e..bd7c7e7d21d6 100644
--- a/games/irrlamb/distinfo
+++ b/games/irrlamb/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1654257097
-SHA256 (jazztickets-irrlamb-v1.0.3_GH0.tar.gz) = fd5cd85241c900707db258bef0ba6646029ed18cc38a27a4ca2f548c32e1d88b
-SIZE (jazztickets-irrlamb-v1.0.3_GH0.tar.gz) = 39972048
-SHA256 (jazztickets-cmake-6e3586a_GH0.tar.gz) = 2f25931465584c783c1d357a9c544a46cea2d23a147ccb5519ace726723f101f
-SIZE (jazztickets-cmake-6e3586a_GH0.tar.gz) = 10818
+TIMESTAMP = 1715015043
+SHA256 (irrlamb/code-v1.0.3.tar.bz2) = 14775ba5b4f9e558fdb2c6ea3ef55a754fa9ffdc8a43ca260eab580d71d1027f
+SIZE (irrlamb/code-v1.0.3.tar.bz2) = 38458585
+SHA256 (irrlamb/jazztickets-cmake-486362ce74eaf6b26067576a8b6b03dcad27a7a5_GL0.tar.gz) = 9f80e2f8ed0526c039c7d5a4545c550fd7b5f37e96409c88525f08da6ae82ff1
+SIZE (irrlamb/jazztickets-cmake-486362ce74eaf6b26067576a8b6b03dcad27a7a5_GL0.tar.gz) = 10388
diff --git a/games/irrlamb/files/patch-cmake_version.cmake b/games/irrlamb/files/patch-cmake_version.cmake
index d17193d0026a..e9fc35da0787 100644
--- a/games/irrlamb/files/patch-cmake_version.cmake
+++ b/games/irrlamb/files/patch-cmake_version.cmake
@@ -1,11 +1,14 @@
---- cmake/version.cmake.orig	2017-10-13 23:15:05 UTC
+--- cmake/version.cmake.orig	2022-09-29 21:46:35 UTC
 +++ cmake/version.cmake
-@@ -1,7 +1,4 @@
--execute_process(COMMAND git log --oneline COMMAND wc -l OUTPUT_VARIABLE BUILD_NUMBER OUTPUT_STRIP_TRAILING_WHITESPACE)
--if(BUILD_NUMBER STREQUAL "")
--	set(BUILD_NUMBER 0)
--endif()
-+set(BUILD_NUMBER 0)
+@@ -1,9 +1,7 @@
+-execute_process(COMMAND git rev-parse --short HEAD RESULT_VARIABLE RETURN_CODE OUTPUT_VARIABLE BUILD_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
++set(BUILD_VERSION 0)
  
- configure_file(
- 	"${SRC}"
+-if(RETURN_CODE EQUAL 0)
+ 	configure_file(
+ 		"${SRC}"
+ 		"${DST}"
+ 		@ONLY
+ 	)
+-endif()
+\ No newline at end of file
diff --git a/games/irrlamb/pkg-plist b/games/irrlamb/pkg-plist
new file mode 100644
index 000000000000..d4ec0a977376
--- /dev/null
+++ b/games/irrlamb/pkg-plist
@@ -0,0 +1,4 @@
+bin/irrlamb
+share/applications/irrlamb.desktop
+share/icons/hicolor/256x256/apps/irrlamb.png
+share/metainfo/irrlamb.xml