git: 0d230a0c701a - main - games/apricots: update 0.2.7 → 0.2.8

The branch main has been updated by amdmi3:

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

commit 0d230a0c701a110e0b05b7e31f653bb31a9a72a5
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2023-05-12 15:25:22 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2023-05-12 16:08:50 +0000

    games/apricots: update 0.2.7 → 0.2.8
---
 games/apricots/Makefile                      | 10 ++++------
 games/apricots/distinfo                      |  6 +++---
 games/apricots/files/patch-apricots_all.cpp  | 11 -----------
 games/apricots/files/patch-apricots_init.cpp | 20 --------------------
 4 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/games/apricots/Makefile b/games/apricots/Makefile
index b2e523b6ff2d..432111896780 100644
--- a/games/apricots/Makefile
+++ b/games/apricots/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	apricots
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.7
+DISTVERSION=	0.2.8
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -10,7 +10,9 @@ WWW=		https://github.com/moggers87/apricots
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		autoreconf compiler:c++17-lang gmake openal:al,alut sdl
+LIB_DEPENDS=	libalure.so:audio/alure
+
+USES=		autoreconf compiler:c++17-lang gmake openal:al sdl
 USE_GITHUB=	yes
 GH_ACCOUNT=	moggers87
 GNU_CONFIGURE=	yes
@@ -23,10 +25,6 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(pkgdatadir)|$${DESTDIR}&|' \
-		${WRKSRC}/apricots/Makefile.am
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/contrib/apricots.desktop \
 		${STAGEDIR}${PREFIX}/share/applications/
diff --git a/games/apricots/distinfo b/games/apricots/distinfo
index 75d359814103..2b075b3e7a34 100644
--- a/games/apricots/distinfo
+++ b/games/apricots/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1647376396
-SHA256 (moggers87-apricots-v0.2.7_GH0.tar.gz) = 82b993f5f0a3ed0f3b0e07a11bc955cd175b3738eb66769c01d0e1faacb5a44c
-SIZE (moggers87-apricots-v0.2.7_GH0.tar.gz) = 330430
+TIMESTAMP = 1683899226
+SHA256 (moggers87-apricots-v0.2.8_GH0.tar.gz) = 5d1f1dfdd6ddcfa7dab537760b0df5f86fe9c8dbca89dd7a0692083555e476bc
+SIZE (moggers87-apricots-v0.2.8_GH0.tar.gz) = 331943
diff --git a/games/apricots/files/patch-apricots_all.cpp b/games/apricots/files/patch-apricots_all.cpp
deleted file mode 100644
index 78fd8236158e..000000000000
--- a/games/apricots/files/patch-apricots_all.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- apricots/all.cpp.orig	2021-02-12 23:45:58 UTC
-+++ apricots/all.cpp
-@@ -18,7 +18,7 @@ int wrap(int n, int min, int max) { return ((((n - min
- 
- // Sign function
- 
--inline int sign(int n) { return (0 < n) - (n < 0); }
-+int sign(int n) { return (0 < n) - (n < 0); }
- 
- // Error message for switch statements that shouldn't ever get to default
- 
diff --git a/games/apricots/files/patch-apricots_init.cpp b/games/apricots/files/patch-apricots_init.cpp
deleted file mode 100644
index 8e6e3353ef0f..000000000000
--- a/games/apricots/files/patch-apricots_init.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- apricots/init.cpp.orig	2021-02-12 23:45:58 UTC
-+++ apricots/init.cpp
-@@ -219,7 +219,7 @@ void init_gameconstants(gamedata &g) {
- 
- string getConfig(string config, string name, string defval) {
-   // Pull out just the name line
--  unsigned int ndx = config.find(name);
-+  size_t ndx = config.find(name);
- 
-   if (ndx == string::npos) {
-     return defval;
-@@ -240,7 +240,7 @@ string getConfig(string config, string name, string de
- 
- int getConfig(string config, string name, int defval, int min, int max) {
-   // Pull out just the name line
--  unsigned int ndx = config.find(name);
-+  size_t ndx = config.find(name);
- 
-   if (ndx == string::npos) {
-     return defval;