Date: Sun, 24 Nov 2024 11:53:00 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 33610ebde0d5 - main - Remove remnant comments/code after f99a708957bd Message-ID: <202411241153.4AOBr0J7095635@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=33610ebde0d5033268c2f299084331aba133324e commit 33610ebde0d5033268c2f299084331aba133324e Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-11-24 11:30:45 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-11-24 11:52:42 +0000 Remove remnant comments/code after f99a708957bd PR: 280305 --- audio/amberol/Makefile | 1 - audio/gnome-metronome/Makefile | 1 - audio/gnome-podcasts/Makefile | 1 - audio/mousai/Makefile | 1 - audio/shortwave/Makefile | 1 - deskutils/health/Makefile | 1 - deskutils/solanum/Makefile | 1 - multimedia/helvum/Makefile | 1 - multimedia/kooha/Makefile | 1 - multimedia/video-trimmer/Makefile | 1 - security/authenticator/Makefile | 1 - x11/squeekboard/files/patch-cargo__build.py | 21 --------------------- x11/xdg-desktop-portal-luminous/Makefile | 1 - 13 files changed, 33 deletions(-) diff --git a/audio/amberol/Makefile b/audio/amberol/Makefile index 49c9a731e8c2..d76fd39b4485 100644 --- a/audio/amberol/Makefile +++ b/audio/amberol/Makefile @@ -30,7 +30,6 @@ GLIB_SCHEMAS= io.bassi.Amberol.gschema.xml post-patch: # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/audio/gnome-metronome/Makefile b/audio/gnome-metronome/Makefile index 50f42da1b9db..a16bf6e16c81 100644 --- a/audio/gnome-metronome/Makefile +++ b/audio/gnome-metronome/Makefile @@ -29,7 +29,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/audio/gnome-podcasts/Makefile b/audio/gnome-podcasts/Makefile index c302a279f9e9..98b7afe9d12e 100644 --- a/audio/gnome-podcasts/Makefile +++ b/audio/gnome-podcasts/Makefile @@ -37,7 +37,6 @@ post-patch: -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/${PORTNAME}-gtk/src/meson.build diff --git a/audio/mousai/Makefile b/audio/mousai/Makefile index 10afffcfb7f1..e80b3bedc7ba 100644 --- a/audio/mousai/Makefile +++ b/audio/mousai/Makefile @@ -32,7 +32,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/audio/shortwave/Makefile b/audio/shortwave/Makefile index 99830e2df238..b67757bc8f92 100644 --- a/audio/shortwave/Makefile +++ b/audio/shortwave/Makefile @@ -39,7 +39,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/data/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/deskutils/health/Makefile b/deskutils/health/Makefile index 4652096ce4a7..857dd803962f 100644 --- a/deskutils/health/Makefile +++ b/deskutils/health/Makefile @@ -35,7 +35,6 @@ CARGO_ENV+= CARGO_PROFILE_RELEASE_LTO=false post-patch: # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/deskutils/solanum/Makefile b/deskutils/solanum/Makefile index c84cd5060fca..86f9bad3faaa 100644 --- a/deskutils/solanum/Makefile +++ b/deskutils/solanum/Makefile @@ -29,7 +29,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/multimedia/helvum/Makefile b/multimedia/helvum/Makefile index 46054a52a15f..dcb657c00b1a 100644 --- a/multimedia/helvum/Makefile +++ b/multimedia/helvum/Makefile @@ -35,7 +35,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/multimedia/kooha/Makefile b/multimedia/kooha/Makefile index f704f7832709..d366e0dcd8ad 100644 --- a/multimedia/kooha/Makefile +++ b/multimedia/kooha/Makefile @@ -29,7 +29,6 @@ post-patch: @${REINPLACE_CMD} -e '/update_desktop_database/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/multimedia/video-trimmer/Makefile b/multimedia/video-trimmer/Makefile index d80425464c4b..6f96ba91a660 100644 --- a/multimedia/video-trimmer/Makefile +++ b/multimedia/video-trimmer/Makefile @@ -28,7 +28,6 @@ GLIB_SCHEMAS= org.gnome.gitlab.YaLTeR.VideoTrimmer.gschema.xml post-patch: # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e '/cargo/s/ --/&verbose&verbose&/' \ ${WRKSRC}/build-aux/cargo.sh diff --git a/security/authenticator/Makefile b/security/authenticator/Makefile index 0e6fce0aae0a..8446457ac030 100644 --- a/security/authenticator/Makefile +++ b/security/authenticator/Makefile @@ -33,7 +33,6 @@ post-patch: @${REINPLACE_CMD} -e '/gstreamer.*bad/d' \ ${WRKSRC}/meson.build # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo @${REINPLACE_CMD} -e "/cargo_options =/s/ '--/&verbose', &verbose', &/" \ ${WRKSRC}/src/meson.build diff --git a/x11/squeekboard/files/patch-cargo__build.py b/x11/squeekboard/files/patch-cargo__build.py deleted file mode 100644 index 280b53ef7d7e..000000000000 --- a/x11/squeekboard/files/patch-cargo__build.py +++ /dev/null @@ -1,21 +0,0 @@ -Add explicit <triple> subdir for --target from USES=cargo - ---- cargo_build.py.orig 2021-09-10 16:56:00 UTC -+++ cargo_build.py -@@ -6,6 +6,7 @@ instead of the source tree. - """ - - from pathlib import Path -+import os - import shlex - import subprocess - import sys -@@ -43,7 +44,7 @@ if out_path: - out_basename = out_path.name - filename = filename or out_basename - subprocess.run(['cp', '-a', -- './{}/{}'.format(binary_dir, filename), -+ os.path.join('.', binary_dir, filename), - out_path], - check=True) - diff --git a/x11/xdg-desktop-portal-luminous/Makefile b/x11/xdg-desktop-portal-luminous/Makefile index cd4ec8a415be..8f85dc3aa4b4 100644 --- a/x11/xdg-desktop-portal-luminous/Makefile +++ b/x11/xdg-desktop-portal-luminous/Makefile @@ -34,7 +34,6 @@ post-patch: ${WRKSRC_crate_clang-sys}/build/common.rs \ ${WRKSRC_crate_clang-sys}/src/support.rs # Make each cargo subcommand very verbose -# Add explicit <triple> subdir for --target from USES=cargo # Adjust for CARGO_TARGET_DIR outside of meson.global_source_root() @${REINPLACE_CMD} -e "s/'build',/ & '--verbose', '--verbose',/" \ -e "s,'target','..' / & ," \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411241153.4AOBr0J7095635>