Date: Sun, 26 Feb 2023 16:14:54 GMT From: Kai Knoblich <kai@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a0edaf8ce55e - main - games/scummvm: Simplify Makefile Message-ID: <202302261614.31QGEseD072266@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=a0edaf8ce55e5841ec0f15fccae12059ffd3d0b5 commit a0edaf8ce55e5841ec0f15fccae12059ffd3d0b5 Author: Kai Knoblich <kai@FreeBSD.org> AuthorDate: 2023-02-26 16:13:02 +0000 Commit: Kai Knoblich <kai@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302261614.31QGEseD072266>