From nobody Fri May 12 16:10:46 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QHtzB3hjkz4BB78; Fri, 12 May 2023 16:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QHtzB3Ghkz4H2K; Fri, 12 May 2023 16:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683907846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6ZirZFPw7KV81nefp9pQBfl/PkgBG/4AqMs4Ir0x8o=; b=d7t9a7m4i7/rHztddFSMFzs2d9dLefayKVIr5uisx735RByCRHi3XF4zQFw5IhrC6iIcAm CrrXorvPfBMc8wP+UVp+WYyn1ZbRPoOMRYJITVh6niLHaJPsn/mgc6/Ogcd84r/yDNg06q HTGvLrL43lHaeBmyQRAP76n4yhR4zFGrfO3w4GCwjik0DzGuPXwp8Nr7omvRp7TIl1gtow RXFVl5LipmMrmo+TwGII03hLqMEKcpfRrPfoXGIwLItsySZFA/LJSKkZVC6amCacjOBNdU ygvDUioLqnW7cTHIU+NXGvCifAtMo1pBZwZ4o6ZAuYvBqkxEjl4rGUiJchBXtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683907846; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h6ZirZFPw7KV81nefp9pQBfl/PkgBG/4AqMs4Ir0x8o=; b=ndtjLBi41qOUak1Sd3ajuHS+4zQ+Ov6ob3bN75HChHmitNyaErU9L8GSP1N6Eb/XGI7m3N HEgOrMwqN8AU0wl3yMbC8pB3PBm+g2x5XMFJKonjP6wDWm+hWsFRLWVgswLGfYLnGAQA9Z d6AoGPOJB92TmAguWSDzt55MyXsX01r+GvZ9Frx4X2X1Hl7tZGYxly4Gxaq+OwZZr9k6oH VXfADUOHgrm0YOebviO7k7HqJK5eHVgmo18y3FW+x45S4T3fOsqBwU6BgUw6x9+DEHXnUi UKd/0n+q42W2kC0nQvgZBLS1DyDC9RikYxsJTacHjokqHHTAnSWoixgzdjE+FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683907846; a=rsa-sha256; cv=none; b=FLAZFw7UcSwF9gw3IWrpIFlmaPJPheI2qMjmPIIgl1JEVI7I4V6hpoSckMJi/t3SXDlZfT nc47tKBTO9j7hHr76qBIL9vXt29RJ3dcUPu8sRKRQjXM7t1qRC431mOLJg5i0wjvYgkex/ kJvdcnL4bKcJcObACRCmLi8cj7vw6sDlklw0u6jM4ankEKtf3jJrffA4A7EMAa13S1LtiP 2TPsC8Bpto6eiTn6+ZdLr/AIcSUX5fcNlwI+2Wr5YzBkszv7Rc+j9b1rbeSGAuLh8q0h3l rNZUiPDUdiz1xt8XF9bd3t/gpQ9YhZQCCPWcshOc0YwBr/CWSLwzwBUmQiIaKg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QHtzB2KBwzhm8; Fri, 12 May 2023 16:10:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34CGAkNc005878; Fri, 12 May 2023 16:10:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34CGAk0C005877; Fri, 12 May 2023 16:10:46 GMT (envelope-from git) Date: Fri, 12 May 2023 16:10:46 GMT Message-Id: <202305121610.34CGAk0C005877@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 0d230a0c701a - main - =?utf-8?Q?games/apricots:=20update=200.2.7=20=E2=86=92=200.2.8?= List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d230a0c701a110e0b05b7e31f653bb31a9a72a5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0d230a0c701a110e0b05b7e31f653bb31a9a72a5 commit 0d230a0c701a110e0b05b7e31f653bb31a9a72a5 Author: Dmitry Marakasov AuthorDate: 2023-05-12 15:25:22 +0000 Commit: Dmitry Marakasov 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;