From nobody Sun Feb 26 16:14:54 2023 X-Original-To: dev-commits-ports-all@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 4PPpcb193nz3tlff; Sun, 26 Feb 2023 16:14:55 +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 4PPpcb0Xyyz3rMP; Sun, 26 Feb 2023 16:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677428095; 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=2I+OLU0YC6eounLf3HDJAuFslIbg9BIllGGPSVaNaeQ=; b=ocarEzcT/j3YCFj9zvQSY7rexs8XYxTEDzifndNtjuUWmDa8aA9iynVt9rbd3frXv+gtBy Cv7cKBhNcRnDtx3/6HbNp/yCwgpu/jezbpX3Wm48x7+iogbchtKR2hGc5UtVV04ty/RXOx YERj3DQehDNx60qAW5Ge6arhKAUhKeBff7ak8CMOnXHsB961KkzPs+RVJoVJkErkTF8ysR alWGcRleItU+1ZTUeITwu9XhTrCqHt1eT3LmfJhdgAyE+OXMHtoQc04VlgKbfpINSUveZG jncJnaB3PVUWGfrIxBhkDEkTxFtD7TA/UguoJ1isITIGiqNtNbnk+hVl+RfOTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677428095; 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=2I+OLU0YC6eounLf3HDJAuFslIbg9BIllGGPSVaNaeQ=; b=ZyK9B6NBIw35poS9AP3H9yU44bus6F5pxRO2AaT9ZY4tmtLF6abNH4uhQsaT+jmwOnHvhf BP+xywB5Lp5gLUKv6AsoHpI03XuV/0lCeOT5nD4UQEx8HzDyER5mJ5RX0DlVJk2SG0X8oh gFX9+cGAy2xeNmjMpWugfXWaTyL8k5cMSze91w7AnAYg6GlzV1d5byK8GPQbm1o0CQG3yr SBNYsB6nH2B48TOmBP39HrNDP4kOZo814CwAbgxWcj3z4Hl6GrLIPBD8fi1+P6aGTu/MX+ re9txdkiB+y3apu6aEMvPLnG2Kv6afVtltrCsZSw+TKKSyR3NqRVZ8QBMWPNAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677428095; a=rsa-sha256; cv=none; b=d4IHcfus9azd37M+3rioDbWjx+yinABR52gWrQoG7LZHVRlvPncj8mh/qqSBqcnUU/K7g+ X5+gI40vvUoZmmF0XC5DW7l63ypfkMaMmVkbNZDaxTIejt7oNaPvOjosY0FOuNJFsvQkak kUIPOCtgCq4ZkOgmrO4oBiht76JnuKTNJ8YokgwIM/dOQ9veNcKgaqcZE0dpMYGU2ZJw1p UhMzI0RmDoadDW/9aS3boS29MnTBrwzbMijpwTKVN/YojidpwIinaNGg5H4vnP6wMNw3Xs LxUplZWw5m8ykbB5D0XmwRFD4t2Zy8POjnETR6yw0jPu1QEojA0Q8tNw/IEKHA== 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 4PPpcZ6j3FzrYq; Sun, 26 Feb 2023 16:14:54 +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 31QGEs2d072267; Sun, 26 Feb 2023 16:14:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31QGEseD072266; Sun, 26 Feb 2023 16:14:54 GMT (envelope-from git) Date: Sun, 26 Feb 2023 16:14:54 GMT Message-Id: <202302261614.31QGEseD072266@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: a0edaf8ce55e - main - games/scummvm: Simplify Makefile List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a0edaf8ce55e5841ec0f15fccae12059ffd3d0b5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0edaf8ce55e5841ec0f15fccae12059ffd3d0b5 commit a0edaf8ce55e5841ec0f15fccae12059ffd3d0b5 Author: Kai Knoblich AuthorDate: 2023-02-26 16:13:02 +0000 Commit: Kai Knoblich CommitDate: 2023-02-26 16:13:02 +0000 games/scummvm: Simplify Makefile * Add "USES=localbase" to get rid of the configure parameters that contain ${LOCALBASE}. * Remove the patch for the configure script, which is no longer needed. * Pet portclippy as well. * No bump of PORTREVISION as the resulting package doesn't change. --- games/scummvm/Makefile | 21 +++------------------ games/scummvm/files/patch-configure | 13 ------------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index a13e1edef097..98f7fee88309 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -21,11 +21,12 @@ LIB_DEPENDS= liba52.so:audio/liba52 \ libtheoradec.so:multimedia/libtheora \ libvorbis.so:audio/libvorbis -USES= compiler:c++11-lang cpe gl gmake gnome iconv jpeg pkgconfig sdl tar:xz +USES= compiler:c++11-lang cpe gl gmake gnome iconv jpeg \ + localbase:ldflags pkgconfig sdl tar:xz USE_GL= gl glew -HAS_CONFIGURE= yes USE_SDL= sdl2 +HAS_CONFIGURE= yes CONFIGURE_ARGS= --disable-alsa \ --disable-debug \ --disable-fluidlite \ @@ -33,13 +34,6 @@ CONFIGURE_ARGS= --disable-alsa \ --disable-nasm \ --disable-tremor \ --enable-verbose-build \ - --with-a52-prefix=${LOCALBASE} \ - --with-jpeg-prefix=${LOCALBASE} \ - --with-mad-prefix=${LOCALBASE} \ - --with-ogg-prefix=${LOCALBASE} \ - --with-png-prefix=${LOCALBASE} \ - --with-sdl-prefix=${LOCALBASE} \ - --with-vorbis-prefix=${LOCALBASE} \ --with-zlib-prefix=/usr LDFLAGS+= -lpthread @@ -54,25 +48,20 @@ TTS_DESC= Text-to-Speech support XENGINES_DESC= Experimental/Unstable engine support CURL_LIB_DEPENDS= libcurl.so:ftp/curl -CURL_CONFIGURE_ON= --with-libcurl-prefix=${LOCALBASE} CURL_CONFIGURE_OFF= --disable-libcurl FLAC_LIB_DEPENDS= libFLAC.so:audio/flac -FLAC_CONFIGURE_ON= --with-flac-prefix=${LOCALBASE} FLAC_CONFIGURE_OFF= --disable-flac FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth -FLUIDSYNTH_CONFIGURE_ON= --with-fluidsynth-prefix=${LOCALBASE} FLUIDSYNTH_CONFIGURE_OFF= --disable-fluidsynth GIF_LIB_DEPENDS= libgif.so:graphics/giflib -GIF_CONFIGURE_ON= --with-gif-prefix=${LOCALBASE} GIF_CONFIGURE_OFF= --disable-gif MT32EMU_CONFIGURE_OFF= --disable-mt32emu SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -SNDIO_CONFIGURE_ON= --with-sndio-prefix=${LOCALBASE} SNDIO_CONFIGURE_OFF= --disable-sndio TTS_LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher @@ -88,10 +77,6 @@ XENGINES_CONFIGURE_OFF= --disable-all-unstable-engines CONFIGURE_ENV+= ASFLAGS=-meabi=5 .endif -post-patch: - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/configure - post-install: ${INSTALL_DATA} ${WRKSRC}/dists/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} diff --git a/games/scummvm/files/patch-configure b/games/scummvm/files/patch-configure deleted file mode 100644 index bab2273a9ea8..000000000000 --- a/games/scummvm/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig 2023-02-13 22:19:22 UTC -+++ configure -@@ -3019,8 +3019,8 @@ EOF - fi - ;; - freebsd* | dragonfly*) -- append_var LDFLAGS "-L/usr/local/lib" -- append_var CXXFLAGS "-I/usr/local/include" -+ append_var LDFLAGS "-L%%LOCALBASE%%/lib" -+ append_var CXXFLAGS "-I%%LOCALBASE%%/include" - ;; - gamecube) - _optimization_level=-Os