From nobody Mon Dec 05 09:38:22 2022 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 4NQdlM2q3pz4jBw2; Mon, 5 Dec 2022 09:38:23 +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 4NQdlM14sSz4StZ; Mon, 5 Dec 2022 09:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670233103; 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=iEjQOIj6/YPrgmYtEdCBuQnliSAbxttcBJcU1BKT750=; b=Ydl6V5+Q9Y8t63JIGmg9la8w6m3SXlEoLLYXA1Y56Ip1YsftbsJUBzx06aHwszVC2XN3aC vL5xIno/RA7y1/JOWSFYvqz6veJx87be/zC746PM0YmXg++OvFeJAa4fUcunb7U8Ba2Oef uHwhkgmWmVq5o39/HcJYZmO+qBGCKi3OEl+TjmTZDb4NAfCiUAtmNSif4P9QsMHNueZ9U0 bDpDUcsSj+oq+2a9MqtUCYjZhRfHELedCOgdfdhCPueAkMLKxQ+hmQf7cxGie9FNWxZ6GW QwlYrLHnSX1Oq4ATMrO3HG7jdpH/Uq24RHMoVjATd+jbkoAyX60i+6NRvFzh5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670233103; 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=iEjQOIj6/YPrgmYtEdCBuQnliSAbxttcBJcU1BKT750=; b=wx9Z+GUg5EI5MzQbLz4R9wsTjeQxrH3TmY6tyafKlx5tbxouwjNuOVOFj2+ABGdJ/B18ql pJgzG+4StpyALiHXmu2ohCJJS02Z6BC6z8l9HQq4/iQIC6IlqgooZ1H9AruQ9Z79WYgj9S I33tf6CUBbAd8H6GEneyCbQP6BdOrFo9A9Mqs4/7tbwUsH681RNIIKIp6ZgObVHiKK61Uv Ph8UMAgAqtNkAnc352hPZzofI9VY3xDy+omsv9aBLmd+xtUhOo9QcA8E8wHbtoOhRmnaye 6brYXCF8UYvZ8PhTJ3IxzcxFFhcvpdh4jxvmn3/4MeifOOb4d6DC2x+d66wQ0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670233103; a=rsa-sha256; cv=none; b=XrQZ1A7CqNQ0G88gQAz7uIJpllMI5Rf3GhXeGN6nw2UR2guSqjTFP+TbpP3FBBTL4p+Prp uH2M4D8MDhVoDxLAqiZ9xXjuVF8u//leMwUbX4P3GfN1GlVr6aSNOos5/QVJn19HuUyraV NCikSAcG2hmjFYCvvyEA63Fbb+/aWEiaW3H5sTo85bRcRJkf9dojCVzEg4v0xffNp3Xr4h otyQ/oi7Pwnh90ZaIgHfU0X30srsfjFcnsbEKO3IVHjVlUmxVme25NDvnKlV39G0KdYIzv 4LUlVsvzeMGG57TdmGslz3Gf898K3BqLSEk1R4CIrU/4dz0tVsTreyhcseg5NA== 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 4NQdlL6zkRzs1P; Mon, 5 Dec 2022 09:38:22 +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 2B59cMRO042230; Mon, 5 Dec 2022 09:38:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B59cMmk042229; Mon, 5 Dec 2022 09:38:22 GMT (envelope-from git) Date: Mon, 5 Dec 2022 09:38:22 GMT Message-Id: <202212050938.2B59cMmk042229@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: 8674ebc2a72d - main - emulators/qmc2: Fix build on systems <13.x: SDL.h not found 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: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8674ebc2a72d77bca1d4fc1438a6b986184e7c75 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=8674ebc2a72d77bca1d4fc1438a6b986184e7c75 commit 8674ebc2a72d77bca1d4fc1438a6b986184e7c75 Author: Alastair Hogge AuthorDate: 2022-12-05 09:34:49 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-05 09:37:53 +0000 emulators/qmc2: Fix build on systems <13.x: SDL.h not found * Update ${RUN_DEPENDS} to reflect current mame/mess versions * Add two more files to ${SHEBANG_FILES} * Add ${EXTRA_PATCHES} conditional to compensate for missing \S Special Expression support in GNU grep on system <13.x (if that is even the problem) * Add files/extra-scripts-sdl-includepaths to patch ${WRKSRC}/scripts/sdl-includepath.sh PR: 267980 --- emulators/qmc2/Makefile | 11 +++++++++-- emulators/qmc2/files/extra-scripts-sdl-includepaths | 9 +++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/emulators/qmc2/Makefile b/emulators/qmc2/Makefile index 158ec864d5c3..ff82da9026e7 100644 --- a/emulators/qmc2/Makefile +++ b/emulators/qmc2/Makefile @@ -1,6 +1,7 @@ PORTNAME= qmc2 PORTVERSION= 0.243 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= emulators games MAINTAINER= agh@riseup.net @@ -12,8 +13,8 @@ LICENSE= GPLv2+ BUILD_DEPENDS= bash>0:shells/bash \ gawk>0:lang/gawk RUN_DEPENDS= libglvnd>0:graphics/libglvnd \ - mame>=0.249:emulators/mame \ - mess>=0.249:emulators/mess + mame>=0.250:emulators/mame \ + mess>=0.250:emulators/mess USES= compiler:c++11-lang desktop-file-utils gmake gl qt:5 sdl \ shebangfix tar:bzip2 xorg @@ -28,8 +29,10 @@ USE_SDL= sdl2 USE_XORG= x11 xmu SHEBANG_FILES= scripts/cleanup-category-ini.sh \ + scripts/generate-option-lists.sh \ scripts/make-man-pages.sh \ scripts/plugin_helper.sh \ + scripts/romalyzer.pl \ scripts/sdl-defines.sh \ scripts/sdl-includepath.sh \ scripts/sdl-libs.sh \ @@ -59,6 +62,10 @@ DOCS_PORTDOCS= html .include +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 +EXTRA_PATCHES= ${PATCHDIR}/extra-scripts-sdl-includepaths +.endif + post-patch: @${REINPLACE_CMD} -e 's|DATADIR/qmc2|${DATADIR}|g' \ ${WRKSRC}/inst/*.template diff --git a/emulators/qmc2/files/extra-scripts-sdl-includepaths b/emulators/qmc2/files/extra-scripts-sdl-includepaths new file mode 100644 index 000000000000..dde0e2d190d0 --- /dev/null +++ b/emulators/qmc2/files/extra-scripts-sdl-includepaths @@ -0,0 +1,9 @@ +--- scripts/sdl-includepath.sh.orig 2022-12-03 08:13:04 UTC ++++ scripts/sdl-includepath.sh +@@ -26,5 +26,5 @@ fi + fi + fi + fi +-echo $SDL_CFLAGS | egrep -o -e "\\-I\\S+" | sed -e 's/^-I//' ++echo $SDL_CFLAGS | egrep -o -e "-I[^[:space:]]+" | sed -e 's/^-I//' + exit 0