From nobody Mon Jul 24 11:29:48 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 4R8dHK0lFLz4nYSN; Mon, 24 Jul 2023 11:29:49 +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 4R8dHJ5sm9z4DM1; Mon, 24 Jul 2023 11:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690198188; 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=veOSKNE9iQkBNGRl0gA0wU10qz2lxpRe682i3rqIH+s=; b=k6SX46YcW/zPNDXNWcyoxtVZAgeXBjj5i2M97nVnoyW44Mu9SS3Ql7ssynDJ/7nYq6VvZU Pu7Tdlqit/dm1gnDB0ocM7wNCec57Q2aKAjQIQcABajPB9gGd6xuoQ/voQiib71RmUfCGt +IzsO+ukLYNrIrsiLCzwOfr9wNBfFQB0p+tQt7UBNlyXF9BeVs7vwT1qQh/EWI8A3Rx6+h 7R+xfoj8f9pChf916P9mKvM73ZSLB4lTGgSh46IbkX2AkJjvmVvbgP2G8wgrGuysYD8wh1 FA+5U/yluPP3j2D2oQzifTgt8EBTY9oSkxzo5JSv9oq8noxBx6hU4+F3jEbujQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690198188; 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=veOSKNE9iQkBNGRl0gA0wU10qz2lxpRe682i3rqIH+s=; b=QOFK80+130EA/jZRBJHCEJv4fi01xjZt0L4/7t79/N7sD/Sy5zzML1iFccHss+QTVH7f3S q414CZgJ6J7HK4ZZaUw9f2WVFc4p/MvhtIK756q/l68H88Y/v4g6c+D1KvNg5ByjJhkpS4 Mv0y4EkStQSuGmICTFLfuCvNrjF6zwFVjpF+cmE78Zg6VgkSFFC/u9Df5TRH+skRIi5cZa 2HjBnEp503Lmgdv+PQqaYNuHZC2h/f0CO7v8IlJ/53ZZ43vk+14+sxO8Qn3UfG0BRHFUW8 PV8bVszg2HRCnj1Sbm8OGYHKmYxoAUY870eN1AujnqqQX0l9XkKDJIfrpdsW5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690198188; a=rsa-sha256; cv=none; b=rW2+6sY5M1LDs5CnHCZYsmP/LrECuFtxwoKPSTYLinQi/BKTXmtjHwWEw929zYa08C+wbK +hUGM9bZbOblh+eYGpEsCLh+wQ0d9rj+YH8YQzhI7xxy3f85+W0maAML+YpOBz1xCssBk7 YLX7l5HYeYjQRf7dcftGnvTPRb8aK2YzfssGRleZFeqZFAekSgZrBLzMzH0AbGw82kFEVi uuVKwZ51scL/Q2nDYJ8NWWoE+7WvYPHs7sl8rMRT8y6AyWG9sGFjtmEczug+PJRHskhFyc FaCJCBknaL398EgmuhChJ+HPaGP+9VTXlCQYrf26wnap+AYy08Q+cA3gDZ5Ngg== 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 4R8dHJ4qLMzGBn; Mon, 24 Jul 2023 11:29:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36OBTmve048985; Mon, 24 Jul 2023 11:29:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36OBTmM6048984; Mon, 24 Jul 2023 11:29:48 GMT (envelope-from git) Date: Mon, 24 Jul 2023 11:29:48 GMT Message-Id: <202307241129.36OBTmM6048984@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando=20Apestegu=C3=ADa?= Subject: git: 99db2990f1de - main - emulators/dosbox: fix build with llvm16 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: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99db2990f1de8e37da59ba06d3570425636361ca Auto-Submitted: auto-generated The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=99db2990f1de8e37da59ba06d3570425636361ca commit 99db2990f1de8e37da59ba06d3570425636361ca Author: Fernando ApesteguĂ­a AuthorDate: 2023-07-23 17:14:30 +0000 Commit: Fernando ApesteguĂ­a CommitDate: 2023-07-24 11:29:26 +0000 emulators/dosbox: fix build with llvm16 Undefine 'register' keyword. PR: 272659 Reported by: Trond.Endrestol@ximalas.info --- emulators/dosbox/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index 61a22bec3ed4..6edeb5a531e2 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -36,6 +36,11 @@ DEBUGGER_HEAVY_DESC=Enable internal debugger with extra features DEBUGGER_ENABLE_CONFIGURE_ON= --enable-debug=yes DEBUGGER_HEAVY_CONFIGURE_ON= --enable-debug=heavy +.include +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400091 +CPPFLAGS+= -Dregister= +.endif + post-patch: @${REINPLACE_CMD} -e 's#\/usr\/share\/doc\/dosbox#${DOCSDIR}#g' \ ${WRKSRC}/docs/dosbox.1