git: 6c9b5ed09d3c - 2024Q1 - devel/hyprlang: update to 0.3.0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Wed, 21 Feb 2024 16:05:23 UTC
The branch 2024Q1 has been updated by jbeich:

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

commit 6c9b5ed09d3cf6c87a5c967789479e405ee2c9ed
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-02-09 20:30:26 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-02-21 16:04:54 +0000

    devel/hyprlang: update to 0.3.0
    
    Changes:        https://github.com/hyprwm/hyprlang/releases/tag/v0.3.0
    Reported by:    GitHub (watch releases)
    
    (cherry picked from commit 0fe941b4c27b527d9249e42c4a84cdda7997811a)
---
 devel/hyprlang/Makefile                   |  7 +++---
 devel/hyprlang/distinfo                   |  6 +++---
 devel/hyprlang/files/patch-CMakeLists.txt | 36 -------------------------------
 x11/hyprpaper/Makefile                    |  2 +-
 x11/xdg-desktop-portal-hyprland/Makefile  |  1 +
 5 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/devel/hyprlang/Makefile b/devel/hyprlang/Makefile
index c67f2d34f8d0..9983449d4777 100644
--- a/devel/hyprlang/Makefile
+++ b/devel/hyprlang/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	hyprlang
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.1
-PORTREVISION=	1
+DISTVERSION=	0.3.0
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -21,7 +20,9 @@ USE_LDCONFIG=	yes
 GH_ACCOUNT=	hyprwm
 PLIST_FILES=	include/${PORTNAME}.hpp \
 		lib/lib${PORTNAME}.so \
-		share/pkgconfig/${PORTNAME}.pc
+		lib/lib${PORTNAME}.so.${PORTVERSION:R:R} \
+		lib/lib${PORTNAME}.so.${PORTVERSION} \
+		libdata/pkgconfig/${PORTNAME}.pc
 
 # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01
 .if exists(/usr/include/c++/v1/__format/format_functions.h) && \
diff --git a/devel/hyprlang/distinfo b/devel/hyprlang/distinfo
index ac63b443fb3f..1794c16e5005 100644
--- a/devel/hyprlang/distinfo
+++ b/devel/hyprlang/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1704233442
-SHA256 (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = e41b265f09c1e84e03f052f584fcc086fe48ec5057191ef35917ce79e7dc4190
-SIZE (hyprwm-hyprlang-v0.2.1_GH0.tar.gz) = 61006
+TIMESTAMP = 1707510626
+SHA256 (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 6355ae011b1d9d77f95d435fd79582a547cf08db3c0189f2a4ed0a6a25d9b4a1
+SIZE (hyprwm-hyprlang-v0.3.0_GH0.tar.gz) = 61520
diff --git a/devel/hyprlang/files/patch-CMakeLists.txt b/devel/hyprlang/files/patch-CMakeLists.txt
deleted file mode 100644
index c4b6e2e698e6..000000000000
--- a/devel/hyprlang/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/hyprwm/hyprlang/issues/6
-https://github.com/hyprwm/hyprlang/issues/7
-https://github.com/hyprwm/hyprlang/issues/11
-
---- CMakeLists.txt.orig	2024-01-02 22:10:42 UTC
-+++ CMakeLists.txt
-@@ -2,7 +2,8 @@ set(PREFIX ${CMAKE_INSTALL_PREFIX})
- 
- set(HYPRLANG_VERSION "0.2.1")
- set(PREFIX ${CMAKE_INSTALL_PREFIX})
--set(INCLUDE ${CMAKE_INSTALL_INCLUDEDIR})
-+include(GNUInstallDirs)
-+set(INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR})
- 
- project(hyprlang
-     VERSION ${HYPRLANG_VERSION}
-@@ -31,16 +32,16 @@ target_link_libraries(hyprlang_test PRIVATE hyprlang)
- 
- add_executable(hyprlang_test "tests/parse/main.cpp")
- target_link_libraries(hyprlang_test PRIVATE hyprlang)
--add_test(NAME "Parsing" WORKING_DIRECTORY "../tests/" COMMAND hyprlang_test "parse")
-+add_test(NAME "Parsing" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests/" COMMAND hyprlang_test "parse")
- add_dependencies(tests hyprlang_test)
- 
- add_executable(hyprlang_fuzz "tests/fuzz/main.cpp")
- target_link_libraries(hyprlang_fuzz PRIVATE hyprlang)
--add_test(NAME "Fuzz" WORKING_DIRECTORY "../tests/" COMMAND hyprlang_fuzz "fuzz")
-+add_test(NAME "Fuzz" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/tests/" COMMAND hyprlang_fuzz "fuzz")
- add_dependencies(tests hyprlang_fuzz)
- 
- # Installation
- install(TARGETS hyprlang
-         PUBLIC_HEADER DESTINATION include
-         LIBRARY DESTINATION lib)
--install(FILES build/hyprlang.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig)
-+install(FILES ${CMAKE_BINARY_DIR}/hyprlang.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pkgconfig)
diff --git a/x11/hyprpaper/Makefile b/x11/hyprpaper/Makefile
index deecc3bddb07..1baa03be2d79 100644
--- a/x11/hyprpaper/Makefile
+++ b/x11/hyprpaper/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	hyprpaper
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile
index 64407e6055df..486c2b6ead14 100644
--- a/x11/xdg-desktop-portal-hyprland/Makefile
+++ b/x11/xdg-desktop-portal-hyprland/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	xdg-desktop-portal-hyprland
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	x11 wayland
 
 MAINTAINER=	jbeich@FreeBSD.org