misc: handle multiple default patch.pre_args

See: macports/macports-base#321
macports · May 12, 2024 · ecaaceb · ecaaceb
1 parent 2d1cadf
commit ecaaceb
Show file tree

Hide file tree

Showing 253 changed files with 262 additions and 260 deletions.
diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile
@@ -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

diff --git a/R/R-fs/Portfile b/R/R-fs/Portfile
@@ -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
 

diff --git a/R/R-httpuv/Portfile b/R/R-httpuv/Portfile
@@ -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
 

diff --git a/R/R-s2/Portfile b/R/R-s2/Portfile
@@ -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 \

diff --git a/R/R-winch/Portfile b/R/R-winch/Portfile
@@ -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 \

diff --git a/aqua/Platypus/Portfile b/aqua/Platypus/Portfile
@@ -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

diff --git a/aqua/alacritty/Portfile b/aqua/alacritty/Portfile
@@ -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

diff --git a/aqua/input-leap/Portfile b/aqua/input-leap/Portfile
@@ -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
 

diff --git a/aqua/pinentry-mac/Portfile b/aqua/pinentry-mac/Portfile
@@ -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.

diff --git a/aqua/sequelpro-devel/Portfile b/aqua/sequelpro-devel/Portfile
@@ -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

diff --git a/aqua/yubico-authenticator/Portfile b/aqua/yubico-authenticator/Portfile
@@ -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}|" \

diff --git a/archivers/unzip/Portfile b/archivers/unzip/Portfile
@@ -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 \

diff --git a/audio/audacity-legacy/Portfile b/audio/audacity-legacy/Portfile
@@ -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

diff --git a/audio/audiofile/Portfile b/audio/audiofile/Portfile
@@ -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

diff --git a/audio/beets/Portfile b/audio/beets/Portfile
@@ -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 {}

diff --git a/audio/cdparanoia/Portfile b/audio/cdparanoia/Portfile
@@ -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

diff --git a/audio/id3lib/Portfile b/audio/id3lib/Portfile
@@ -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
diff --git a/audio/phonon-backend-vlc/Portfile b/audio/phonon-backend-vlc/Portfile
@@ -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

diff --git a/audio/rnnoise/Portfile b/audio/rnnoise/Portfile
@@ -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'

diff --git a/cross/msp430-binutils-devel/Portfile b/cross/msp430-binutils-devel/Portfile
@@ -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

diff --git a/cross/msp430-binutils/Portfile b/cross/msp430-binutils/Portfile
@@ -24,7 +24,7 @@ checksums           ${name}-${version}.patch \
                     rmd160  de5ce1d7cb0d44e3ec18c557beefb2a292d59a60 \
                     sha256  cdecfa69f02aa7b05fbcdf678e33137151f361313b2f3e48aba925f64eabf654
 
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 
 configure.args-append \
                     --with-mpfr-include=${prefix}/include \

diff --git a/cross/msp430-gcc-devel/Portfile b/cross/msp430-gcc-devel/Portfile
@@ -42,7 +42,7 @@ depends_lib-append      port:msp430-binutils-devel
 
 depends_run             port:msp430mcu-devel
 
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 
 # TODO: Why? Ticket URL?
 compiler.blacklist      *clang*

diff --git a/cross/msp430-gcc/Portfile b/cross/msp430-gcc/Portfile
@@ -40,7 +40,7 @@ checksums           msp430-gcc-4.6.3-20120406.patch \
 
 depends_run         port:msp430mcu
 
-patch.pre_args      -p1
+patch.pre_args-replace  -p0 -p1
 
 # see https://trac.macports.org/ticket/57153
 # see https://github.com/macports/macports-ports/pull/3329

diff --git a/cross/msp430-gdb-devel/Portfile b/cross/msp430-gdb-devel/Portfile
@@ -53,7 +53,7 @@ patchfiles              ${name_common}-${version}-${epoch}.patch \
 configure.args          --target=${name_target} \
                         --disable-Werror
 
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 
 build.env-append        CFLAGS=-I${prefix}/include
 configure.env-append    CFLAGS=-I${prefix}/include

diff --git a/cross/msp430-gdb/Portfile b/cross/msp430-gdb/Portfile
@@ -50,7 +50,7 @@ patchfiles              ${name}-${version}.patch \
 configure.args          --target=${name_target} \
                         --disable-Werror
 
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 
 build.env-append        CFLAGS=-I${prefix}/include
 configure.env-append    CFLAGS=-I${prefix}/include

