misc: handle multiple default patch.pre_args

See: https://github.com/macports/macports-base/pull/321
2026-07-12 18:20:25 -07:00 · 2024-05-13 05:50:06 +10:00
parent 2d1cadf169
commit ecaaceb301
253 changed files with 262 additions and 260 deletions
@@ -15,7 +15,7 @@ checksums           rmd160  988c8b20fc31ac86c1d16ec54973b2c1c3f9b207 \
                    sha256  f9c30eb9ce1abffc590825d513d6d28dcbe970e36032dd7521febf04e905b29c \
                    size    1629119

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          0001-Fix-macos.inc.patch \
                    0002-proxy_overload-for-10.7.patch \
                    0003-patch-tbb-arch.diff
@@ -26,7 +26,7 @@ checksums           rmd160  c7699268f4880310863af76a1eb990752caa109d \
                    sha256  7e06290f2dbe36f54fdf51b748a4b00b8b0f68967b5754e37e0c83df7fea5ac8 \
                    size    1201506

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          0001-fs-fix-libuv-for-10.7.patch \
                    0002-core.c-patch-close_nocancel.patch

@@ -33,7 +33,7 @@ depends_lib-append  port:R-later \
                    port:R-promises \
                    port:zlib

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          0001-libuv-fix-for-older-macOS.patch \
                    0002-core.c-patch-close_nocancel.patch

@@ -20,7 +20,7 @@ checksums           rmd160  f8e1b4d685a12a67f218c0949a3146d3e63d5b81 \
 depends_lib-append  port:R-Rcpp \
                    port:R-wk

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          0001-Misc-PPC-additions.patch \
                    0002-examine_stack.cc-fix-ppc-for-macOS.patch \
                    0003-Some-PPC-fix-ups.patch \
@@ -19,7 +19,7 @@ depends_lib-append  port:R-lifecycle \
                    port:R-procmaps

 # Use these sources: https://github.com/ianlancetaylor/libbacktrace
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          0001-macho.c-update-to-a-more-complete-source.patch

 depends_test-append port:R-DBI \
@@ -51,7 +51,7 @@ patchfiles          0001-Remove-install-CLI-tool.patch \
                    0002-Remove-Sparkle.patch \
                    0003-Remove-uninstall-feature.patch

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 post-patch {
    reinplace "s|/usr/local|${prefix}|" ${worksrcpath}/CLT/man/platypus.1 ${worksrcpath}/Common.h
@@ -32,7 +32,6 @@ depends_build-append \

 variant nerdfont description {Use Nerd Font Symbols as default fallback} {
    patchfiles              crossfont-nerd-symbols.patch
-    patch.pre_args          -p0
 }

 set al_app_name     Alacritty.app
@@ -25,7 +25,7 @@ checksums           rmd160  4577bf1dcfb3ecdb100a1d9a3a324acbc3b13ce7 \
 patchfiles          set-cmake-revision.patch \
                    remove-gtest.patch \
                    fix-macos-scroll.patch
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 compiler.cxx_standard 2014

@@ -30,7 +30,7 @@ patchfiles              patch-includes-quotes.diff \
                        patch-includes-quotes-2.diff \
                        patch-apple-silicon.diff

-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1

 # This is a temporary kludge. The new Xcode build system fails to
 # destroot this for reasons that are poorly understood.
@@ -42,7 +42,7 @@ supported_archs     i386 x86_64

 patchfiles          0001-Remove-Sparkle-and-auto-update.patch

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 xcode.scheme        "Sequel Pro"
 xcode.configuration Release
@@ -49,7 +49,7 @@ if { ${os.platform} eq "darwin" && (( ${os.major} >= 15 && ${os.major} <= 16 ) |
 qt5.min_version     5.7

 patchfiles          0001-Remove-pip-installation-for-packaging-in-MacPorts.patch
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 post-patch {
    reinplace "s|PYTHON_CMD = python3|PYTHON_CMD = ${python.bin}|" \
@@ -28,7 +28,7 @@ checksums           rmd160  48af66606e9472e45fbb94bc4e285da23d1b89ba \
                    size    1376845

 # Add Debian patches
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles \
    01-manpages-in-section-1-not-in-section-1l.patch \
    04-handle-pkware-verification-bit.patch \
@@ -150,7 +150,8 @@ if {${os.arch} ne "arm"} {
 }
 # audacity could use port:lv2 and port:lilv but would also require a port:suil for that to be possible.

-patch.pre_args      -Np1
+patch.pre_args-append   -N
+patch.pre_args-replace  -p0 -p1

 # address issues in the build system:
 # - build and link VSTControlOSX.mm instead of the GTk interface
@@ -27,7 +27,7 @@ depends_build       port:pkgconfig
 depends_lib         port:flac

 patchfiles          search-werror.patch
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 use_autoreconf      yes
 autoreconf.args     -fvi
@@ -374,7 +374,7 @@ subport ${name}-follow {
                    sha256  e1dd35c3ea1cf8c3f5893fa3b49f3fd2f1c1c230e05f5fa0bf03b805a9eea39a \
                    size    4145

-    patch.pre_args  -p1
+    patch.pre_args-replace  -p0 -p1
    patchfiles      follow-confuse.diff

    depends_lib-append \
@@ -477,7 +477,7 @@ subport ${name}-moveall {
                    sha256  e055b07c5f5072cacb5c8858b009918b7542fa968964b4133bfc821ccc6f8a9d \
                    size    8110

-    patch.pre_args  -p1
+    patch.pre_args-replace  -p0 -p1
    patchfiles      moveall-2to3.diff

    build {}
@@ -47,7 +47,7 @@ patchfiles      osx_interface.patch \
                fixing-labs.patch \
                fixing-fprintf.patch \
                configure.in.patch
-patch.args -p1
+patch.pre_args-replace  -p0 -p1

 post-patch {
    move ${worksrcpath}/configure.guess ${worksrcpath}/config.guess
@@ -32,7 +32,7 @@ patchfiles         automake.patch \
                   no-iomanip.h.patch \
                   id3lib-linking-zlib.patch

-patch.pre_args     -p1
+patch.pre_args-replace  -p0 -p1

 use_autoreconf     yes
 autoreconf.args    -fvi
@@ -42,7 +42,8 @@ if {[variant_exists vlc2] && [variant_isset vlc2]} {
    configure.pkg_config_path-append "${prefix}/libexec/vlc3/lib/pkgconfig"
 }

-patch.pre_args      -Np1
+patch.pre_args-append   -N
+patch.pre_args-replace  -p0 -p1

 subport ${name}-qt5 {
    set qt5.prefer_kde 1
@@ -24,7 +24,7 @@ long_description    RNNoise is a noise suppression library based \
                    on a recurrent neural network.

 # https://github.com/xiph/rnnoise/issues/222
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles          patch-372f7b4b76cde4ca1ec4605353dd17898a99de38.diff

 # vec_avx.h:171:9: error: unknown type name '__m256i'
@@ -26,7 +26,7 @@ checksums           ${name_package}-${version}.patch \
                    rmd160  34cebe4cdca9480d5dc6f6b00b052c48c8ac30dc \
                    sha256  6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9

-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1

 configure.args-append \
 					--disable-werror
--- a/Show More
+++ b/Show More