From ecaaceb301205f2e1e8008d15c6f44b4cb4ba4a7 Mon Sep 17 00:00:00 2001 From: Joshua Root Date: Mon, 13 May 2024 05:50:06 +1000 Subject: [PATCH] misc: handle multiple default patch.pre_args See: https://github.com/macports/macports-base/pull/321 --- R/R-RcppParallel/Portfile | 2 +- R/R-fs/Portfile | 2 +- R/R-httpuv/Portfile | 2 +- R/R-s2/Portfile | 2 +- R/R-winch/Portfile | 2 +- aqua/Platypus/Portfile | 2 +- aqua/alacritty/Portfile | 1 - aqua/input-leap/Portfile | 2 +- aqua/pinentry-mac/Portfile | 2 +- aqua/sequelpro-devel/Portfile | 2 +- aqua/yubico-authenticator/Portfile | 2 +- archivers/unzip/Portfile | 2 +- audio/audacity-legacy/Portfile | 3 ++- audio/audiofile/Portfile | 2 +- audio/beets/Portfile | 4 ++-- audio/cdparanoia/Portfile | 2 +- audio/id3lib/Portfile | 2 +- audio/phonon-backend-vlc/Portfile | 3 ++- audio/rnnoise/Portfile | 2 +- cross/msp430-binutils-devel/Portfile | 2 +- cross/msp430-binutils/Portfile | 2 +- cross/msp430-gcc-devel/Portfile | 2 +- cross/msp430-gcc/Portfile | 2 +- cross/msp430-gdb-devel/Portfile | 2 +- cross/msp430-gdb/Portfile | 2 +- cross/msp430-libc/Portfile | 2 +- cross/msp430mcu/Portfile | 2 +- cross/stlink/Portfile | 2 +- databases/mariadb-10.0/Portfile | 2 +- databases/mariadb-10.1/Portfile | 2 +- databases/mariadb-10.10/Portfile | 2 +- databases/mariadb-10.11/Portfile | 2 +- databases/mariadb-10.2/Portfile | 2 +- databases/mariadb-10.3/Portfile | 2 +- databases/mariadb-10.4/Portfile | 2 +- databases/mariadb-10.5/Portfile | 2 +- databases/mariadb-10.6/Portfile | 2 +- databases/mariadb-10.7/Portfile | 2 +- databases/mariadb-10.8/Portfile | 2 +- databases/mariadb-10.9/Portfile | 2 +- databases/mariadb/Portfile | 2 +- databases/mysql5/Portfile | 2 +- databases/mysql51/Portfile | 2 +- databases/mysql55-connector-cpp/Portfile | 2 +- databases/mysql55/Portfile | 2 +- databases/mysql56/Portfile | 2 +- databases/mysql57/Portfile | 2 +- databases/mysql8/Portfile | 2 +- databases/mysql81/Portfile | 2 +- databases/mysql82/Portfile | 2 +- databases/rocksdb/Portfile | 2 +- databases/timescaledb1/Portfile | 2 +- databases/tokyocabinet-java/Portfile | 2 +- devel/absent/Portfile | 2 +- devel/bazel/Portfile | 2 +- devel/bsdiff/Portfile | 2 +- devel/bzr-fastimport/Portfile | 2 +- devel/capstone/Portfile | 2 +- devel/checkmake/Portfile | 2 +- devel/clucene/Portfile | 2 +- devel/creduce/Portfile | 2 +- devel/git-extras/Portfile | 2 +- devel/git-filter-repo/Portfile | 2 +- devel/git-when-merged/Portfile | 2 +- devel/git/Portfile | 2 +- devel/icmake/Portfile | 2 +- devel/jsoncpp/Portfile | 2 +- devel/kchmviewer/Portfile | 3 ++- devel/kitten/Portfile | 2 +- devel/ldid/Portfile | 2 +- devel/libcmis/Portfile | 2 +- devel/libcoverart/Portfile | 2 +- devel/libfmt8/Portfile | 2 +- devel/libunwind/Portfile | 2 +- devel/libzookeeper/Portfile | 2 +- devel/log4cxx/Portfile | 2 +- devel/mach_override/Portfile | 2 +- devel/mercurial/Portfile | 2 +- devel/mhash/Portfile | 2 +- devel/mico/Portfile | 2 +- devel/mpir/Portfile | 4 ++-- devel/mstch/Portfile | 2 +- devel/porg/Portfile | 2 +- devel/premake5/Portfile | 2 +- devel/qca/Portfile | 3 ++- devel/qcachegrind/Portfile | 2 +- devel/treecc/Portfile | 2 +- devel/unibilium/Portfile | 2 +- devel/xmlrpc-c/Portfile | 2 +- devel/xmlrpcxx/Portfile | 3 ++- devel/zeroc-ice34/Portfile | 3 +-- devel/zeroc-ice35/Portfile | 3 +-- devel/zmq/Portfile | 4 ++-- editors/HexFiend/Portfile | 2 +- editors/ee/Portfile | 2 +- editors/liteide/Portfile | 2 +- editors/ne/Portfile | 2 +- editors/xemacs/Portfile | 2 +- emulators/free42/Portfile | 2 +- finance/abtransfers/Portfile | 2 +- fuse/sshfs/Portfile | 2 +- games/galaxis/Portfile | 2 +- games/greed/Portfile | 2 +- games/nethack/Portfile | 2 +- games/ufo-ai/Portfile | 2 +- gnome/gom/Portfile | 2 +- gnome/gstreamer010-gst-plugins-ugly/Portfile | 2 +- gnome/libunique/Portfile | 2 +- graphics/grafx2/Portfile | 2 +- graphics/imageindex/Portfile | 2 +- graphics/ipe/Portfile | 2 +- graphics/jbig2enc/Portfile | 2 +- graphics/xfractint/Portfile | 2 +- graphics/xpdf/Portfile | 2 +- irc/hexchat/Portfile | 2 +- java/drip/Portfile | 2 +- java/openjdk19/Portfile | 2 +- kde/kde-extra-cmake-modules/Portfile | 4 +++- kde/kdelibs4/Portfile | 2 +- kde/konversation/Portfile | 2 +- lang/algol-68rs/Portfile | 2 +- lang/clang-11-bootstrap/Portfile | 2 +- lang/fort77/Portfile | 2 +- lang/fpc/Portfile | 2 +- lang/janet/Portfile | 2 +- lang/libcxx-powerpc/Portfile | 2 +- lang/libcxx/Portfile | 1 - lang/llvm-10/Portfile | 2 +- lang/llvm-11/Portfile | 2 +- lang/llvm-12/Portfile | 2 +- lang/llvm-13/Portfile | 2 +- lang/llvm-14/Portfile | 2 +- lang/llvm-15/Portfile | 2 +- lang/llvm-16/Portfile | 2 +- lang/llvm-17/Portfile | 2 +- lang/llvm-18/Portfile | 2 +- lang/llvm-3.3/Portfile | 2 +- lang/llvm-3.4/Portfile | 2 +- lang/llvm-3.7/Portfile | 2 +- lang/llvm-5.0/Portfile | 2 +- lang/llvm-6.0/Portfile | 2 +- lang/llvm-7.0/Portfile | 2 +- lang/llvm-8.0/Portfile | 2 +- lang/llvm-9.0/Portfile | 2 +- lang/llvm-devel/Portfile | 2 +- lang/mrustc/Portfile | 2 +- lang/nhc98/Portfile | 2 +- lang/php/Portfile | 2 +- lang/polyml/Portfile | 2 +- lang/ruby-devel/Portfile | 2 +- lang/v8-8.3/Portfile | 2 +- mail/alpine/Portfile | 2 +- mail/dovecot/Portfile | 2 +- mail/sqlgrey/Portfile | 2 +- math/AlphaSparse/Portfile | 2 +- math/fftw/Portfile | 2 +- math/hptt/Portfile | 2 +- math/levmar/Portfile | 2 +- math/meschach/Portfile | 2 +- math/orpie/Portfile | 2 +- math/sprng/Portfile | 2 +- math/xgraph/Portfile | 2 +- math/yices/Portfile | 2 +- multimedia/HandBrake/Portfile | 2 +- multimedia/hdhomerun_gui/Portfile | 2 +- multimedia/transcode/Portfile | 2 +- net/hdhomerun/Portfile | 2 +- net/ngrep/Portfile | 2 +- net/openconnect-sso/Portfile | 2 +- net/openssh/Portfile | 2 +- net/pkixssh/Portfile | 2 +- net/rsync-hfscomp/Portfile | 2 +- net/rsync/Portfile | 2 +- net/tcpick/Portfile | 2 +- net/tcptrace/Portfile | 2 +- net/wifi-password/Portfile | 2 +- net/wol/Portfile | 2 +- news/pan2/Portfile | 2 +- ocaml/ocaml-core_unix/Portfile | 2 +- ocaml/ocaml-ocaml_intrinsics/Portfile | 2 +- office/libreoffice/Portfile | 2 +- palm/m68k-palm-elf-gcc/Portfile | 2 +- perl/eperl/Portfile | 2 +- print/lcdf-typetools/Portfile | 2 +- print/woff2/Portfile | 2 +- python/py-awscli2/Portfile | 2 +- python/py-hyperestraier/Portfile | 1 - python/py-ligo-gracedb/Portfile | 2 +- python/py-mysql/Portfile | 2 +- python/py-pmw/Portfile | 2 +- python/py-pylibelf/Portfile | 2 +- python/py-pyopencl/Portfile | 2 +- python/py-svipc/Portfile | 2 +- python/py-tensorflow1/Portfile | 2 +- python/py-terminaltables/Portfile | 2 +- python/py-unittest2/Portfile | 2 +- python/py-zeroc-ice35/Portfile | 2 +- python/py27-scipy/Portfile | 2 +- python/thefuck/Portfile | 2 +- science/PothosAudio/Portfile | 2 +- science/PothosCore/Portfile | 2 +- science/ds9/Portfile | 2 +- science/gildas/Portfile | 2 +- science/gr-cdma/Portfile | 2 +- science/gr-gsm/Portfile | 2 +- science/gr-lora/Portfile | 2 +- science/gr-ofdm/Portfile | 2 +- science/libad9361-iio/Portfile | 2 +- science/madness/Portfile | 2 +- science/miriad/Portfile | 2 +- science/openbabel/Portfile | 2 +- science/osmocore/Portfile | 2 +- science/root6/Portfile | 2 +- science/rsp_tcp/Portfile | 2 +- science/rtl-sdr/Portfile | 2 +- science/source-extractor/Portfile | 2 +- science/uhd/Portfile | 6 +++--- security/oath-toolkit/Portfile | 2 +- security/opensc/Portfile | 2 +- sysutils/chntpw/Portfile | 2 +- sysutils/gkrellm/Portfile | 2 +- sysutils/mmv/Portfile | 2 +- sysutils/optool/Portfile | 2 +- sysutils/pv/Portfile | 2 +- sysutils/squashfs-tools/Portfile | 2 +- sysutils/synkron/Portfile | 2 +- sysutils/watchman/Portfile | 2 +- tex/makejvf/Portfile | 2 +- tex/tetex-frogg/Portfile | 2 +- textproc/docbook-utils/Portfile | 2 +- textproc/enchant/Portfile | 2 +- textproc/gpsbabel/Portfile | 2 +- textproc/libe-book/Portfile | 2 +- textproc/sgml-common/Portfile | 2 +- textproc/syck/Portfile | 2 +- textproc/tcl-dox/Portfile | 2 +- www/apache2/Portfile | 2 +- www/mod_fcgid/Portfile | 2 +- www/raptor2/Portfile | 2 +- www/redland/Portfile | 2 +- www/tenfourfox/Portfile | 2 +- www/urlview/Portfile | 2 +- www/wml/Portfile | 2 +- x11/Xaw3d/Portfile | 2 +- x11/blt/Portfile | 2 +- x11/tango-icon-theme-extras/Portfile | 2 +- x11/tango-icon-theme/Portfile | 2 +- x11/xdm/Portfile | 2 +- x11/xinit/Portfile | 2 +- x11/xorg-server-1.18/Portfile | 2 +- x11/xorg-server-devel/Portfile | 2 +- x11/xorg-server-legacy/Portfile | 2 +- x11/xorg-server/Portfile | 2 +- 253 files changed, 262 insertions(+), 260 deletions(-) diff --git a/R/R-RcppParallel/Portfile b/R/R-RcppParallel/Portfile index 9744dbf97f43f..519c741fdbeea 100644 --- 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 index 1337c26835e5e..214c9213377cc 100644 --- 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 index 5f54760229e55..4253eb82c10ee 100644 --- 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 index a1307986d40b5..5b521f5a75fdf 100644 --- 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 index 515155ae05d96..c556454636ff5 100644 --- 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 index c402275d1ec38..899c05008d814 100644 --- 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 index bd0ab8a4f04d5..b2276016ea8f4 100644 --- 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 index 944ce076271ab..29798faadff9a 100644 --- 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 index aad02d1941e60..921da311ca47a 100644 --- 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 index 0bd1a257267fc..fa018dd1fbb6b 100644 --- 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 index 906f13e844485..155102f45ac95 100644 --- 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 index c4886d038e283..c90103ecbae5d 100644 --- 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 index 6b7869df6cde3..4cd610af1563f 100644 --- 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 index 3dc5b7e8dc5a2..2585d44190258 100644 --- 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 index 57652f49b0515..1fcefa6c8652f 100644 --- 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 index 06c62a8943c49..192dc22565ac6 100644 --- 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 index 8367bcc053004..9fdc291e0a469 100644 --- 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 index 32cb336f8b7bb..5d7bc1ddb0d63 100644 --- 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 index 19be1e81d483f..39b6bb0eafc6c 100644 --- 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 index 43f80302a5fcd..b7a5657dd9de8 100644 --- 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 index 7dd54ca17fdb0..a9dcaed89bb51 100644 --- 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 index f148996c0bf32..9914843a47ae6 100644 --- 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 index a9738a4673d0c..56ee9de715ace 100644 --- 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 index c1ffbcb055fa0..fd2049c677188 100644 --- 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 index d4a2343b407b1..b7917d5f4b401 100644 --- 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 index 84b09120ceea9..3781fe129cab5 100644 --- 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 index 6941489794aee..37afceadb8ef5 100644 --- 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 index b305d0a9bac11..c638bc1163491 100644 --- 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 index a287704e69e2b..7f7fad5625f1a 100644 --- 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 index 9824c799db70e..b181f2ac35c7b 100644 --- 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 index 184f3184cd227..12e779f4bfb74 100644 --- 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 index 75f613d5f37b3..7e90336721366 100644 --- 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 index be94753093bd2..e5d177bc5054e 100644 --- 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 index d4b76d2f09598..3695fdd6c7399 100644 --- 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 index 598f0baa37215..2f9f4ba1443f4 100644 --- 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 index 9d89161112252..1219f73b7054e 100644 --- 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 index e98cac100a866..4a8761483927d 100644 --- 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 index a638244beb4d9..27fe2fe47a913 100644 --- 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 index 2683e983ff8cf..68bd4d8f35b9b 100644 --- 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 index d10d56627caad..9620943a5a5aa 100644 --- 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 index 9fdd276ef1032..0b26e2c038aea 100644 --- 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 index f2ba6ff5efd0b..2331420221347 100644 --- 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 index a29f8dbb727fc..28464011e5565 100644 --- 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 diff --git a/databases/mysql55-connector-cpp/Portfile b/databases/mysql55-connector-cpp/Portfile index c84f680f5bf90..6eeea0769939d 100644 --- a/databases/mysql55-connector-cpp/Portfile +++ b/databases/mysql55-connector-cpp/Portfile @@ -24,7 +24,7 @@ checksums rmd160 2445b7c3aab96e459bf8726963fbc7e203af7e6e \ boost.depends_type build -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-CMakeLists.txt.diff \ patch-cppconn-CMakeLists.txt.diff \ patch-driver-CMakeLists.txt.diff \ diff --git a/databases/mysql55/Portfile b/databases/mysql55/Portfile index b059276f69abf..95a76fd613f5f 100644 --- a/databases/mysql55/Portfile +++ b/databases/mysql55/Portfile @@ -34,7 +34,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 checksums rmd160 4b6fdfc37dc87fdabb2b944b695d5b9e687e22f2 \ diff --git a/databases/mysql56/Portfile b/databases/mysql56/Portfile index 889505dbc7c93..f6951ca6c90bb 100644 --- a/databases/mysql56/Portfile +++ b/databases/mysql56/Portfile @@ -44,7 +44,7 @@ if {$subport eq $name} { # https://trac.macports.org/ticket/60400 compiler.blacklist-append *gcc-3.* *gcc-4.* - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-cmake-install_layout.cmake.diff # Fix detection of htonll/ntohll. diff --git a/databases/mysql57/Portfile b/databases/mysql57/Portfile index 1a48bc7dd0b14..3396f8440a04e 100644 --- a/databases/mysql57/Portfile +++ b/databases/mysql57/Portfile @@ -69,7 +69,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-configure.cmake.diff \ patch-innodb_engine-fcommon.diff \ diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile index 29db35321dc7a..2456c62726a39 100644 --- a/databases/mysql8/Portfile +++ b/databases/mysql8/Portfile @@ -148,7 +148,7 @@ if {$subport eq $name} { # -DROUTER_INSTALL_LIBDIR="lib/${name_mysql}" \ # -DROUTER_INSTALL_PLUGINDIR="lib/${name_mysql}/mysqlrouter" - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-cmake-install_macros-protobuf-path.cmake.diff \ patch-cmake-install_layout.cmake.diff \ patch-cmake-sasl-disable-platform-check.diff \ diff --git a/databases/mysql81/Portfile b/databases/mysql81/Portfile index 4a37ceacdf7a6..a1a9303938a06 100644 --- a/databases/mysql81/Portfile +++ b/databases/mysql81/Portfile @@ -147,7 +147,7 @@ if {$subport eq $name} { # -DROUTER_INSTALL_LIBDIR="lib/${name_mysql}" \ # -DROUTER_INSTALL_PLUGINDIR="lib/${name_mysql}/mysqlrouter" - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-cmake-install_macros-protobuf-path.cmake.diff \ patch-cmake-install_layout.cmake.diff \ patch-cmake-sasl-disable-platform-check.diff \ diff --git a/databases/mysql82/Portfile b/databases/mysql82/Portfile index ed513d5b5013d..c0465541af600 100644 --- a/databases/mysql82/Portfile +++ b/databases/mysql82/Portfile @@ -148,7 +148,7 @@ if {$subport eq $name} { # -DROUTER_INSTALL_LIBDIR="lib/${name_mysql}" \ # -DROUTER_INSTALL_PLUGINDIR="lib/${name_mysql}/mysqlrouter" - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-cmake-install_macros-protobuf-path.cmake.diff \ patch-cmake-install_layout.cmake.diff \ patch-cmake-sasl-disable-platform-check.diff \ diff --git a/databases/rocksdb/Portfile b/databases/rocksdb/Portfile index 067f2132d2afb..c54fa6ae3462e 100644 --- a/databases/rocksdb/Portfile +++ b/databases/rocksdb/Portfile @@ -33,7 +33,7 @@ depends_lib-append port:gflags \ port:lz4 \ port:zstd -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-rocksdb-fixes-for-macOS-PPC.patch \ 0002-MAP_ANON.patch diff --git a/databases/timescaledb1/Portfile b/databases/timescaledb1/Portfile index f962f35616cd1..e3790e6368fb3 100644 --- a/databases/timescaledb1/Portfile +++ b/databases/timescaledb1/Portfile @@ -56,7 +56,7 @@ if {![variant_isset postgresql96] && \ default_variants +postgresql12 } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append test-CMakeLists.txt.patch compiler.c_standard 2011 diff --git a/databases/tokyocabinet-java/Portfile b/databases/tokyocabinet-java/Portfile index ced9f1bb10024..2259da2988a49 100644 --- a/databases/tokyocabinet-java/Portfile +++ b/databases/tokyocabinet-java/Portfile @@ -22,7 +22,7 @@ set javahome /System/Library/Frameworks/JavaVM.framework ## patch ## -patch.args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-Makefile.in.diff ## configure ## diff --git a/devel/absent/Portfile b/devel/absent/Portfile index 045c7986fe30d..48a9ea03fdb6a 100644 --- a/devel/absent/Portfile +++ b/devel/absent/Portfile @@ -19,7 +19,7 @@ checksums rmd160 b0561e2edcdf65d0819b3e24850c6ee7b8541c09 \ sha256 93373d0892ad13bb3f0c6635a468095c3ad7ab5b3fd09de49bd304462d05c59d \ size 13972 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-Fix-catch2-includes.patch \ 0002-tests-CMakeLists.txt-require-C-17.patch \ 0003-Fix-missing-_main-on-macOS.patch diff --git a/devel/bazel/Portfile b/devel/bazel/Portfile index eaa550e11aa86..c7d538940e45d 100644 --- a/devel/bazel/Portfile +++ b/devel/bazel/Portfile @@ -141,7 +141,7 @@ extract.mkdir yes use_configure no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # By default, the Xcode Locator is built as arm64/x86_64. # For 10.15 and earlier, disable that behavior. diff --git a/devel/bsdiff/Portfile b/devel/bsdiff/Portfile index 9be1d5c3c44da..ad229c6e19590 100644 --- a/devel/bsdiff/Portfile +++ b/devel/bsdiff/Portfile @@ -29,7 +29,7 @@ checksums rmd160 27bb255b5dd5aa56d3a076dac9ca76d238a79a04 \ depends_lib-append port:bzip2 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 20-CVE-2014-9862.patch \ 30-bug-632585-mmap-src-file-instead-of-malloc-read-it.patch \ 31-bug-632585-mmap-dst-file-instead-of-malloc-read-it.patch \ diff --git a/devel/bzr-fastimport/Portfile b/devel/bzr-fastimport/Portfile index e3ab8c665aa4b..ecd508a7d63c6 100644 --- a/devel/bzr-fastimport/Portfile +++ b/devel/bzr-fastimport/Portfile @@ -35,7 +35,7 @@ depends_run-append port:py${python.version}-fastimport patchfiles patch-disable-known-graph-feature.diff \ patch-dont-use-get_ancestry.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 livecheck.type regex livecheck.url http://launchpad.net/bzr-fastimport/+download diff --git a/devel/capstone/Portfile b/devel/capstone/Portfile index f5a03363606d9..ab43bf664702f 100644 --- a/devel/capstone/Portfile +++ b/devel/capstone/Portfile @@ -25,7 +25,7 @@ checksums rmd160 0d2d101f87a4324a5ff078b2ddf0764aa0118b5a \ compiler.blacklist-append \ *gcc-4.0 *gcc-4.2 {clang < 400} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-Makefile.diff use_configure no diff --git a/devel/checkmake/Portfile b/devel/checkmake/Portfile index 98ced58726572..5cc3845d09624 100644 --- a/devel/checkmake/Portfile +++ b/devel/checkmake/Portfile @@ -18,7 +18,7 @@ checksums ${distname}${extract.suffix} \ sha256 4d93f70268ee33690754dbcdb9744b1481ca027e4ce070043ba27c14aec878b0 \ size 102682 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles no-builder-name-email.diff depends_build-append \ diff --git a/devel/clucene/Portfile b/devel/clucene/Portfile index 3bce1137a85ba..fe42b58b97b79 100644 --- a/devel/clucene/Portfile +++ b/devel/clucene/Portfile @@ -27,7 +27,7 @@ checksums rmd160 5acfc9c8acd167b3684cfc731a60fd9c5465cc9b \ depends_lib port:zlib -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # Patch corrects a problem when linking applications using clucene because # the .pc file is missing clucene-shared library. # http://sourceforge.net/tracker/?func=detail&aid=3461512&group_id=80013&atid=558446 diff --git a/devel/creduce/Portfile b/devel/creduce/Portfile index 0871e08d6b726..e45c0fb41ed5f 100644 --- a/devel/creduce/Portfile +++ b/devel/creduce/Portfile @@ -21,7 +21,7 @@ long_description C-Reduce is a tool that takes a large C, C++, \ process source code. homepage http://embed.cs.utah.edu/creduce -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # INSTALL.md notes the specific version of LLVM that is required. if { !([variant_isset llvm90] || [variant_isset llvm11]) } { diff --git a/devel/git-extras/Portfile b/devel/git-extras/Portfile index c6d3ceeb0fec3..7f7625fea86e3 100644 --- a/devel/git-extras/Portfile +++ b/devel/git-extras/Portfile @@ -22,7 +22,7 @@ license MIT use_configure no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append macports-release.patch build {} diff --git a/devel/git-filter-repo/Portfile b/devel/git-filter-repo/Portfile index 5a43337775506..f7937ee80d732 100644 --- a/devel/git-filter-repo/Portfile +++ b/devel/git-filter-repo/Portfile @@ -36,7 +36,7 @@ python.default_version 311 patchfiles-append 53556108509c75827521240c227848a736348088.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-extract { reinplace "s|#!/usr/bin/env python3|#!${python.bin}|" git-filter-repo diff --git a/devel/git-when-merged/Portfile b/devel/git-when-merged/Portfile index 1eef905849ba1..7efb2a31ca90e 100644 --- a/devel/git-when-merged/Portfile +++ b/devel/git-when-merged/Portfile @@ -26,7 +26,7 @@ python.default_version 312 supported_archs noarch patchfiles-append 0001-Loosen-build-requirements.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_configure no diff --git a/devel/git/Portfile b/devel/git/Portfile index 21bed2a3d7692..055020bbcbdba 100644 --- a/devel/git/Portfile +++ b/devel/git/Portfile @@ -113,7 +113,7 @@ patchfiles-append patch-Makefile.diff \ patch-sha1dc-older-apple-gcc-versions.diff \ patch-gitk-git-gitk.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # Reverts breakage introduced by: # https://github.com/git/git/commit/51c15ac1b6ab15d8e29651d0bd364d8f62dc6509 diff --git a/devel/icmake/Portfile b/devel/icmake/Portfile index 71ca21a30b451..06ae0900a7dae 100644 --- a/devel/icmake/Portfile +++ b/devel/icmake/Portfile @@ -34,7 +34,7 @@ patchfiles 0001-Use-strictly-compliant-POSIX-BREs-in-build.patch \ 0004-Correct-some-minor-documentation-errors.patch \ 0005-Build-verbosely.patch \ 0006-Use-MacPorts-install-locations.patch -patch.pre_args -p2 +patch.pre_args-replace -p0 -p2 post-patch { reinplace -W ${worksrcpath} s|__MACPORTS__|${prefix}|g \ doc/icmake.1 \ diff --git a/devel/jsoncpp/Portfile b/devel/jsoncpp/Portfile index 6b0253240fe89..c8a6e95f1e857 100644 --- a/devel/jsoncpp/Portfile +++ b/devel/jsoncpp/Portfile @@ -28,7 +28,7 @@ patchfiles-append patch-fix-build.diff # disable CCACHE discovery and use patchfiles-append patch-disable-ccache.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args-append \ -DBUILD_SHARED_LIBS=ON \ diff --git a/devel/kchmviewer/Portfile b/devel/kchmviewer/Portfile index 26d3a0850a259..c5df7cbb9a34d 100644 --- a/devel/kchmviewer/Portfile +++ b/devel/kchmviewer/Portfile @@ -44,7 +44,8 @@ post-extract { system -W ${worksrcpath} "find . \\\( -name \"*.cpp\" -o -name \"*.h\" -o -name \"*.pro\" \\\) -exec dos2unix '{}' \";\"" } -patch.pre_args -Np1 +patch.pre_args-append -N +patch.pre_args-replace -p0 -p1 # make it build and work as intended. # Some of these patches have been submitted upstream: # https://sourceforge.net/p/kchmviewer/patches/9/ diff --git a/devel/kitten/Portfile b/devel/kitten/Portfile index f06d4c2edfa97..989d49dada7a0 100644 --- a/devel/kitten/Portfile +++ b/devel/kitten/Portfile @@ -21,7 +21,7 @@ checksums rmd160 b20d043f1ef2200ba31b8d24c4419b09e4e29136 \ sha256 bb0c6a3d6fb45c6c8260a2f2ce90beae0749c9cdd428cc6f48fe9e4cfb8e0f4a \ size 14289 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-Fix-catch2-includes.patch \ 0002-Fix-for-missing-_main-on-macOS.patch \ 0003-tests-CMakeLists.txt-use-C-17.patch diff --git a/devel/ldid/Portfile b/devel/ldid/Portfile index 37d9903fdd9ba..e601bb4a737d5 100644 --- a/devel/ldid/Portfile +++ b/devel/ldid/Portfile @@ -32,7 +32,7 @@ depends_lib-append path:lib/libplist-2.0.dylib:libplist universal_variant no use_xcode yes -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-nullbuf.diff \ dont-use-git-for-ldid-version.diff diff --git a/devel/libcmis/Portfile b/devel/libcmis/Portfile index e6ea0869f8774..2b84576eef40f 100644 --- a/devel/libcmis/Portfile +++ b/devel/libcmis/Portfile @@ -22,7 +22,7 @@ depends_lib port:libxml2 \ port:curl patchfiles patch-icu-64.2.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args --with-man \ --disable-werror \ diff --git a/devel/libcoverart/Portfile b/devel/libcoverart/Portfile index 58f56bc873b28..a018c09b30e98 100644 --- a/devel/libcoverart/Portfile +++ b/devel/libcoverart/Portfile @@ -29,7 +29,7 @@ patchfiles \ patch-cmakelists-1.diff \ patch-cmakelists-2.diff \ patch-cmakelists-3.diff -patch.args -p1 +patch.pre_args-replace -p0 -p1 depends_lib-append \ port:neon \ diff --git a/devel/libfmt8/Portfile b/devel/libfmt8/Portfile index 869aa3e252843..9f2cd89143e7b 100644 --- a/devel/libfmt8/Portfile +++ b/devel/libfmt8/Portfile @@ -60,7 +60,7 @@ configure.args-append \ # see https://github.com/macports/macports-ports/pull/13645 patchfiles fix-formatting-implicitly-convertible-types.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 cmake.generator Ninja diff --git a/devel/libunwind/Portfile b/devel/libunwind/Portfile index 4007ea81d4bf0..df236a257456c 100644 --- a/devel/libunwind/Portfile +++ b/devel/libunwind/Portfile @@ -33,7 +33,7 @@ checksums rmd160 26d3dac149e2fd355e1b8b367a9bf61e01c38fbf \ use_configure no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-libunwind-Add-missing-include-of-libunwind_ext.h-to-.patch \ 0002-libunwind-Use-__builtin_trap-rather-than-__builtin_u.patch \ diff --git a/devel/libzookeeper/Portfile b/devel/libzookeeper/Portfile index 3cb00d430a84e..43bd461bbc81f 100644 --- a/devel/libzookeeper/Portfile +++ b/devel/libzookeeper/Portfile @@ -37,7 +37,7 @@ platform darwin { # https://issues.apache.org/jira/browse/ZOOKEEPER-2049, modified for 3.4.6 if {${os.major} >= 14} { patchfiles-append patch-yosemite.diff - patch.pre_args -p2 + patch.pre_args-replace -p0 -p2 } } diff --git a/devel/log4cxx/Portfile b/devel/log4cxx/Portfile index fffdd07191283..c110936020e19 100644 --- a/devel/log4cxx/Portfile +++ b/devel/log4cxx/Portfile @@ -50,7 +50,7 @@ platform darwin 10 { configure.args-append \ -DPREFER_BOOST:BOOL=OFF -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append gcc43.patch # See: https://github.com/fmtlib/fmt/issues/2759 patchfiles-append patch-fmt.diff diff --git a/devel/mach_override/Portfile b/devel/mach_override/Portfile index a19597208b7b9..bda4ebbb7670a 100644 --- a/devel/mach_override/Portfile +++ b/devel/mach_override/Portfile @@ -22,7 +22,7 @@ checksums rmd160 fc7bcb5c5ba48ac464eaac3d6141d4cd9905703b \ depends_build port:libtool \ port:udis86 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles macports-udis86.diff \ relative-call.diff diff --git a/devel/mercurial/Portfile b/devel/mercurial/Portfile index 3edab8825f6ca..285a0ab82ff9e 100644 --- a/devel/mercurial/Portfile +++ b/devel/mercurial/Portfile @@ -61,7 +61,7 @@ depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle \ port:py${python.version}-re2 \ port:py${python.version}-gnureadline -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles setup_py.diff \ hg.diff \ makefile.diff diff --git a/devel/mhash/Portfile b/devel/mhash/Portfile index 0a0faa49a055f..1ca53e6243273 100644 --- a/devel/mhash/Portfile +++ b/devel/mhash/Portfile @@ -28,7 +28,7 @@ checksums \ patchfiles \ patch-autotools-namespace-stomping.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args \ --mandir=${prefix}/share/man diff --git a/devel/mico/Portfile b/devel/mico/Portfile index 246553b6a16c5..25f2d328586e3 100644 --- a/devel/mico/Portfile +++ b/devel/mico/Portfile @@ -23,7 +23,7 @@ patchfiles patch-mico-shld.def.in.diff \ patch-main-sig.diff \ patch-os-math.h.diff worksrcdir mico -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace "s,@prefix@,${prefix},g" ${worksrcpath}/admin/mico-shld.def.in reinplace "s,(SHARED_INSTDIR)/man,(SHARED_INSTDIR)/share/man,g" ${worksrcpath}/man/Makefile diff --git a/devel/mpir/Portfile b/devel/mpir/Portfile index 47b58797a857f..16e6a91864b47 100644 --- a/devel/mpir/Portfile +++ b/devel/mpir/Portfile @@ -41,7 +41,7 @@ if {${subport} eq ${name}} { size 3116197 patchfiles-append patch-fix-configure.release.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 } else { @@ -60,7 +60,7 @@ if {${subport} eq ${name}} { revision 0 patchfiles-append patch-fix-configure.devel.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 } diff --git a/devel/mstch/Portfile b/devel/mstch/Portfile index 778aaaac5f558..5f239e8d609fe 100644 --- a/devel/mstch/Portfile +++ b/devel/mstch/Portfile @@ -21,7 +21,7 @@ checksums rmd160 089ce23e4d9be80c1546196ffa48cdfaa3d1d718 \ sha256 77c416142c3f32afd26beab02a494e2688033b390a5a6ced1440515f74b7bf8d \ size 24355 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-shared.diff compiler.cxx_standard 2011 diff --git a/devel/porg/Portfile b/devel/porg/Portfile index 527ae06349cbb..a2a5b98c7f4a5 100644 --- a/devel/porg/Portfile +++ b/devel/porg/Portfile @@ -23,7 +23,7 @@ checksums rmd160 f9bd3ed72324cf0c8668d8ae0333a0813df968e7 \ depends_build-append port:pkgconfig -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles no-default-porgrc.patch \ null-terminate-string-after-strncpy.patch \ fix-bash-completion-path.patch \ diff --git a/devel/premake5/Portfile b/devel/premake5/Portfile index 930a6021f4fa1..8110c5bd2c4a6 100644 --- a/devel/premake5/Portfile +++ b/devel/premake5/Portfile @@ -32,7 +32,7 @@ use_configure no patchfiles-append 0001-Include-required-header.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # Premake statically links a handful of vendored libraries; don't let MacPorts # installed libraries conflict with these diff --git a/devel/qca/Portfile b/devel/qca/Portfile index 61d9156877ece..ba5aa830a543b 100644 --- a/devel/qca/Portfile +++ b/devel/qca/Portfile @@ -43,7 +43,8 @@ homepage https://userbase.kde.org/QCA master_sites kde:stable/qca/${version} use_xz yes -patch.pre_args -Np1 +patch.pre_args-append -N +patch.pre_args-replace -p0 -p1 switch ${Qt_Major} { qt4 { diff --git a/devel/qcachegrind/Portfile b/devel/qcachegrind/Portfile index 3d865e24af1d9..20c2591712206 100644 --- a/devel/qcachegrind/Portfile +++ b/devel/qcachegrind/Portfile @@ -25,7 +25,7 @@ checksums \ depends_run path:bin/dot:graphviz patchfiles 0001-Fix-shell-invocations-for-MacPorts.patch -patch.args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace -W ${worksrcpath} "s|@@PREFIX@@|${prefix}|g" \ diff --git a/devel/treecc/Portfile b/devel/treecc/Portfile index 019d2ab10dc42..67dc0bbae0a52 100644 --- a/devel/treecc/Portfile +++ b/devel/treecc/Portfile @@ -21,7 +21,7 @@ checksums sha1 f905cb535559b0e2d04fa86da14de240f5b1e44f # version from git repository from Sept. 2 -- for 64 bit cleanness patchfiles git-2009-09-02.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 conflicts_build texinfo diff --git a/devel/unibilium/Portfile b/devel/unibilium/Portfile index b9c99473f6151..b507fe6fc60d7 100644 --- a/devel/unibilium/Portfile +++ b/devel/unibilium/Portfile @@ -25,7 +25,7 @@ checksums rmd160 7dcb792282fbe353c145cb8727a97bf0927fda99 \ depends_build port:libtool patchfiles patch-Makefile.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_configure no diff --git a/devel/xmlrpc-c/Portfile b/devel/xmlrpc-c/Portfile index 3d7901b6aa4ca..bcbe76ada38bf 100644 --- a/devel/xmlrpc-c/Portfile +++ b/devel/xmlrpc-c/Portfile @@ -41,7 +41,7 @@ configure.args-append --disable-libwww-client --without-libwww-ssl platform darwin { patchfiles-append patch-strcasecmp.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 } default_variants +libxml2 diff --git a/devel/xmlrpcxx/Portfile b/devel/xmlrpcxx/Portfile index d12231230467b..0cd224898ba9a 100644 --- a/devel/xmlrpcxx/Portfile +++ b/devel/xmlrpcxx/Portfile @@ -23,7 +23,8 @@ checksums md5 d88f0f9c36d938316d672d16f6c37d7e \ patchfiles Validator.patch \ VirtualWarnings.patch -patch.pre_args -R -p1 +patch.pre_args-append -R +patch.pre_args-replace -p0 -p1 use_configure no destroot { diff --git a/devel/zeroc-ice34/Portfile b/devel/zeroc-ice34/Portfile index f3e7167f9692d..52b5843130f99 100644 --- a/devel/zeroc-ice34/Portfile +++ b/devel/zeroc-ice34/Portfile @@ -122,8 +122,7 @@ patchfiles patch-ice.cpp.config.Make.rules.diff \ patch-add-thrift-support-for-java.diff \ patch-add-thrift-support-for-python.diff -patch.pre_args -p1 -platforms darwin +patch.pre_args-replace -p0 -p1 depends_lib port:db46 \ port:expat \ diff --git a/devel/zeroc-ice35/Portfile b/devel/zeroc-ice35/Portfile index 75c4db073f509..e5d2ee969ec17 100644 --- a/devel/zeroc-ice35/Portfile +++ b/devel/zeroc-ice35/Portfile @@ -49,8 +49,7 @@ patchfiles patch-ice.cpp.config.Make.rules.diff \ patch-ice.cpp.test.include.TestCommon.h.diff \ patch-ice.scripts.TestUtil.py.diff -patch.pre_args -p1 -platforms darwin +patch.pre_args-replace -p0 -p1 depends_lib port:db46 \ port:expat \ diff --git a/devel/zmq/Portfile b/devel/zmq/Portfile index 037757acb8133..99f9634bb950a 100644 --- a/devel/zmq/Portfile +++ b/devel/zmq/Portfile @@ -43,7 +43,7 @@ if {${name} eq ${subport}} { -DENABLE_INTRINSICS=OFF \ -DZMQ_BUILD_FRAMEWORK=OFF - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles-append \ patch-cxx11.release.diff \ patch-c11.release.diff \ @@ -131,7 +131,7 @@ subport zmq-devel { -DENABLE_INTRINSICS=OFF \ -DZMQ_BUILD_FRAMEWORK=OFF - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles-append \ patch-fix-docs-dir.devel.diff \ patch-fix-no-librt-APPLE.devel.diff diff --git a/editors/HexFiend/Portfile b/editors/HexFiend/Portfile index 7a1d30805b809..13b2be32c2646 100644 --- a/editors/HexFiend/Portfile +++ b/editors/HexFiend/Portfile @@ -29,7 +29,7 @@ long_description \n\ supported_archs x86_64 arm64 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 if {${os.platform} eq "darwin"} { if {${os.major} == 17} { patchfiles patch-enable-build-on-high-sierra.diff diff --git a/editors/ee/Portfile b/editors/ee/Portfile index dff0de6941a59..3adc54165413a 100644 --- a/editors/ee/Portfile +++ b/editors/ee/Portfile @@ -23,7 +23,7 @@ checksums rmd160 c8919aec0b6cc11e1a548bb3361dcffa9fcd3981 \ sha256 bcbff4b6bb50d7e42dc1f68d73f58690736d254ad6d359c2ca902c6aa47e4d34 \ size 69823 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-make-default.diff \ remove-freebsdisms.diff diff --git a/editors/liteide/Portfile b/editors/liteide/Portfile index e11a00319ff29..7c731a9658e92 100644 --- a/editors/liteide/Portfile +++ b/editors/liteide/Portfile @@ -19,7 +19,7 @@ checksums rmd160 d6e885b3e529c4144117ed0e0b4eaedbc85ef20f \ sha256 a96d38ec32701b203928118c58712b54a4f0328189eef6ee7572f62bfb70867f \ size 3283661 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-liteenv-prefix.diff post-patch { diff --git a/editors/ne/Portfile b/editors/ne/Portfile index b99b623f434e3..36fa6fa054b7e 100644 --- a/editors/ne/Portfile +++ b/editors/ne/Portfile @@ -33,7 +33,7 @@ depends_build-append \ depends_lib-append port:ncurses -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-makefile.diff \ patch-src-makefile.diff diff --git a/editors/xemacs/Portfile b/editors/xemacs/Portfile index 203b9371058f1..cc08be4fd3bb9 100644 --- a/editors/xemacs/Portfile +++ b/editors/xemacs/Portfile @@ -60,7 +60,7 @@ checksums xemacs-${version}.tar.gz \ patchfiles 51ced9b8fb63e4be59ea611b58128c400e3df987.diff \ bcefd94fa6513d48f4dc8519f633b2df66b553bc.diff \ texinfo5.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args --mandir=${prefix}/share/man \ --without-postgresql \ diff --git a/emulators/free42/Portfile b/emulators/free42/Portfile index 615059c7c0a2f..4ebdfe308ca40 100644 --- a/emulators/free42/Portfile +++ b/emulators/free42/Portfile @@ -30,7 +30,7 @@ checksums ${distname}.tgz \ extract.only ${distname}.tgz patchfiles patch-Free42.xcodeproj.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 build.dir ${build.dir}/mac xcode.configuration 'Release Decimal' diff --git a/finance/abtransfers/Portfile b/finance/abtransfers/Portfile index 1a032561f9332..72b7b5e2d42ff 100644 --- a/finance/abtransfers/Portfile +++ b/finance/abtransfers/Portfile @@ -36,7 +36,7 @@ use_bzip2 yes use_parallel_build yes patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch_623-638.diff pre-configure { diff --git a/fuse/sshfs/Portfile b/fuse/sshfs/Portfile index 04d28a797f068..891005f586985 100644 --- a/fuse/sshfs/Portfile +++ b/fuse/sshfs/Portfile @@ -26,7 +26,7 @@ checksums rmd160 9c940d816480a6ffba9d43d257f7fcc2484d06f3 \ size 58307 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-configure.ac.diff sshfs.c.patch use_autoreconf yes diff --git a/games/galaxis/Portfile b/games/galaxis/Portfile index 89a14665868ca..cae1b69cd152c 100644 --- a/games/galaxis/Portfile +++ b/games/galaxis/Portfile @@ -25,7 +25,7 @@ checksums rmd160 98b064f5dfce4688c122153bc1a2f9b5390f870b \ sha256 94059ba4f09985033a7d5f57a307063edbb0cdecc2d02898dc6ce4ce496b6856 \ size 10931 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-makefile.diff depends_lib-append port:ncurses diff --git a/games/greed/Portfile b/games/greed/Portfile index 3cc39a6cab525..158242e4e51b7 100644 --- a/games/greed/Portfile +++ b/games/greed/Portfile @@ -21,7 +21,7 @@ checksums rmd160 165629a6c2afcd62ec8d0b41441a60686566da14 \ sha256 8ea3b9a22e9cf3789a9103d38ac0bf88fd6179763fffe36e3b607946b7449acf \ size 15150 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-makefile.diff depends_lib-append port:ncurses diff --git a/games/nethack/Portfile b/games/nethack/Portfile index df3d310daa693..2919ccc5a9245 100644 --- a/games/nethack/Portfile +++ b/games/nethack/Portfile @@ -30,7 +30,7 @@ checksums sha256 98cf67df6debf9668a61745aa84c09bcab362e5d33f5b944ec5155 depends_lib port:ncurses worksrcdir NetHack-${version} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-gamestate-dir.diff \ patch-manpage-dir.diff diff --git a/games/ufo-ai/Portfile b/games/ufo-ai/Portfile index 139ddd88b4645..3acffca6a01ad 100644 --- a/games/ufo-ai/Portfile +++ b/games/ufo-ai/Portfile @@ -68,7 +68,7 @@ post-extract { "/usr/bin/tar -C gamedata -xf ${distpath}/ufoai-${version}-data.tar" } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-bug-5345.diff \ patch-bug-5336.diff diff --git a/gnome/gom/Portfile b/gnome/gom/Portfile index 7721f89e52221..71988c7c9cad1 100644 --- a/gnome/gom/Portfile +++ b/gnome/gom/Portfile @@ -38,7 +38,7 @@ depends_lib path:lib/pkgconfig/gdk-pixbuf-2.0.pc:gdk-pixbuf2 \ patchfiles use-g-add-private.patch \ fix-trivial-doc-typo.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_configure yes configure.args -Denable-gtk-doc=true \ diff --git a/gnome/gstreamer010-gst-plugins-ugly/Portfile b/gnome/gstreamer010-gst-plugins-ugly/Portfile index da5f2cdedda9e..d1eff318d18d8 100644 --- a/gnome/gstreamer010-gst-plugins-ugly/Portfile +++ b/gnome/gstreamer010-gst-plugins-ugly/Portfile @@ -42,7 +42,7 @@ depends_lib port:gstreamer010-gst-plugins-base \ port:x264 patchfiles libcdio.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args mandir=${prefix}/share/man \ --disable-silent-rules \ diff --git a/gnome/libunique/Portfile b/gnome/libunique/Portfile index 2303f3868d932..ad1dcebdf3cf5 100644 --- a/gnome/libunique/Portfile +++ b/gnome/libunique/Portfile @@ -23,7 +23,7 @@ checksums rmd160 15ae8cc81f978554395fcb194ecb11c7bc6a1938 \ sha256 2cb918dde3554228a211925ba6165a661fd782394bd74dfe15e3853dc9c573ea patchfiles patch-g_const_return.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_build port:pkgconfig diff --git a/graphics/grafx2/Portfile b/graphics/grafx2/Portfile index d651c772bfd00..1df54edfc54ed 100644 --- a/graphics/grafx2/Portfile +++ b/graphics/grafx2/Portfile @@ -47,7 +47,7 @@ depends_lib port:libsdl \ use_configure no -patch.pre_args -p2 +patch.pre_args-replace -p0 -p2 patchfiles-append patch-osx-tiger_realpath.c.diff patch-osx-tiger_Makefile.diff patch-osx-tiger_Makefile-b.diff pre-build { diff --git a/graphics/imageindex/Portfile b/graphics/imageindex/Portfile index 7f5725c330ebe..93756b4472ef0 100644 --- a/graphics/imageindex/Portfile +++ b/graphics/imageindex/Portfile @@ -32,7 +32,7 @@ perl5.create_variants ${perl5.branches} depends_lib port:p${perl5.major}-perlmagick depends_run port:p${perl5.major}-image-info -patch.post_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles fix-dotfiles.patch \ make-charset-configurable-pod.patch \ fix-javascript.patch \ diff --git a/graphics/ipe/Portfile b/graphics/ipe/Portfile index 8abd7fb35fe55..7c0e8145e8699 100644 --- a/graphics/ipe/Portfile +++ b/graphics/ipe/Portfile @@ -37,7 +37,7 @@ depends_lib-append port:freetype \ use_configure no universal_variant no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 compiler.cxx_standard 2014 diff --git a/graphics/jbig2enc/Portfile b/graphics/jbig2enc/Portfile index 3c11340016ef1..6a0453016a507 100644 --- a/graphics/jbig2enc/Portfile +++ b/graphics/jbig2enc/Portfile @@ -32,7 +32,7 @@ depends_lib port:leptonica patchfiles jbig2enc-a614bdb580d65653dbfe5c9925940797a065deac.patch \ jbig2enc-d211d8c9c65fbc103594580484a3b7fa0249e160.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.cmd "./autogen.sh && ./configure" configure.args --docdir=${prefix}/share/doc/${name} diff --git a/graphics/xfractint/Portfile b/graphics/xfractint/Portfile index 3616d2cb1b3e3..fb0eaa4507974 100644 --- a/graphics/xfractint/Portfile +++ b/graphics/xfractint/Portfile @@ -19,7 +19,7 @@ checksums rmd160 8d69895ca3237caa76c9c1c93ee5abaeb77191c2 \ sha256 0e2856e596a44f5a8dbd4cb389683ead484776cdba4cce75c6c2a09f86c9b849 \ size 1336285 -patch.args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-prefix-x11-dirs.diff post-patch { diff --git a/graphics/xpdf/Portfile b/graphics/xpdf/Portfile index daa0b633f5695..8fc510f1e5977 100644 --- a/graphics/xpdf/Portfile +++ b/graphics/xpdf/Portfile @@ -43,7 +43,7 @@ depends_lib port:xorg-libXp \ depends_run path:share/fonts/urw-fonts:urw-fonts -patch.post_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-xpdf-NameToUnicodeTable.h.diff \ patch-xpdf-UnicodeMapTables.h.diff diff --git a/irc/hexchat/Portfile b/irc/hexchat/Portfile index 93e89731c6479..53c8532313af8 100644 --- a/irc/hexchat/Portfile +++ b/irc/hexchat/Portfile @@ -29,7 +29,7 @@ github.tarball_from releases patchfiles patch-meson-post-install.diff \ patch-build-scripts-python3.diff -patch.post_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace "s:@PYTHON3@:${prefix}/bin/python3.${python_minor}:" \ diff --git a/java/drip/Portfile b/java/drip/Portfile index 61694a8e860f6..c3a8621a9865b 100644 --- a/java/drip/Portfile +++ b/java/drip/Portfile @@ -29,7 +29,7 @@ java.version 1.8 java.fallback openjdk8 patchfiles 0001-For-MacPorts-ensure-package-mode-give-proper-upgrade.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace s|DRIP_VERSION=.*$|DRIP_VERSION=${version}| ${worksrcpath}/bin/drip diff --git a/java/openjdk19/Portfile b/java/openjdk19/Portfile index 5304c4aaf3895..94328fe1bd3de 100644 --- a/java/openjdk19/Portfile +++ b/java/openjdk19/Portfile @@ -36,7 +36,7 @@ pre-patch { patchfiles 763c080fa46b01ac07603792c1d52659e246dd13.patch \ 17e3412363bf5263c26d9bf1dfbef1fecc3d11a9.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 set tpath /Library/Java use_xcode yes diff --git a/kde/kde-extra-cmake-modules/Portfile b/kde/kde-extra-cmake-modules/Portfile index 2ae890c8ba7e8..1f97e709ad0a9 100644 --- a/kde/kde-extra-cmake-modules/Portfile +++ b/kde/kde-extra-cmake-modules/Portfile @@ -10,7 +10,9 @@ conflicts ${name} ${name}-devel conflicts-delete ${subport} set kf5.branch 5.86 -patch.pre_args -Np1 + +patch.pre_args-append -N +patch.pre_args-replace -p0 -p1 if {${subport} eq "${name}-devel"} { fetch.type git diff --git a/kde/kdelibs4/Portfile b/kde/kdelibs4/Portfile index 95b4bb2c139b6..bd84a1e130a63 100644 --- a/kde/kdelibs4/Portfile +++ b/kde/kdelibs4/Portfile @@ -77,7 +77,7 @@ patchfiles workaround-kdeinit4-crash.patch \ #Deactivated as of ticket #45373 # patch-nativeDialogs.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # explicitly define certain headers and libraries, to avoid # conflicts with those installed into system paths by the user. diff --git a/kde/konversation/Portfile b/kde/konversation/Portfile index 9e64f64c55238..98854fb56ff19 100644 --- a/kde/konversation/Portfile +++ b/kde/konversation/Portfile @@ -23,7 +23,7 @@ checksums rmd160 39344ae0934271669092bc4df826f73c69304360 \ patchfiles workaround-qfontmetrics-bug.patch patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 if {![variant_isset docs]} { patchfiles-append patch-CMakeLists.txt.diff } diff --git a/lang/algol-68rs/Portfile b/lang/algol-68rs/Portfile index f68065c83517d..55098dc9aaef7 100644 --- a/lang/algol-68rs/Portfile +++ b/lang/algol-68rs/Portfile @@ -18,7 +18,7 @@ checksums rmd160 bc9bd1057ffb8d44697573948e95d1c435f753d9 \ sha256 2b800644c5098236464548a9e8fecd19f2e2dde4c40fbbb2ef594927e07603aa \ size 8113588 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append Fixes-for-PPC-and-Macports.patch post-patch { diff --git a/lang/clang-11-bootstrap/Portfile b/lang/clang-11-bootstrap/Portfile index 1847d1cd04f54..3c97af74d94b8 100644 --- a/lang/clang-11-bootstrap/Portfile +++ b/lang/clang-11-bootstrap/Portfile @@ -66,7 +66,7 @@ post-extract { ln -s ${workpath}/llvm-project/clang-tools-extra ${worksrcpath}/tools/clang/tools/extra } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # all patches are available as git tree: https://github.com/catap/llvm-project/tree/clang-11-bootstrap patchfiles 0001-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ 0002-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \ diff --git a/lang/fort77/Portfile b/lang/fort77/Portfile index e52f32af9892f..dc713679b2284 100644 --- a/lang/fort77/Portfile +++ b/lang/fort77/Portfile @@ -26,7 +26,7 @@ long_description \ depends_lib port:f2c port:libf2c patchfiles fort77.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace "s||${prefix}|g" ${worksrcpath}/fort77 } diff --git a/lang/fpc/Portfile b/lang/fpc/Portfile index a6caf41ec7367..6718745c09d7b 100644 --- a/lang/fpc/Portfile +++ b/lang/fpc/Portfile @@ -135,7 +135,7 @@ subport "${name}-cross" { worksrcdir ${name}build-${version}/fpcsrc/compiler use_configure no - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 build.args OPT="-ap -v0" build.target aarch64 arm avr i386 i8086 jvm m68k mips mipsel \ powerpc powerpc64 sparc x86_64 diff --git a/lang/janet/Portfile b/lang/janet/Portfile index 67cf90a4ee49a..12ae2bd06e049 100644 --- a/lang/janet/Portfile +++ b/lang/janet/Portfile @@ -30,7 +30,7 @@ checksums rmd160 0ebe89b01b96d708bb85fd5176a2442f84661079 \ # Fixes passing correct link flags to boot_strap janet # and incorrect use of environ on macOS. -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # We're using a seperate directory for jpm so we need to patch # the Makefile such that Janet resolves jpm packages diff --git a/lang/libcxx-powerpc/Portfile b/lang/libcxx-powerpc/Portfile index 4919d22761af4..75f6a7b8bc26c 100644 --- a/lang/libcxx-powerpc/Portfile +++ b/lang/libcxx-powerpc/Portfile @@ -87,7 +87,7 @@ post-extract { move ${workpath}/libcxxabi-${upstream_ver}.src ${llvmdir}/libcxxabi } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patch.dir ${llvmdir} # Patches from: https://github.com/iains/LLVM-7-branch # libcxxabi diff --git a/lang/libcxx/Portfile b/lang/libcxx/Portfile index bd1d5f822dcbe..ca4ca5d4e5fee 100644 --- a/lang/libcxx/Portfile +++ b/lang/libcxx/Portfile @@ -121,7 +121,6 @@ if {${os.major} < 11 || [variant_isset replacemnt_libcxx]} { } patch.dir ${workpath} - patch.pre_args -p0 # patches for libc++abi buildit patchfiles-append \ diff --git a/lang/llvm-10/Portfile b/lang/llvm-10/Portfile index 3d5a339a20842..e39a489ee08ba 100644 --- a/lang/llvm-10/Portfile +++ b/lang/llvm-10/Portfile @@ -128,7 +128,7 @@ checksums llvm-10.0.1.src.tar.xz \ sha256 d2fb0bb86b21db1f52402ba231da7c119c35c21dfb843c9496fe901f2d6aa25a \ size 8894312 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-11/Portfile b/lang/llvm-11/Portfile index 1b89f4b0d04c0..6ffcb24264fbb 100644 --- a/lang/llvm-11/Portfile +++ b/lang/llvm-11/Portfile @@ -134,7 +134,7 @@ post-extract { } } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ 0003-MacPorts-Only-Don-t-embed-the-deployment-target-in-t.patch \ diff --git a/lang/llvm-12/Portfile b/lang/llvm-12/Portfile index c2420fb9804e1..9104354ebf24f 100644 --- a/lang/llvm-12/Portfile +++ b/lang/llvm-12/Portfile @@ -103,7 +103,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-13/Portfile b/lang/llvm-13/Portfile index cbefe4f6d8f33..bf7a8f41dd7a3 100644 --- a/lang/llvm-13/Portfile +++ b/lang/llvm-13/Portfile @@ -111,7 +111,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-14/Portfile b/lang/llvm-14/Portfile index 80c1b61db8f1d..8d90384455e36 100644 --- a/lang/llvm-14/Portfile +++ b/lang/llvm-14/Portfile @@ -115,7 +115,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-15/Portfile b/lang/llvm-15/Portfile index b5b76d5255e5a..5dc5f036aa81c 100644 --- a/lang/llvm-15/Portfile +++ b/lang/llvm-15/Portfile @@ -121,7 +121,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-16/Portfile b/lang/llvm-16/Portfile index 0cc65a534833f..20dbd54597b8d 100644 --- a/lang/llvm-16/Portfile +++ b/lang/llvm-16/Portfile @@ -121,7 +121,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-17/Portfile b/lang/llvm-17/Portfile index 7359d5dacb620..628a2a795f309 100644 --- a/lang/llvm-17/Portfile +++ b/lang/llvm-17/Portfile @@ -125,7 +125,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-18/Portfile b/lang/llvm-18/Portfile index 14c4d8afb8058..58d2af1bb8862 100644 --- a/lang/llvm-18/Portfile +++ b/lang/llvm-18/Portfile @@ -110,7 +110,7 @@ platform darwin { } patch.dir ${workpath}/${distname} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/llvm-3.3/Portfile b/lang/llvm-3.3/Portfile index b8cd539aa5339..dfd63294b45f3 100644 --- a/lang/llvm-3.3/Portfile +++ b/lang/llvm-3.3/Portfile @@ -83,7 +83,7 @@ patchfiles install_target.patch \ tiger-shlib.patch \ patch-macports-flags.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 if {${subport} eq "clang-${llvm_version}"} { if {${distfiles} ne ""} { diff --git a/lang/llvm-3.4/Portfile b/lang/llvm-3.4/Portfile index ff5af57586e4b..6e24939ad75df 100644 --- a/lang/llvm-3.4/Portfile +++ b/lang/llvm-3.4/Portfile @@ -117,7 +117,7 @@ checksums llvm-3.4.2.src.tar.gz \ rmd160 8af0af0ead94bd50b1e6cbdcde5c4770bba5de0d \ sha256 ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-MacPorts-Only-Update-install-targets-for-clang-subpo.patch \ 0003-MacPorts-Only-Fix-sample-project-regex-to-work-with-.patch \ diff --git a/lang/llvm-3.7/Portfile b/lang/llvm-3.7/Portfile index f4aeaf2c6ae97..198c2a83e335f 100644 --- a/lang/llvm-3.7/Portfile +++ b/lang/llvm-3.7/Portfile @@ -138,7 +138,7 @@ checksums llvm-3.7.1.src.tar.xz \ rmd160 0549da0fdf597e812d5281a01cdd0974f6742718 \ sha256 ce9273ad315e1904fd35dc64ac4375fd592f3c296252ab1d163b9ff593ec3542 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-5.0/Portfile b/lang/llvm-5.0/Portfile index a5a8218f14f7d..173181cb72de4 100644 --- a/lang/llvm-5.0/Portfile +++ b/lang/llvm-5.0/Portfile @@ -129,7 +129,7 @@ checksums llvm-5.0.2.src.tar.xz \ sha256 dda84e48b2195768c4ef25893edd5eeca731bed7e80a2376119dfbc3350e91b8 \ size 8513656 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-6.0/Portfile b/lang/llvm-6.0/Portfile index cb3bb8ce0d520..8bb1ea706753f 100644 --- a/lang/llvm-6.0/Portfile +++ b/lang/llvm-6.0/Portfile @@ -155,7 +155,7 @@ checksums llvm-6.0.1.src.tar.xz \ sha256 e7765fdf6c8c102b9996dbb46e8b3abc41396032ae2315550610cf5a1ecf4ecc \ size 8684364 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-7.0/Portfile b/lang/llvm-7.0/Portfile index 06e6744a65862..03a18a98729a6 100644 --- a/lang/llvm-7.0/Portfile +++ b/lang/llvm-7.0/Portfile @@ -157,7 +157,7 @@ checksums llvm-7.1.0.src.tar.xz \ sha256 305454f72db5e30def3f48e2dc56ce62f9c52c3b9278b8f357a093a588b6139b \ size 8755032 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-8.0/Portfile b/lang/llvm-8.0/Portfile index 8195ab94073f4..cd6c4667a7174 100644 --- a/lang/llvm-8.0/Portfile +++ b/lang/llvm-8.0/Portfile @@ -153,7 +153,7 @@ checksums llvm-8.0.1.src.tar.xz \ sha256 e8a1f7e8af238b32ce39ab5de1f3317a2e3f7d71a8b1b8bbacbd481ac76fd2d1 \ size 8711692 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-9.0/Portfile b/lang/llvm-9.0/Portfile index 5c3bba8cbfdcf..a8438004d0192 100644 --- a/lang/llvm-9.0/Portfile +++ b/lang/llvm-9.0/Portfile @@ -153,7 +153,7 @@ checksums llvm-9.0.1.src.tar.xz \ sha256 9a4ac69df923230d13eb6cd0d03f605499f6a854b1dc96a9b72c4eb075040fcf \ size 8768196 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Set-the-Mach-O-CPU-Subtype-to-ppc7400-when-targeting.patch \ 0002-Define-EXC_MASK_CRASH-and-MACH_EXCEPTION_CODES-if-th.patch \ diff --git a/lang/llvm-devel/Portfile b/lang/llvm-devel/Portfile index 2dd1ac7a2614c..6bd1ad942ac00 100644 --- a/lang/llvm-devel/Portfile +++ b/lang/llvm-devel/Portfile @@ -140,7 +140,7 @@ platform darwin { supported_archs arm64 x86_64 } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-MacPorts-only-clang-use-MP-omp-locations.patch \ diff --git a/lang/mrustc/Portfile b/lang/mrustc/Portfile index 19f7bd33a664b..67f346c6d1e56 100644 --- a/lang/mrustc/Portfile +++ b/lang/mrustc/Portfile @@ -101,7 +101,7 @@ pre-patch { } patch.dir ${workpath}/rustc-${rust_version}-src -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # patches as git tree: https://github.com/catap/rust-legacy-bootstrap/tree/1.54.0 patchfiles 0001-Introduced-support-of-MACPORTS_LEGACY_SUPPORT_.patch \ diff --git a/lang/nhc98/Portfile b/lang/nhc98/Portfile index f9e4c6cdf5610..0dcf8938541bb 100644 --- a/lang/nhc98/Portfile +++ b/lang/nhc98/Portfile @@ -77,7 +77,7 @@ platform darwin { # Donʼt build in parallel, seriously use_parallel_build no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-asmlong.h-add-PPC-implementation.patch \ 0002-harch.inst-add-missing-archs.patch \ diff --git a/lang/php/Portfile b/lang/php/Portfile index feddf3cd1534a..97779ccf4377c 100644 --- a/lang/php/Portfile +++ b/lang/php/Portfile @@ -264,7 +264,7 @@ if {[is_sapi_subport]} { } # Use -p1 to accommodate the Suhosin patch - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles-append patch-${php}-scripts-php-config.in.diff if {[vercmp ${branch} >= 8.2]} { diff --git a/lang/polyml/Portfile b/lang/polyml/Portfile index a97ad990d62af..0d7702391f454 100644 --- a/lang/polyml/Portfile +++ b/lang/polyml/Portfile @@ -27,7 +27,7 @@ configure.args --mandir=${prefix}/share/man --build=${build_arch}-apple-dar patchfiles patch-check-mach-o-reloc-h-file.diff \ patch-update-config-for-arm64.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-destroot { xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} diff --git a/lang/ruby-devel/Portfile b/lang/ruby-devel/Portfile index 6a6e465e3a90a..836df88ba6c7f 100644 --- a/lang/ruby-devel/Portfile +++ b/lang/ruby-devel/Portfile @@ -77,7 +77,7 @@ depends_skip_archcheck pkgconfig select.group ruby select.file ${filespath}/ruby${ruby_ver_nodot} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append 0001-Use-numerical-macOS-versions.patch post-patch { diff --git a/lang/v8-8.3/Portfile b/lang/v8-8.3/Portfile index 46136de0bf786..c99d3cf8570cf 100755 --- a/lang/v8-8.3/Portfile +++ b/lang/v8-8.3/Portfile @@ -43,7 +43,7 @@ depends_lib-append port:gettext-runtime \ configure.python ${prefix}/bin/python${py_ver} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append 0001-Restore-ppc32-patches-from-upstream.patch \ 0002-inspector-unbreak-build-with-gcc.patch \ diff --git a/mail/alpine/Portfile b/mail/alpine/Portfile index b9d4616274c1f..24507eb90327e 100644 --- a/mail/alpine/Portfile +++ b/mail/alpine/Portfile @@ -35,7 +35,7 @@ depends_lib-append port:gettext-runtime \ port:ncurses patchfiles-append patch-fix-applekeychain.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.env SSLDIR=${prefix} configure.args --with-lib-path=${prefix}/lib \ diff --git a/mail/dovecot/Portfile b/mail/dovecot/Portfile index f4b378b4fbe9a..2e2480217a16e 100644 --- a/mail/dovecot/Portfile +++ b/mail/dovecot/Portfile @@ -109,7 +109,7 @@ if {${name} eq ${subport}} { add_users ${default_internal_user} group=${default_internal_user} realname=Dovecot \ ${default_login_user} group=${default_login_user} realname=Dovenull - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-doc-example-config-conf.d-10-master.conf.diff \ patch-src-master-master-settings.c.diff \ dynamic_lookup-11.patch \ diff --git a/mail/sqlgrey/Portfile b/mail/sqlgrey/Portfile index 5006944e2ec4d..01e238427ef1f 100644 --- a/mail/sqlgrey/Portfile +++ b/mail/sqlgrey/Portfile @@ -34,7 +34,7 @@ depends_lib port:perl${perl5.major} \ depends_run port:postfix -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-Makefile.diff \ patch-etc-sqlgrey.conf.diff \ patch-sqlgrey-logstats.pl.diff \ diff --git a/math/AlphaSparse/Portfile b/math/AlphaSparse/Portfile index 4e7e83f1236b3..d42d12c3b22b8 100644 --- a/math/AlphaSparse/Portfile +++ b/math/AlphaSparse/Portfile @@ -21,7 +21,7 @@ checksums rmd160 ad56116e0c4e9672bfb82415540ea459c8a7777a \ sha256 d61b35bf14ab7e6edf12e54a8a5e1a158fa8b453409159462f21dfba3aa45c3e \ size 9093990 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append 0001-Support-PPC-in-Makefile.patch \ 0002-Makefile-cleanup.patch \ 0003-Fix-for-missing-COMPAR_FN_T.patch \ diff --git a/math/fftw/Portfile b/math/fftw/Portfile index 153d3f18ff5a3..78f9a2723613d 100644 --- a/math/fftw/Portfile +++ b/math/fftw/Portfile @@ -32,7 +32,7 @@ checksums rmd160 723308722d76c12710db6473979adf8d086b0909 \ sha256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 patchfiles 05_ac_define_syntax.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_autoreconf yes autoreconf.args -fvi diff --git a/math/hptt/Portfile b/math/hptt/Portfile index 3fcde14d7c3c0..69a8969672029 100644 --- a/math/hptt/Portfile +++ b/math/hptt/Portfile @@ -19,7 +19,7 @@ maintainers {@barracuda156 gmail.com:vital.had} openmaintainer description High-Performance Tensor Transpose library long_description {*}${description} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-CMakeLists-add-PPC-support-unbreak-build-on-Darwin.patch \ 0002-CMakeLists-fix-install-path-for-headers.patch \ 0003-Add-hptt.pc-config-file.patch diff --git a/math/levmar/Portfile b/math/levmar/Portfile index 986f2de3959d3..281ed525e6874 100644 --- a/math/levmar/Portfile +++ b/math/levmar/Portfile @@ -32,7 +32,7 @@ checksums rmd160 2b29daea12804050c8d3939b8c142d27d36bffc8 \ sha256 3bf4ef1ea4475ded5315e8d8fc992a725f2e7940a74ca3b0f9029d9e6e94bad7 # Patch taken from levmar RPM by Eric Smith -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-Makefile.so.diff default_variants +atlas diff --git a/math/meschach/Portfile b/math/meschach/Portfile index b02e8cbdcb597..4a53ec2d40e2e 100644 --- a/math/meschach/Portfile +++ b/math/meschach/Portfile @@ -31,7 +31,7 @@ checksums ${name}_${version}.orig.tar.gz \ patchfiles meschach_1.2b-13.diff.gz meschach.diff set branch 1.2 set major 1 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/makefile.in reinplace "s|-O3|-O3 -D_REENTRANT -fno-common|g" ${worksrcpath}/makefile.in diff --git a/math/orpie/Portfile b/math/orpie/Portfile index ebc71128ecebb..ff9566927ae83 100644 --- a/math/orpie/Portfile +++ b/math/orpie/Portfile @@ -30,5 +30,5 @@ depends_lib port:gsl use_parallel_build no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-gsl-mgsl_sf.c.diff diff --git a/math/sprng/Portfile b/math/sprng/Portfile index 10c840f4d22ca..8cf5bbe7a0b5d 100644 --- a/math/sprng/Portfile +++ b/math/sprng/Portfile @@ -25,7 +25,7 @@ mpi.setup require use_configure no use_parallel_build no -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-makefile.diff patch-shared.diff configure.cflags -fPIC -Wall -Wwrite-strings -Wno-strict-aliasing -O3 -mtune=native diff --git a/math/xgraph/Portfile b/math/xgraph/Portfile index 17773cc14a930..c9eae94b6742a 100644 --- a/math/xgraph/Portfile +++ b/math/xgraph/Portfile @@ -20,7 +20,7 @@ depends_lib port:xorg-libX11 \ # http://www.blasted-heath.com/xg/ patchfiles patch-64b.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-getline.diff diff --git a/math/yices/Portfile b/math/yices/Portfile index cfb1b7c014c10..ac5b2fbd95c3a 100644 --- a/math/yices/Portfile +++ b/math/yices/Portfile @@ -49,7 +49,7 @@ if {${build_arch} in [list i386 ppc]} { } platform darwin powerpc { - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles 0001-Makefile-add-PPC-support.patch # Fix for Rosetta: diff --git a/multimedia/HandBrake/Portfile b/multimedia/HandBrake/Portfile index 6604570fc26eb..7a61ca262da2f 100644 --- a/multimedia/HandBrake/Portfile +++ b/multimedia/HandBrake/Portfile @@ -185,7 +185,7 @@ post-extract { # Patches maintained at https://github.com/larryv/HandBrake. -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Add-a-default-font-directory-for-fontconfig-to-use-w.patch \ 0002-BuildSystem-Create-configs-for-OS-X-Yosemite.patch \ diff --git a/multimedia/hdhomerun_gui/Portfile b/multimedia/hdhomerun_gui/Portfile index e3dad5efcb73a..c090d9b5a6c69 100644 --- a/multimedia/hdhomerun_gui/Portfile +++ b/multimedia/hdhomerun_gui/Portfile @@ -26,7 +26,7 @@ checksums hdhomerun_config_gui_20221031 \ size 253374 patchfiles patch-libhdhomerun.diff -patch.args -p1 +patch.pre_args-replace -p0 -p1 extract.suffix .tgz worksrcdir hdhomerun_config_gui diff --git a/multimedia/transcode/Portfile b/multimedia/transcode/Portfile index 926fcb81bd5a6..4385a2e5c5ea5 100644 --- a/multimedia/transcode/Portfile +++ b/multimedia/transcode/Portfile @@ -58,7 +58,7 @@ depends_lib path:lib/libavcodec.dylib:ffmpeg \ path:include/turbojpeg.h:libjpeg-turbo \ port:lame -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patch.args -b -V numbered patchfiles \ patch-avilib-avidump.c.diff \ diff --git a/net/hdhomerun/Portfile b/net/hdhomerun/Portfile index 4977bdf5f7ddd..ed8c089e34df5 100644 --- a/net/hdhomerun/Portfile +++ b/net/hdhomerun/Portfile @@ -30,7 +30,7 @@ if {${name} eq ${subport}} { universal_variant yes patchfiles patch-01-Makefile.diff - patch.args -p1 + patch.pre_args-replace -p0 -p1 post-patch { reinplace -locale C "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile diff --git a/net/ngrep/Portfile b/net/ngrep/Portfile index 0de381375fb4a..02549735e94ed 100644 --- a/net/ngrep/Portfile +++ b/net/ngrep/Portfile @@ -31,7 +31,7 @@ use_bzip2 yes depends_lib-append port:libpcap \ port:pcre -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 10_debian-build.diff \ 10_man-fixes.diff \ 20_setlocale.diff \ diff --git a/net/openconnect-sso/Portfile b/net/openconnect-sso/Portfile index a0c25a5260bd0..90e5e6b502991 100644 --- a/net/openconnect-sso/Portfile +++ b/net/openconnect-sso/Portfile @@ -43,7 +43,7 @@ depends_lib-append port:openconnect \ port:py${python.version}-virtualenv \ port:py${python.version}-pyxdg -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles poetry-core.diff variant legacy description {Add patch that enables legacy redirection with OpenSSL 3} { diff --git a/net/openssh/Portfile b/net/openssh/Portfile index e9f6c54b972f9..9282a0c7a8ec4 100644 --- a/net/openssh/Portfile +++ b/net/openssh/Portfile @@ -48,7 +48,7 @@ if {${name} eq ${subport}} { depends_build-append port:cctools } - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles launchd.patch \ agent.patch \ pam.patch \ diff --git a/net/pkixssh/Portfile b/net/pkixssh/Portfile index 08eeb39c05dc1..4732fa946f5fc 100644 --- a/net/pkixssh/Portfile +++ b/net/pkixssh/Portfile @@ -41,7 +41,7 @@ platform darwin 10 { depends_build-append port:cctools } -patch.args -p1 +patch.pre_args-replace -p0 -p1 patchfiles launchd.patch \ agent.patch \ pam.patch \ diff --git a/net/rsync-hfscomp/Portfile b/net/rsync-hfscomp/Portfile index fcafb431ab9fa..9ccd31cca91fb 100644 --- a/net/rsync-hfscomp/Portfile +++ b/net/rsync-hfscomp/Portfile @@ -33,7 +33,7 @@ checksums rmd160 f7d6c0c9752af8d9eb933cffc6032c1763490a04 \ sha256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 \ size 892724 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # these come from http://rsync.samba.org/ftp/rsync/rsync-patches-3.1.2.tar.gz # and need to be updated with each release diff --git a/net/rsync/Portfile b/net/rsync/Portfile index a1a3ff04683fd..599d328c28728 100644 --- a/net/rsync/Portfile +++ b/net/rsync/Portfile @@ -36,7 +36,7 @@ depends_lib port:popt \ port:zstd \ path:lib/libssl.dylib:openssl -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # This patch comes from # https://download.samba.org/pub/rsync/src/rsync-patches-3.3.0.tar.gz diff --git a/net/tcpick/Portfile b/net/tcpick/Portfile index 26e85a97aecf8..e28b98a9108c8 100644 --- a/net/tcpick/Portfile +++ b/net/tcpick/Portfile @@ -34,7 +34,7 @@ master_sites sourceforge:project/${name}/${name}/${version} depends_lib port:libpcap -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append implicit.patch # More patches from tcpick_0.2.1-10.debian.tar.xz diff --git a/net/tcptrace/Portfile b/net/tcptrace/Portfile index bbda30bb48c27..1ef9b8d3e4b35 100644 --- a/net/tcptrace/Portfile +++ b/net/tcptrace/Portfile @@ -34,7 +34,7 @@ depends_lib lib:libpcap:libpcap patch_sites https://cloudfront.debian.net/debian-archive/debian/pool/main/t/tcptrace/ patchfiles tcptrace_6.6.7-3.diff.gz -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-configure { set path "${worksrcpath}" diff --git a/net/wifi-password/Portfile b/net/wifi-password/Portfile index fd7c38b918b1e..1c42021c11145 100644 --- a/net/wifi-password/Portfile +++ b/net/wifi-password/Portfile @@ -18,7 +18,7 @@ checksums rmd160 653ffccd4114f3fd756e4f44e00b9e3072910460 \ sha256 7ed783685ed43a94878d148346cba01428dbe1d99d463407be937d0f1b57c67c \ size 1848 -patch.args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-aa8b59d3d7c45eef01f93b80fd998946b8ed57e7.diff post-patch { diff --git a/net/wol/Portfile b/net/wol/Portfile index 3058e214b39be..cbd1d32a4b9f1 100644 --- a/net/wol/Portfile +++ b/net/wol/Portfile @@ -21,7 +21,7 @@ patchfiles \ getline.patch \ m4-headers.patch \ upstream.fail.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_autoreconf yes autoreconf.args -fvi diff --git a/news/pan2/Portfile b/news/pan2/Portfile index 687715180bc3e..d3976ec3812a4 100644 --- a/news/pan2/Portfile +++ b/news/pan2/Portfile @@ -25,7 +25,7 @@ checksums rmd160 a10d80886ae28fa98ed5c5b792dd879844f03908 \ size 1819832 patchfiles bd9e8fbcbda40c8c8c4cc6d77f2776382c82ae15.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_build-append \ port:pkgconfig \ diff --git a/ocaml/ocaml-core_unix/Portfile b/ocaml/ocaml-core_unix/Portfile index 494b63cb8533c..66354de276495 100755 --- a/ocaml/ocaml-core_unix/Portfile +++ b/ocaml/ocaml-core_unix/Portfile @@ -34,7 +34,7 @@ depends_lib-append port:ocaml-core \ port:ocaml-timezone # FIXME: review the following. -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 if {${os.platform} eq "darwin" && ${os.major} < 16} { patchfiles 0001-time_stamp_counter_stubs.c-add-legacysupport-header-.patch \ 0002-core_unix_stubs.c-add-legacysupport-header-for-strnl.patch diff --git a/ocaml/ocaml-ocaml_intrinsics/Portfile b/ocaml/ocaml-ocaml_intrinsics/Portfile index 3100390be3c5c..ef6a25da241c0 100755 --- a/ocaml/ocaml-ocaml_intrinsics/Portfile +++ b/ocaml/ocaml-ocaml_intrinsics/Portfile @@ -20,7 +20,7 @@ checksums rmd160 05852d582d78f41de8bc0fddb2fa6265e05460eb \ github.tarball_from archive # FIXME: add an implementation for these. -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-crc_stubs.c-abort-instead-of-error-on-unsupported-pl.patch depends_build-append \ diff --git a/office/libreoffice/Portfile b/office/libreoffice/Portfile index 14a4d8b91ad2f..f900d02ace74b 100644 --- a/office/libreoffice/Portfile +++ b/office/libreoffice/Portfile @@ -48,7 +48,7 @@ distfiles ${main_distfile}:main \ skia-m111-a31e897fb3dcbc96b2b40999751611d029bf5404.tar.xz:skia \ nss-3.90-with-nspr-4.35.tar.gz:nss -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append 6a2b1d9.diff checksums ${name}-${version}.tar.xz \ diff --git a/palm/m68k-palm-elf-gcc/Portfile b/palm/m68k-palm-elf-gcc/Portfile index 57765c54961c2..4b76e9e0303b4 100644 --- a/palm/m68k-palm-elf-gcc/Portfile +++ b/palm/m68k-palm-elf-gcc/Portfile @@ -11,7 +11,7 @@ maintainers {@nkorth nkorth.com:nkorth} openmaintainer categories palm cross -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patch.dir ${workpath} patchfiles retro68.diff \ palm.diff \ diff --git a/perl/eperl/Portfile b/perl/eperl/Portfile index a75d67986e4c4..cc4d80c4671f7 100644 --- a/perl/eperl/Portfile +++ b/perl/eperl/Portfile @@ -33,7 +33,7 @@ use_configure yes ## Most patches are copied from the Debian distribution, which uses patch ## files with a prefix -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-copyright-updates.diff \ 0002-eperl_2.2.14-15.2.diff \ 0003-fix-spelling-errors.diff \ diff --git a/print/lcdf-typetools/Portfile b/print/lcdf-typetools/Portfile index 30cea1f683ab7..f4e2e034d7607 100644 --- a/print/lcdf-typetools/Portfile +++ b/print/lcdf-typetools/Portfile @@ -23,7 +23,7 @@ checksums rmd160 deb15840a105666210c1a6ab8e7cd76e7c9acbde \ sha256 517f9ee879208679d3224a14d5e6eb20598fc648d5c3562708083d003088a934 \ size 674355 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # otffvar.cc: error: ‘nullptr’ was not declared in this scope compiler.cxx_standard 2011 diff --git a/print/woff2/Portfile b/print/woff2/Portfile index 328053853de28..b757d25609a27 100644 --- a/print/woff2/Portfile +++ b/print/woff2/Portfile @@ -23,6 +23,6 @@ compiler.cxx_standard \ depends_lib port:brotli patchfiles 6859cef2674bf44384dd5ec6eac69d741698d58a.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.pre_args-append -DINSTALL_TOOLS=ON diff --git a/python/py-awscli2/Portfile b/python/py-awscli2/Portfile index 89cf38c4aaac2..8faed2411f7ac 100644 --- a/python/py-awscli2/Portfile +++ b/python/py-awscli2/Portfile @@ -64,7 +64,7 @@ if {${name} ne ${subport}} { copy -force ${filespath}/awscli2 ${worksrcpath}/py${python.version}-awscli2 } - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-requirements.diff post-patch { diff --git a/python/py-hyperestraier/Portfile b/python/py-hyperestraier/Portfile index 2a8d46892cb5f..1e32b48e3665f 100644 --- a/python/py-hyperestraier/Portfile +++ b/python/py-hyperestraier/Portfile @@ -47,7 +47,6 @@ if {${name} ne ${subport}} { size 474306 patchfiles patch-setup.py patch-examples-search.py - patch.pre_args -p0 depends_lib-append port:hyperestraier #depends_build port:swig-python diff --git a/python/py-ligo-gracedb/Portfile b/python/py-ligo-gracedb/Portfile index 438bc9a5ef4a0..b0b35a2a437b0 100644 --- a/python/py-ligo-gracedb/Portfile +++ b/python/py-ligo-gracedb/Portfile @@ -30,7 +30,7 @@ master_sites https://software.igwn.org/lscsoft/source/ distname ligo-gracedb-${version} patchfiles runner_fix.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 checksums rmd160 641ab74254dd5a1888e3e20ced07806baafbb5da \ sha256 e19afb097420bf1681eac4f5ee2c6601d6b0fe49cc2c169200a5738142877054 \ diff --git a/python/py-mysql/Portfile b/python/py-mysql/Portfile index 7fe00922348b1..8fb542e909985 100644 --- a/python/py-mysql/Portfile +++ b/python/py-mysql/Portfile @@ -29,7 +29,7 @@ python.versions 27 if {${name} ne ${subport}} { depends_build port:py${python.version}-setuptools - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-site.cfg.diff post-patch { diff --git a/python/py-pmw/Portfile b/python/py-pmw/Portfile index 33076cee73673..9b0595d63aba3 100644 --- a/python/py-pmw/Portfile +++ b/python/py-pmw/Portfile @@ -32,7 +32,7 @@ if {${name} ne ${subport}} { patchfiles patch-pmw2.diff \ patch-pmw2-py36.diff \ patch-callable.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 set pmw_folder Pmw_2_0_0 diff --git a/python/py-pylibelf/Portfile b/python/py-pylibelf/Portfile index 8ac9b5b30a267..21b0556846734 100644 --- a/python/py-pylibelf/Portfile +++ b/python/py-pylibelf/Portfile @@ -25,7 +25,7 @@ if {${name} ne ${subport}} { hg.tag 81d39db22cbd worksrcdir ${myname}-${version} - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles setup.diff post-patch { diff --git a/python/py-pyopencl/Portfile b/python/py-pyopencl/Portfile index 6c75e06ecc6e3..043fc2fa2e8c9 100644 --- a/python/py-pyopencl/Portfile +++ b/python/py-pyopencl/Portfile @@ -25,7 +25,7 @@ python.pep517 no if {${name} ne ${subport}} { - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles patch-setup.py.diff compiler.cxx_standard 2014 diff --git a/python/py-svipc/Portfile b/python/py-svipc/Portfile index 3067e7800eab8..2452ba4d1ed0f 100644 --- a/python/py-svipc/Portfile +++ b/python/py-svipc/Portfile @@ -17,7 +17,7 @@ long_description This plug-in for python and yorick gives access to the \ homepage https://github.com/mdcb/yp-svipc patchfiles patch-version.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 checksums rmd160 f0d94da1014bab729db6658d22f7ee0d38b27a44 \ sha256 52f0dd4c5611b18e048c4d83e86a1d12e7362c265089574d78b2e18749b0629c \ diff --git a/python/py-tensorflow1/Portfile b/python/py-tensorflow1/Portfile index 14a682a527b37..b96767ab7f0fd 100644 --- a/python/py-tensorflow1/Portfile +++ b/python/py-tensorflow1/Portfile @@ -43,7 +43,7 @@ if { ${os.major} < ${min_darwin} } { compiler.blacklist-append {clang < 1200.0.32.27} {macports-clang-[4-9].0} compiler.cxx_standard 2014 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append Fix-build-failures-for-python-3.8.patch if {${os.major} < 16} { diff --git a/python/py-terminaltables/Portfile b/python/py-terminaltables/Portfile index a5d2cf6b44b29..65e6327a379eb 100644 --- a/python/py-terminaltables/Portfile +++ b/python/py-terminaltables/Portfile @@ -26,7 +26,7 @@ checksums rmd160 9d02523f89d32c890ae9c40212155e221584e279 \ size 12264 if {${name} ne ${subport}} { - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 patchfiles-append \ 0001-switch-to-poetry-core.patch } diff --git a/python/py-unittest2/Portfile b/python/py-unittest2/Portfile index 91b61670e04de..da3b6640effe9 100644 --- a/python/py-unittest2/Portfile +++ b/python/py-unittest2/Portfile @@ -30,7 +30,7 @@ checksums rmd160 b9294b1ef9a6f0f7d8d2419b3260fc27ba81777d \ size 81432 # see: last two commits in https://hg.python.org/unittest2, but also don't require argparse for setup -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-traceback2-everywhere.diff \ patch-argparse-dependency.diff diff --git a/python/py-zeroc-ice35/Portfile b/python/py-zeroc-ice35/Portfile index aa035321bacb4..2b0fc57c2c4c3 100644 --- a/python/py-zeroc-ice35/Portfile +++ b/python/py-zeroc-ice35/Portfile @@ -37,7 +37,7 @@ checksums sha1 63599ea22a1e9638a49356682c9e516b7c2c454f \ patchfiles patch-ice.cpp.config.Make.rules.Darwin.diff \ patch-ice.py.config.Make.rules.Darwin.diff \ patch-ice.py.modules.IcePy.Communicator.cpp.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 platforms darwin diff --git a/python/py27-scipy/Portfile b/python/py27-scipy/Portfile index 78459bbb833ef..6d5a2b3e44993 100644 --- a/python/py27-scipy/Portfile +++ b/python/py27-scipy/Portfile @@ -43,7 +43,7 @@ compilers.allow_arguments_mismatch yes # 1.2.3 is quite old, no guarantees that any of this works, # and there is no point in pushing it upstream, really. patchfiles-append patch-xcode12-fixes.27.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_lib-append port:py${python.version}-numpy \ port:py${python.version}-pybind11 diff --git a/python/thefuck/Portfile b/python/thefuck/Portfile index 900129b40ef0b..0ef3c260af41a 100644 --- a/python/thefuck/Portfile +++ b/python/thefuck/Portfile @@ -33,7 +33,7 @@ depends_lib-append port:py${python.version}-colorama \ port:py${python.version}-six patchfiles-append patch-python312.diff -patch.args -p1 +patch.pre_args-replace -p0 -p1 notes " To configure thefuck fuck alias, add this to your startup file (eg. .bash_profile, .zshrc) diff --git a/science/PothosAudio/Portfile b/science/PothosAudio/Portfile index 4002d907d740e..e4642efae9045 100644 --- a/science/PothosAudio/Portfile +++ b/science/PothosAudio/Portfile @@ -34,4 +34,4 @@ depends_lib-append \ patchfiles-append \ patch-fix-FindPortaudio.cmake.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 diff --git a/science/PothosCore/Portfile b/science/PothosCore/Portfile index f29cc1ccc97c4..294b33983c2a3 100644 --- a/science/PothosCore/Portfile +++ b/science/PothosCore/Portfile @@ -46,7 +46,7 @@ configure.args-append \ # remove with next release patchfiles patch-092d9.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # however keep this one # ld: unknown option: --no-undefined diff --git a/science/ds9/Portfile b/science/ds9/Portfile index 60f5b8ce97248..5492253391c1e 100644 --- a/science/ds9/Portfile +++ b/science/ds9/Portfile @@ -49,7 +49,7 @@ patchfiles 0001-Use-MacPorts-share-directory-instead-of-zipfs.patch 0002-Use-CXX-to-build-tksao-C-files.patch \ 0003-Use-openssl-1.0-from-MacPorts-instead-of-bundled-ope.patch \ 0004-Use-ast-from-MacPorts.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 post-patch { # FIXME: Prefix has to be embedded in source and Makefiles in some places. diff --git a/science/gildas/Portfile b/science/gildas/Portfile index 53b0b8a0dc880..d738d655d0cd3 100644 --- a/science/gildas/Portfile +++ b/science/gildas/Portfile @@ -36,7 +36,7 @@ checksums rmd160 e605d720a8d771b415cd8c5026d5565cb56154c9 \ sha256 020705beab9105d3bdb629e70b16931489b74a38fb552412819ce4b55bcdd8d0 \ size 46292368 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-admin-Makefile.def.diff \ patch-admin-Makefile.python.diff \ patch-admin-Makefile.build.diff \ diff --git a/science/gr-cdma/Portfile b/science/gr-cdma/Portfile index ec424da5c93a6..9326c10e0e89b 100644 --- a/science/gr-cdma/Portfile +++ b/science/gr-cdma/Portfile @@ -31,7 +31,7 @@ subport gr37-cdma { gr-cdma patchfiles-append patch-installs.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # 2nd part of patch post-patch { reinplace "s|@PYTHON_HOME@|${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages/cdma|g" ${worksrcpath}/python/cdma_parameters.py diff --git a/science/gr-gsm/Portfile b/science/gr-gsm/Portfile index cef90a3e231df..60601d51b9c66 100644 --- a/science/gr-gsm/Portfile +++ b/science/gr-gsm/Portfile @@ -43,7 +43,7 @@ subport gr37-gsm { # fix name of rst2man patchfiles-append patch-docs_CMakeLists.txt.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # fix allowing for CMAKE_MODULES_DIR patchfiles-append patch-CMakeLists.txt.diff diff --git a/science/gr-lora/Portfile b/science/gr-lora/Portfile index 88f94296398cb..4c498aeb8569c 100644 --- a/science/gr-lora/Portfile +++ b/science/gr-lora/Portfile @@ -47,7 +47,7 @@ subport gr37-lora-rpp0 { patchfiles-append \ patch-build-fixes.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 conflicts \ gr37-lora-BastilleResearch \ diff --git a/science/gr-ofdm/Portfile b/science/gr-ofdm/Portfile index 43d72e1d0446e..5dd2a2ef8bfad 100644 --- a/science/gr-ofdm/Portfile +++ b/science/gr-ofdm/Portfile @@ -38,7 +38,7 @@ subport gr37-ofdm { # fixes ITPP finding. patchfiles-append \ patch-build-clang_c++11.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # specify ITPP to use configure.args-append \ diff --git a/science/libad9361-iio/Portfile b/science/libad9361-iio/Portfile index 26326574f60c1..fcdbc378ab5ae 100644 --- a/science/libad9361-iio/Portfile +++ b/science/libad9361-iio/Portfile @@ -23,7 +23,7 @@ revision 0 # patch to fix install IIO header inclusion patchfiles-append patch-fix_build.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_lib-append path:lib/libiio.dylib:libiio diff --git a/science/madness/Portfile b/science/madness/Portfile index 2289c002cd04e..c05bed93db828 100644 --- a/science/madness/Portfile +++ b/science/madness/Portfile @@ -46,7 +46,7 @@ if {(${os.platform} eq "darwin" && ${os.major} < 20) || ${os.platform} ne "darwi -DLAPACK_LIBRARIES=OpenBLAS } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # Temporarily avoid building chemistry part: # https://github.com/m-a-d-n-e-s-s/madness/issues/459 patchfiles 0001-CMakeLists-support-ppc.patch \ diff --git a/science/miriad/Portfile b/science/miriad/Portfile index c9fa7e3cfd589..6a8d4dda338cf 100644 --- a/science/miriad/Portfile +++ b/science/miriad/Portfile @@ -93,7 +93,7 @@ minimum_xcodeversions {9 3.1} worksrcdir ${name}-${relver} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles gcc-8-fixes.patch # Configure settings. Keep the binaries out of ${prefix}/bin to avoid diff --git a/science/openbabel/Portfile b/science/openbabel/Portfile index 8f9bc973c8ece..2f38f528c1dc6 100644 --- a/science/openbabel/Portfile +++ b/science/openbabel/Portfile @@ -37,7 +37,7 @@ compiler.thread_local_storage yes patchfiles version.patch patchfiles-append patch-cmake-coordgen.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args-append \ -DBUILD_GUI=OFF \ diff --git a/science/osmocore/Portfile b/science/osmocore/Portfile index 4646b973a57d4..7f23cf39c3f47 100644 --- a/science/osmocore/Portfile +++ b/science/osmocore/Portfile @@ -81,7 +81,7 @@ depends_lib-append \ port:python27 \ port:talloc -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # update configure.ac to current automake standards diff --git a/science/root6/Portfile b/science/root6/Portfile index 08caeadbe9fcb..1055ab0206dc8 100644 --- a/science/root6/Portfile +++ b/science/root6/Portfile @@ -99,7 +99,7 @@ select.file ${filespath}/${name} # port specific location set install_prefix ${prefix}/libexec/root${version_major} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.args-append \ -Dgnuinstall=ON \ diff --git a/science/rsp_tcp/Portfile b/science/rsp_tcp/Portfile index a735456cde6ad..6af45a7b7aaee 100644 --- a/science/rsp_tcp/Portfile +++ b/science/rsp_tcp/Portfile @@ -28,6 +28,6 @@ depends_lib-append \ # PR opened upstream 30 days ago without any answer # so I put here the patch until upstream -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append \ patch-version.diff diff --git a/science/rtl-sdr/Portfile b/science/rtl-sdr/Portfile index 865d225d9cc91..f40897259a047 100644 --- a/science/rtl-sdr/Portfile +++ b/science/rtl-sdr/Portfile @@ -33,7 +33,7 @@ configure.cppflags-delete -I${prefix}/include # patch to allow us to override git describe patchfiles-append patch-fix-git-describe.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # set the string to use in place of git describe since that won't work diff --git a/science/source-extractor/Portfile b/science/source-extractor/Portfile index 4944950cfbaf6..c75fd3ef510b9 100644 --- a/science/source-extractor/Portfile +++ b/science/source-extractor/Portfile @@ -33,7 +33,7 @@ checksums rmd160 32d56c0b46cf67ebbb479ccffda7242370e51e3e \ patchfiles Rename-CLI-tool-to-source-extractor.patch \ Fix-format-security-errors.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 configure.fc ${prefix}/bin/no-possible-compiler configure.cflags-append {*}${configure.cppflags} diff --git a/science/uhd/Portfile b/science/uhd/Portfile index 0377c18703cf4..50938cfed5cd1 100644 --- a/science/uhd/Portfile +++ b/science/uhd/Portfile @@ -44,7 +44,7 @@ Provides the release version, which is typically updated every month or so. # temporary patch to disable Boost DIRS before internal DIRS patchfiles-append patch-host_CMakeLists.txt.release.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # temporary patch to reduce optimization from -Os to -O1 because 1 # file takes 1000 times longer to compile using the former than @@ -82,7 +82,7 @@ subport uhd-39lts { # temporary patch to disable Boost DIRS before internal DIRS patchfiles-append patch-host_CMakeLists.txt.39lts.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # temporary patch to fix the API usage for "gpsd_read" for the 3.18.0 # release. works on all non-devel UHD ports; devel contains this patch. @@ -137,7 +137,7 @@ subport uhd-devel { # temporary patch to disable Boost DIRS before internal DIRS patchfiles-append patch-host_CMakeLists.txt.devel.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 # set the variable UHD_VERSION_DEVEL to TRUE, no matter its # current setting (so, quietly) diff --git a/security/oath-toolkit/Portfile b/security/oath-toolkit/Portfile index 4dd24f3e73f97..3283133ec2c52 100644 --- a/security/oath-toolkit/Portfile +++ b/security/oath-toolkit/Portfile @@ -28,7 +28,7 @@ checksums rmd160 3e7715b6e90c2ac274de6c3bcbca132c9c6e93c9 \ sha256 36eddfce8f2f36347fb257dbf878ba0303a2eaafe24eaa071d5cd302261046a9 \ size 5625279 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # Fix for 2.6.7-specific issue on macOS, related to lack of 'pam_modutil.h'; details in patch. # Merged into upstream master, and will be included in next release. diff --git a/security/opensc/Portfile b/security/opensc/Portfile index d12aec81d2efa..ff800d3e19a10 100644 --- a/security/opensc/Portfile +++ b/security/opensc/Portfile @@ -42,7 +42,7 @@ if {![variant_isset openssl3]} { openssl.branch 1.1 } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-winscard.diff patchfiles-append patch-pgp-and-tools.diff diff --git a/sysutils/chntpw/Portfile b/sysutils/chntpw/Portfile index 334050a6dea38..43b6a34f0e8cc 100644 --- a/sysutils/chntpw/Portfile +++ b/sysutils/chntpw/Portfile @@ -55,7 +55,7 @@ patchfiles patch-debian-04_get_abs_path.diff \ patch-debian-15_added_samunlock_binary.diff \ patch-Makefile.diff \ patch-warnings_64bit.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_configure no diff --git a/sysutils/gkrellm/Portfile b/sysutils/gkrellm/Portfile index 9069694c75bc8..7cac2376c013c 100644 --- a/sysutils/gkrellm/Portfile +++ b/sysutils/gkrellm/Portfile @@ -29,7 +29,7 @@ depends_build port:pkgconfig depends_lib path:lib/pkgconfig/gtk+-2.0.pc:gtk2 \ port:xorg-libsm -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-2.11-master-commits.diff use_configure no diff --git a/sysutils/mmv/Portfile b/sysutils/mmv/Portfile index c932add55d3b9..a3f2d4f003927 100644 --- a/sysutils/mmv/Portfile +++ b/sysutils/mmv/Portfile @@ -20,7 +20,7 @@ master_sites debian:m/${name} distname ${name}_${base_version}.orig worksrcdir ${name}-${base_version}.orig patchfiles ${name}_${version}.diff.gz -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 checksums ${distfiles} \ rmd160 b268bd5ec5149a4628b73844221f6f60b026e80b \ diff --git a/sysutils/optool/Portfile b/sysutils/optool/Portfile index 01e3be6926b3f..56a12ea16fb95 100644 --- a/sysutils/optool/Portfile +++ b/sysutils/optool/Portfile @@ -51,7 +51,7 @@ post-extract { patchfiles patch-ldflags-objc.diff \ patch-argparsermacOS-12.diff \ patch-coreparse-macOS-12.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 if { ${os.major} < 12 } { # optool/defines.h:68:22: warning: type specifier missing, defaults to 'int' [-Wimplicit-int] diff --git a/sysutils/pv/Portfile b/sysutils/pv/Portfile index 1049f650932c1..4972dcfa3a88b 100644 --- a/sysutils/pv/Portfile +++ b/sysutils/pv/Portfile @@ -32,7 +32,7 @@ checksums rmd160 036524f7edf64de10e85fd40f295fc905b827eb9 \ sha256 a0789d8f8c5a08faf370b5a07d1d936aeff9504a4f49da76d4164797ac4606e6 \ size 330129 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles fix-modifiers-direct-io-test.diff depends_build-append \ diff --git a/sysutils/squashfs-tools/Portfile b/sysutils/squashfs-tools/Portfile index 1c437dbe0c39a..50fc73cebe555 100644 --- a/sysutils/squashfs-tools/Portfile +++ b/sysutils/squashfs-tools/Portfile @@ -40,7 +40,7 @@ depends_lib-append port:zlib \ worksrcdir ${distname}/${name} patchfiles darwin.patch -patch.pre_args -p2 +patch.pre_args-replace -p0 -p2 use_configure no diff --git a/sysutils/synkron/Portfile b/sysutils/synkron/Portfile index b3c4febfeb393..6d49e64f36da9 100644 --- a/sysutils/synkron/Portfile +++ b/sysutils/synkron/Portfile @@ -31,7 +31,7 @@ post-extract { delete {*}[glob ${worksrcpath}/i18n/Synkron-*.qm] } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-add_missing_translations.diff post-patch { diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile index 313f609a900df..e0638509aa480 100644 --- a/sysutils/watchman/Portfile +++ b/sysutils/watchman/Portfile @@ -54,7 +54,7 @@ configure.env-append \ YARN_PATH= \ DESTDIR=${destroot} -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0002-cmake-rust-build-target.patch \ 0003-no-tests.patch \ 0004-cmake-rust-build-offline.patch \ diff --git a/tex/makejvf/Portfile b/tex/makejvf/Portfile index 0c738804fdb01..374aa8e3ecbc8 100644 --- a/tex/makejvf/Portfile +++ b/tex/makejvf/Portfile @@ -19,7 +19,7 @@ checksums md5 7fd15c90111732cce14c5dbb6228ecb3 \ depends_lib port:gettext -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-makejvf.diff post-patch { diff --git a/tex/tetex-frogg/Portfile b/tex/tetex-frogg/Portfile index a034f8d377ed6..82ff01feaa679 100644 --- a/tex/tetex-frogg/Portfile +++ b/tex/tetex-frogg/Portfile @@ -31,7 +31,7 @@ checksums \ patch_sites http://ftp.debian.org/debian/pool/main/t/tetex-frogg patchfiles ${diff_file} -patch.args -p1 +patch.pre_args-replace -p0 -p1 livecheck.type regex livecheck.url ${master_sites}/?C=M&O=D diff --git a/textproc/docbook-utils/Portfile b/textproc/docbook-utils/Portfile index 970b65a3af20d..37717f2a23b4f 100644 --- a/textproc/docbook-utils/Portfile +++ b/textproc/docbook-utils/Portfile @@ -51,7 +51,7 @@ post-extract { ${worksrcpath}/bin/ } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles docbook-utils-spaces.patch \ docbook-utils-2ndspaces.patch \ docbook-utils-w3mtxtconvert.patch \ diff --git a/textproc/enchant/Portfile b/textproc/enchant/Portfile index 2fcb95791cdd7..da4093ea9d90b 100644 --- a/textproc/enchant/Portfile +++ b/textproc/enchant/Portfile @@ -24,7 +24,7 @@ checksums rmd160 a992034355bb36b9acabdbd400c9f4a3b996cce6 \ sha256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f \ size 607018 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_build-append \ path:bin/pkg/config:pkgconfig diff --git a/textproc/gpsbabel/Portfile b/textproc/gpsbabel/Portfile index 92854e2681768..66d2a9f32e116 100644 --- a/textproc/gpsbabel/Portfile +++ b/textproc/gpsbabel/Portfile @@ -34,7 +34,7 @@ if {${subport} eq ${name}} { # configure with qmake # see https://github.com/GPSBabel/gpsbabel/pull/611 patchfiles-append patch-pr611.diff - patch.pre_args -p1 + patch.pre_args-replace -p0 -p1 depends_lib-append \ path:lib/pkgconfig/libusb-1.0.pc:libusb \ diff --git a/textproc/libe-book/Portfile b/textproc/libe-book/Portfile index 7d229963c40d0..fe7508b623354 100644 --- a/textproc/libe-book/Portfile +++ b/textproc/libe-book/Portfile @@ -34,7 +34,7 @@ depends_lib-append path:lib/pkgconfig/icu-uc.pc:icu \ compiler.cxx_standard 2011 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles 0001-fix-build-with-ICU-68.patch # avoid dependency on cppunit diff --git a/textproc/sgml-common/Portfile b/textproc/sgml-common/Portfile index cb11bf1fad91b..4d32e532518b7 100644 --- a/textproc/sgml-common/Portfile +++ b/textproc/sgml-common/Portfile @@ -46,7 +46,7 @@ depends_lib-append port:perl5 \ set sgmldir ${prefix}/share/sgml -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-bin-install-catalog.in.diff \ patch-config-sgml.conf.diff \ patch-xml-iso-entities-Makefile.am.diff \ diff --git a/textproc/syck/Portfile b/textproc/syck/Portfile index 8c93e3f559ccc..b555c56feb858 100644 --- a/textproc/syck/Portfile +++ b/textproc/syck/Portfile @@ -19,7 +19,7 @@ master_sites https://github.com/indeyets/syck/downloads checksums md5 198f925b4ed7fe04a182c35014498634 \ sha1 30f89eba1fae0546ccfa75a9a3b865a3c8a9ac79 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-bison-2.6.diff use_parallel_build no diff --git a/textproc/tcl-dox/Portfile b/textproc/tcl-dox/Portfile index b6725632e7e33..472a9fe4f7d49 100644 --- a/textproc/tcl-dox/Portfile +++ b/textproc/tcl-dox/Portfile @@ -32,7 +32,7 @@ patchfiles \ patch-0008-don-t-break-the-lexer-if-there-is-an-escaped-bracket.diff \ patch-0009-remove-commented-test-code.diff -patch.args -p1 +patch.pre_args-replace -p0 -p1 patch.dir ${worksrcpath}/src use_configure no diff --git a/www/apache2/Portfile b/www/apache2/Portfile index c916e3c1a857c..18da77ed79624 100644 --- a/www/apache2/Portfile +++ b/www/apache2/Portfile @@ -35,7 +35,7 @@ depends_lib port:apr \ port:perl5 \ port:zlib -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-build-rules.mk.in.diff \ patch-config.layout.diff \ patch-support-apxs.in.diff \ diff --git a/www/mod_fcgid/Portfile b/www/mod_fcgid/Portfile index b850893ebfb65..c273ed0781356 100644 --- a/www/mod_fcgid/Portfile +++ b/www/mod_fcgid/Portfile @@ -22,7 +22,7 @@ checksums rmd160 cb5fd1fbf705ba3dff62a705d06c0632acd491bd \ depends_lib port:apache2 -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-modules-fcgid-fcgid_conf.c.diff post-patch { diff --git a/www/raptor2/Portfile b/www/raptor2/Portfile index 9f0097b8f0e52..0b27aa1877b5d 100644 --- a/www/raptor2/Portfile +++ b/www/raptor2/Portfile @@ -31,7 +31,7 @@ depends_lib port:curl \ port:zlib patchfiles-append patch-libxml_ver.diff -patch.args -p1 +patch.pre_args-replace -p0 -p1 # raptor_json.c: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'static' # raptor_json.c: error: 'raptor_json_yajl_integer' undeclared here (not in a function) diff --git a/www/redland/Portfile b/www/redland/Portfile index 2f2e7fb1b3a29..2b38dff0ebf86 100644 --- a/www/redland/Portfile +++ b/www/redland/Portfile @@ -19,7 +19,7 @@ checksums rmd160 86bdf793f36ca01197580fe242c4456b8cbfae39 \ sha256 de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681 patchfiles patch-configure.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 depends_lib port:curl \ port:libiconv \ diff --git a/www/tenfourfox/Portfile b/www/tenfourfox/Portfile index 6938cab624aa1..f5ccb2791e1a6 100644 --- a/www/tenfourfox/Portfile +++ b/www/tenfourfox/Portfile @@ -92,7 +92,7 @@ if {![variant_isset G5]} { default_variants +G4 } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles-append patch-ots-stdlog-fix.diff post-patch { diff --git a/www/urlview/Portfile b/www/urlview/Portfile index c79d5500785f4..e3d408a0e7003 100644 --- a/www/urlview/Portfile +++ b/www/urlview/Portfile @@ -30,7 +30,7 @@ checksums ${dist_file} \ patch_sites ${master_sites} patchfiles ${diff_file} -patch.args -p1 +patch.pre_args-replace -p0 -p1 # add missing include for 'quote' patchfiles-append implicit.patch diff --git a/www/wml/Portfile b/www/wml/Portfile index c7cdc94470725..d65ad1912f107 100644 --- a/www/wml/Portfile +++ b/www/wml/Portfile @@ -29,7 +29,7 @@ checksums rmd160 fead82a35d116447b860d7b1c506c6de187355e8 \ sha256 8e11ef19ea67ff9c4b28ff0fcacf5098881ac0c5f09ddfe3abc29f1e12be5d4a \ size 3115230 -patch.args -p1 +patch.pre_args-replace -p0 -p1 patchfiles patch-configure.diff \ patch-Makefile.in.diff \ diff --git a/x11/Xaw3d/Portfile b/x11/Xaw3d/Portfile index a7335646d96f4..0cd831ffdcc54 100644 --- a/x11/Xaw3d/Portfile +++ b/x11/Xaw3d/Portfile @@ -30,7 +30,7 @@ depends_lib port:xorg-libXext \ port:xpm \ port:xorg-libXt -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles \ 0001-Xaw3d-1.6.1-3Dlabel.patch.patch \ 0002-Xaw3d-1.6.1-fontset.patch.patch \ diff --git a/x11/blt/Portfile b/x11/blt/Portfile index eb7b1f193b2bf..cdc0ef776c1e2 100644 --- a/x11/blt/Portfile +++ b/x11/blt/Portfile @@ -38,7 +38,7 @@ configure.args-append --with-tcl=${prefix}/lib \ --with-tk=${prefix}/lib # prevent having to modify all of Debian patches -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 # taken from Debian (https://packages.debian.org/unstable/devel/blt-dev) patchfiles-append 02-debian-all.patch \ diff --git a/x11/tango-icon-theme-extras/Portfile b/x11/tango-icon-theme-extras/Portfile index 1ddb1e9793cdd..4726642328368 100644 --- a/x11/tango-icon-theme-extras/Portfile +++ b/x11/tango-icon-theme-extras/Portfile @@ -17,7 +17,7 @@ homepage http://tango.freedesktop.org/Tango_Icon_Library master_sites http://tango.freedesktop.org/releases/ patchfiles configure.ac-and-svg2png.sh.in.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 checksums md5 caaceaec7b61f1cbda0db9842f9db281 \ sha1 1bed3023139187c36e851df19506f4942bf2d1c1 \ diff --git a/x11/tango-icon-theme/Portfile b/x11/tango-icon-theme/Portfile index 9a20ea6da80cb..8a2cffd9059dd 100644 --- a/x11/tango-icon-theme/Portfile +++ b/x11/tango-icon-theme/Portfile @@ -13,7 +13,7 @@ license public-domain supported_archs noarch patchfiles configure.ac-and-svg2png.sh.in.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 homepage http://tango.freedesktop.org/Tango_Icon_Library master_sites http://tango.freedesktop.org/releases/ diff --git a/x11/xdm/Portfile b/x11/xdm/Portfile index 6f1bba2407c7d..353f7a1de7e15 100644 --- a/x11/xdm/Portfile +++ b/x11/xdm/Portfile @@ -29,7 +29,7 @@ depends_build port:pkgconfig \ depends_lib port:xorg-libXinerama \ port:xorg-libXaw -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 patchfiles socket.patch use_autoreconf yes diff --git a/x11/xinit/Portfile b/x11/xinit/Portfile index 990c6c0525cdf..640385c518765 100644 --- a/x11/xinit/Portfile +++ b/x11/xinit/Portfile @@ -42,7 +42,7 @@ if {[vercmp ${os.version} 10.3.0] < 0} { # Run the test on non-powerpc systems only. patchfiles-append patch-no-libdispatch-ppc.diff -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_autoreconf yes autoreconf.args -fvi diff --git a/x11/xorg-server-1.18/Portfile b/x11/xorg-server-1.18/Portfile index d536d4be92564..65e4b0a7e0c5a 100644 --- a/x11/xorg-server-1.18/Portfile +++ b/x11/xorg-server-1.18/Portfile @@ -94,7 +94,7 @@ if { ${os.major} >= 19 } { patchfiles-append remove-appflags-active-hack.diff } -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 platform darwin 8 { configure.args-append --disable-dependency-tracking diff --git a/x11/xorg-server-devel/Portfile b/x11/xorg-server-devel/Portfile index 7260a6cf5c34b..266246e4a9507 100644 --- a/x11/xorg-server-devel/Portfile +++ b/x11/xorg-server-devel/Portfile @@ -82,7 +82,7 @@ patchfiles-append \ # doesn't complain about subdirectory *.in replacement files usage. patchfiles-append 2001-enable-automake-subdir-objects.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_autoreconf yes autoreconf.args -fvi diff --git a/x11/xorg-server-legacy/Portfile b/x11/xorg-server-legacy/Portfile index cee775e6f3490..e37447a6562ff 100644 --- a/x11/xorg-server-legacy/Portfile +++ b/x11/xorg-server-legacy/Portfile @@ -86,7 +86,7 @@ patchfiles-append \ # doesn't complain about subdirectory *.in replacement files usage. patchfiles-append 2001-enable-automake-subdir-objects.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 platform darwin 8 { configure.args-append --disable-dependency-tracking diff --git a/x11/xorg-server/Portfile b/x11/xorg-server/Portfile index 878b0be93c0fd..96f0c4a3f2bac 100644 --- a/x11/xorg-server/Portfile +++ b/x11/xorg-server/Portfile @@ -82,7 +82,7 @@ patchfiles-append \ # doesn't complain about subdirectory *.in replacement files usage. patchfiles-append 2001-enable-automake-subdir-objects.patch -patch.pre_args -p1 +patch.pre_args-replace -p0 -p1 use_autoreconf yes autoreconf.args -fvi