From nobody Tue Nov 30 07:03:11 2021 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 1820018BC226; Tue, 30 Nov 2021 07:03:12 +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 4J3Cq35zXvz3FBK; Tue, 30 Nov 2021 07:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 AD2E512015; Tue, 30 Nov 2021 07:03:11 +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 1AU73B6k094306; Tue, 30 Nov 2021 07:03:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AU73BXZ094305; Tue, 30 Nov 2021 07:03:11 GMT (envelope-from git) Date: Tue, 30 Nov 2021 07:03:11 GMT Message-Id: <202111300703.1AU73BXZ094305@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: 9fe58b6dc350 - main - games/trenchbroom: unbreak the build on recent -CURRENT (Clang 13.0.0) 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fe58b6dc350c0b46483b64875cab5dfd43331db Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638255791; 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=WpjIPiBZcsTFisY+gDr+kaNPv998IGP5Q1zDqnd708E=; b=hpZzL4768j5iukVjiUvQPH0pLrnYpDpWNYqR7uQyQnxJiiKLEvLTV1GvmcQIkNW0/SeIad eOdMHOkhukIG91sICZ1lSiypK4bh79L4jR/ubYcXZss4gf0fSHMzmkP5wos4FydG0RYL0g nmVKUcFba8q3s9WIhrQwJFSurpJ0qepdISCRoLhRHBtSmACvtMEApVwR61rqGzGd7yBSEa TfnQRpnS/KVaetLNWYggpgrn6Z8WzNvWO21L1j9OuvZkpd5lWh+PCK0kJMIHp+tm/f4815 0IZXPz4qS2WZO5+Lt/rPX0ALg+g2Pi8JAxur+JaA+iaJnMRj9RKPVzGB87KBmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638255791; a=rsa-sha256; cv=none; b=P5WNXRng7IPwJvf56v0j9gDEswJZNe9rTidz1cW95znolOHdiNNsvEeVg1/gNIv/e9pzzM 6mgaqKeOEcZLAsbyAQ7sRfF43JUioBNV6qli3jO13GmjFHSrIL9/Och6HIJVkziwCQM9w5 6J84n4FZgvneb8ljVs5os+kmntGMjSfFuADZOiR43T9bVgHUwrHrEOhypcIWDosgPpHKiF cS8zuxLp/znkiOdWsDvebwmXcLkbF0qmA2DAyGodftlm9iUcijMTamBX4io1QIFZ7Dl8sq vnRpNtykRDWgWnVagHfLUR8Iz3qab2efk02rfdw0PIeNenfWDUe3lNAWUk9Phg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fe58b6dc350c0b46483b64875cab5dfd43331db commit 9fe58b6dc350c0b46483b64875cab5dfd43331db Author: Alexey Dokuchaev AuthorDate: 2021-11-30 07:02:18 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-11-30 07:02:18 +0000 games/trenchbroom: unbreak the build on recent -CURRENT (Clang 13.0.0) common/src/SharedPointer.h:28:10: fatal error: 'tr1/memory' file not found #include ^~~~~~~~~~~~ While here, register explicit dependency on the `print/freetype2' port per stage Q/A report. Reported by: pkg-fallout --- games/trenchbroom/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/games/trenchbroom/Makefile b/games/trenchbroom/Makefile index 31cad862435a..602ec6f66d48 100644 --- a/games/trenchbroom/Makefile +++ b/games/trenchbroom/Makefile @@ -1,6 +1,6 @@ # Created by: Alexey Dokuchaev -PORTNAME= trenchbroom +PORTNAME= ${GH_PROJECT:tl} PORTVERSION= 2.0.0.b PORTREVISION= 11 CATEGORIES= games cad @@ -10,7 +10,8 @@ COMMENT= Cross-platform level editor for Quake-engine based games LICENSE= GPLv3 -LIB_DEPENDS= libfreeimage.so:graphics/freeimage +LIB_DEPENDS= libfreeimage.so:graphics/freeimage \ + libfreetype.so:print/freetype2 USE_GITHUB= yes GH_ACCOUNT= kduske @@ -27,6 +28,8 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS post-patch: + @${REINPLACE_CMD} -e 's,_MSC_VER,__${OPSYS}__,' \ + ${WRKSRC}/common/src/SharedPointer.h @${GREP} -Rl --null std::tr1:: ${WRKSRC}/common/src | ${XARGS} -0 \ ${REINPLACE_CMD} -e 's,std::tr1::,std::,g' @${REINPLACE_CMD} -e 's,Build ,&Type: ,' \