From nobody Sun Jul 28 14:03:58 2024 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 4WX3BR270pz5SF3b; Sun, 28 Jul 2024 14:03:59 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WX3BR1KpFz4b6X; Sun, 28 Jul 2024 14:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722175439; 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=40jWBJd3CcHuKsUL/DjJqnq/tdQfKEvyb+l72hsSuTw=; b=XZFGgcSQxDkSKPZnOAPUuBSiIvglCN+DPZVex7aw67riZJRrMLMPhRAt4gfpcqlXu/DMNC Yqi3uYi0FR5vIy8vKlmSF3lvCWd4cIrRZq/WMQJvCOCdAQOmZLKnYJnW0RmQmXyouLAyLJ d18nBoIjaDtftfq1InLhSRJgCZSoyYIvFMrSOM5IhNEtVbWF0hBPdB3KnT+YkpKpnzodWN noakUNv/nqsSS8XfMyqo6Qbi29nJzlaC65c1RTMzZEHWb2PURVjjHjPbA+F4NZyBXtazZy +EVkV4rmna5ubNflCEo8Tz8cjSj7gx5cvHNiGptCGHnXdFy8s9twaqz0x3dOKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722175439; a=rsa-sha256; cv=none; b=pTT9zf14fnl0Xa2KhDB+IYw9LE9zz2EdLJdHdNddwjIokNt/vXAERhNU1cZ2tybW6rageF Feh/+lvZCWOopvKUoMHLPeB8kIhmduxjCooOXPMpsUmiTO8wf95xG6oujPwUPqDuYxJPnp hMC7K+dm/uMBxecvcyOZFC+3RCvT0osMMaMzLzdgpqBVwW1VyAEUb4jAFqNILYHgMF4cu8 xzMpkw2F9ef6KRKD3HQkst7bWztxltfVMDTnrMv/Nt98lsQpTH2KpjmaqDB8PqSx86f3AZ XTYbMGD4WF44jUQauHVZFrte2QcPVz4Aiap7DsLDb2w7bmkgmviC9WsLZswiqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722175439; 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=40jWBJd3CcHuKsUL/DjJqnq/tdQfKEvyb+l72hsSuTw=; b=j6/IL7S8xL9YY8ZvVj2p03U/AQFKRLkNSuy7xXSoFJf1sVXBAFk0GlOFbljj23N9geGCaX zkg04x+hC0vrGWcBJ1tl9j613J1c2wqWYojYCTSibYAiW3PMXP+HhrsUrj2+LAxfOC4Dop XWJN5QVXFfQ5+jf6aNj9NPhs5pQpbZ/K14PmGtu1FVpzCrCvmIt5z4mFx4iEvcarECfeC7 ja9nm0bkc+QBRVMbTUv3AlsvQwTnuZwD30Ykkr/O7TpiNoieETUV0pBRMKr/T0TAszGSYF sCUv5lCF9VUqaBQEJtsgxZVYX/lnBIXT4aJ71Iuv3IlxVdOPZECdr6/MpT3MoQ== 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 4WX3BR0d8GztkQ; Sun, 28 Jul 2024 14:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46SE3wxY007493; Sun, 28 Jul 2024 14:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46SE3w0l007490; Sun, 28 Jul 2024 14:03:58 GMT (envelope-from git) Date: Sun, 28 Jul 2024 14:03:58 GMT Message-Id: <202407281403.46SE3w0l007490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: d3dfac6f1848 - main - games/palomino: attempt to unbreak and thus undeprecate the port 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3dfac6f1848d1564fae3876e593013232abdac6 Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3dfac6f1848d1564fae3876e593013232abdac6 commit d3dfac6f1848d1564fae3876e593013232abdac6 Author: Alexey Dokuchaev AuthorDate: 2024-07-28 14:02:04 +0000 Commit: Alexey Dokuchaev CommitDate: 2024-07-28 14:02:04 +0000 games/palomino: attempt to unbreak and thus undeprecate the port Drop explicit types from the `std::make_pair' template argument lists when they inhibit type deduction and compiler thus cannot find viable candidate function template. While here, shorten one regex which was making the line overly long so it did not fit standard terminal width. --- games/palomino/Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/games/palomino/Makefile b/games/palomino/Makefile index e806426174c8..7d2609bae5a7 100644 --- a/games/palomino/Makefile +++ b/games/palomino/Makefile @@ -15,9 +15,6 @@ WWW= https://www.palomino3d.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE_GNU_GPL_2.txt -BROKEN= fails to compile: no matching function for call to 'make_pair' -DEPRECATED= Abandonware, unmaintained and fails to build -EXPIRATION_DATE=2024-08-21 LIB_DEPENDS= libosg.so:graphics/osg34 @@ -64,7 +61,7 @@ post-patch: @${REINPLACE_CMD} -e 's|string sDataDir|&="${DATADIR}/data/"|'\ ${WRKSRC}/src/base/conf.cc - @${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|"scripts"|"${DATADIR}/scripts"|' \ + @${REINPLACE_CMD} -e '/LUABIND_SCRIPTS_DIR/ s|scripts|${DATADIR}/&|' \ ${WRKSRC}/src/lua_bind/defs.hh @${REINPLACE_CMD} -e 's|doc/html/|${DOCSDIR}/|' ${WRKSRC}/src/gui/gui.cc @@ -77,6 +74,19 @@ post-patch: ${WRKSRC}/src/hud/hud.hh \ ${WRKSRC}/src/hud/hud_text.cc + @${REINPLACE_CMD} -e '/std::make_pair/ s,<.*>,,' \ + ${WRKSRC}/src/collision/collision.cc \ + ${WRKSRC}/src/fx/image_cache.cc \ + ${WRKSRC}/src/graph/model_cache.cc \ + ${WRKSRC}/src/hud/font.cc \ + ${WRKSRC}/src/lua_bind/lua.cc \ + ${WRKSRC}/src/object/dyna.cc \ + ${WRKSRC}/src/sky/sky.cc \ + ${WRKSRC}/src/sky/sky_dome.cc \ + ${WRKSRC}/src/sky/sky_dome.hh \ + ${WRKSRC}/src/sky/sun.hh \ + ${WRKSRC}/src/sound/sound_base.cc + post-patch-SDL-off: @${REINPLACE_CMD} -e '/COMPILE_WITH_SDL/ d' ${WRKSRC}/CMakeLists.txt