diff --git a/cross/msp430-libc/Portfile b/cross/msp430-libc/Portfile
@@ -40,7 +40,7 @@ checksums               msp430-libc-20120224-sf3522752.patch \
                         rmd160  209f52ea4c38d617bad2052ae7f27db7299e91a8 \
                         sha256  b67a33881aa6b456c5c99dea5ea655892455fde1317d5bda818e9c6ee34a3f82
 
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 
 
 use_configure           no

diff --git a/cross/msp430mcu/Portfile b/cross/msp430mcu/Portfile
@@ -37,7 +37,7 @@ checksums               msp430mcu-20120406-sf3522088.patch \
 
 destroot.violate_mtree  yes
 
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 
 use_configure           no
 

diff --git a/cross/stlink/Portfile b/cross/stlink/Portfile
@@ -27,7 +27,7 @@ depends_lib-append      path:lib/pkgconfig/libusb-1.0.pc:libusb \
                         port:pkgconfig
 
 # stlink static-links to libusb, which needs Security
-patch.pre_args          -p1
+patch.pre_args-replace  -p0 -p1
 patchfiles              patch-stlink-libusb-Security-framework.diff
 
 variant gui description "Enable st-link GUI" {

diff --git a/databases/mariadb-10.0/Portfile b/databases/mariadb-10.0/Portfile
@@ -35,7 +35,7 @@ if {$subport eq $name} {
     description         Multithreaded SQL database server
     long_description    Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
 
-    patch.pre_args      -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-CMakeLists.txt.diff
 

diff --git a/databases/mariadb-10.1/Portfile b/databases/mariadb-10.1/Portfile
@@ -45,7 +45,7 @@ if {$subport eq $name} {
     cmake.out_of_source yes
     use_parallel_build  yes
 
-    patch.pre_args      -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-CMakeLists.txt.diff
 

diff --git a/databases/mariadb-10.10/Portfile b/databases/mariadb-10.10/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.11/Portfile b/databases/mariadb-10.11/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.2/Portfile b/databases/mariadb-10.2/Portfile
@@ -97,7 +97,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.3/Portfile b/databases/mariadb-10.3/Portfile
@@ -97,7 +97,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.4/Portfile b/databases/mariadb-10.4/Portfile
@@ -143,7 +143,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.5/Portfile b/databases/mariadb-10.5/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.6/Portfile b/databases/mariadb-10.6/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.7/Portfile b/databases/mariadb-10.7/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.8/Portfile b/databases/mariadb-10.8/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb-10.9/Portfile b/databases/mariadb-10.9/Portfile
@@ -202,7 +202,7 @@ if {$subport eq $name} {
             ${cmake.build_dir}/macports/
     }
 
-    patch.pre_args -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles     patch-cmake-install_layout.cmake.diff \
                    patch-CMakeLists.txt.diff \
                    patch-libmariadb_cmake_install.cmake.diff \

diff --git a/databases/mariadb/Portfile b/databases/mariadb/Portfile
@@ -43,7 +43,7 @@ if {$subport eq $name} {
     cmake.out_of_source yes
     use_parallel_build  yes
 
-    patch.pre_args      -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles          patch-cmake-install_layout.cmake.diff \
                         patch-CMakeLists.txt.diff \
                         patch-mariadb-Ventura-and-arm64.diff

diff --git a/databases/mysql5/Portfile b/databases/mysql5/Portfile
@@ -53,7 +53,7 @@ if {${name} eq ${subport}} {
         path:lib/libssl.dylib:openssl \
         port:tcp_wrappers
 
-    patch.pre_args      -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles          patch-Makefile.in.diff \
                         patch-scripts-mysql_secure_installation.sh.diff
 

diff --git a/databases/mysql51/Portfile b/databases/mysql51/Portfile
@@ -41,7 +41,7 @@ if {${subport} eq ${name}} {
     distname            mysql-${version}
     use_parallel_build  yes
 
-    patch.pre_args      -p1
+    patch.pre_args-replace  -p0 -p1
     patchfiles          patch-Makefile.in.diff \
                         patch-scripts-mysql_secure_installation.sh.diff