diff --git a/textproc/riff/Portfile b/textproc/riff/Portfile index 2878a5c14de..3ae35c9d3ee 100644 --- a/textproc/riff/Portfile +++ b/textproc/riff/Portfile @@ -4,7 +4,7 @@ PortSystem 1.0 PortGroup cargo 1.0 PortGroup github 1.0 -github.setup walles riff 3.3.10 +github.setup walles riff 3.6.1 github.tarball_from archive revision 0 @@ -20,9 +20,9 @@ maintainers {gmail.com:herby.gillot @herbygillot} \ openmaintainer checksums ${distname}${extract.suffix} \ - rmd160 2942b398fb4bad83074923de6b3d34b53b495252 \ - sha256 6db6ac7525f00c4a4cb45351b9a229e253b3e9053ab365d6f881c0144159f8da \ - size 2174200 + rmd160 e8c314fef4b772b78a1141a9a82d741a57431e23 \ + sha256 d360058f0e51d162235307498485f92dc57518877f5646f00521b97e92957bbe \ + size 2200291 patchfiles patch-src-main-rs-moar-pager.diff @@ -59,21 +59,32 @@ cargo.crates \ colorchoice 1.0.0 acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7 \ ctor 0.1.16 7fbaabec2c953050352311293be5c6aba8e141ba19d6811862b232d6fd020484 \ difference 2.0.0 524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198 \ + displaydoc 0.2.5 97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0 \ either 1.6.1 e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457 \ errno 0.3.5 ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860 \ fastrand 1.9.0 e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be \ + form_urlencoded 1.2.1 e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456 \ gimli 0.23.0 f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce \ git-version 0.3.4 94918e83f1e01dedc2e361d00ce9487b14c58c7f40bab148026fa39d42cb41e2 \ git-version-macro 0.3.4 34a97a52fdee1870a34fa6e4b77570cba531b27d1838874fef4429a791a3d657 \ heck 0.5.0 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea \ hermit-abi 0.1.19 62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33 \ + icu_collections 2.0.0 200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47 \ + icu_locale_core 2.0.0 0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a \ + icu_normalizer 2.0.0 436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979 \ + icu_normalizer_data 2.0.0 00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3 \ + icu_properties 2.0.1 016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b \ + icu_properties_data 2.0.1 298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632 \ + icu_provider 2.0.0 03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af \ + idna 1.0.3 686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e \ + idna_adapter 1.2.1 3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344 \ instant 0.1.12 7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c \ io-lifetimes 1.0.6 cfa919a82ea574332e2de6e74b4c36e74d41982b335080fa59d4ef31be20fdf3 \ is_terminal_polyfill 1.70.1 7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf \ itertools 0.10.1 69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf \ - lazy_static 1.4.0 e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 \ libc 0.2.140 99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c \ linux-raw-sys 0.1.4 f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4 \ + litemap 0.8.0 241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956 \ log 0.4.21 90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c \ memchr 2.5.0 2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d \ miniz_oxide 0.4.3 0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d \ @@ -81,6 +92,8 @@ cargo.crates \ object 0.22.0 8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397 \ once_cell 1.20.2 1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775 \ output_vt100 0.1.2 53cdc5b785b7a58c5aad8216b3dfa114df64b0b06ae6e1501cef91df2fbdf8f9 \ + percent-encoding 2.3.1 e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e \ + potential_utf 0.1.2 e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585 \ pretty_assertions 0.6.1 3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427 \ proc-macro-hack 0.5.19 dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5 \ proc-macro2 1.0.93 60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99 \ @@ -91,14 +104,22 @@ cargo.crates \ rustc-demangle 0.1.18 6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232 \ rustix 0.36.16 6da3636faa25820d8648e0e31c5d519bbb01f72fdf57131f0f5f7da5fed36eab \ rustversion 1.0.18 0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248 \ + serde 1.0.193 25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89 \ + serde_derive 1.0.193 43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3 \ similar 2.6.0 1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e \ + smallvec 1.15.1 67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03 \ + stable_deref_trait 1.2.0 a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3 \ strsim 0.11.1 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f \ syn 1.0.48 cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac \ syn 2.0.30 0ddc1f908d32ec46858c2d3b3daa00cc35bf4b6841ce4355c7bb3eedf2283a68 \ + synstructure 0.13.2 728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2 \ tempfile 3.4.0 af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95 \ threadpool 1.8.1 d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa \ + tinystr 0.8.1 5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b \ unicode-ident 1.0.11 301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c \ unicode-xid 0.2.1 f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564 \ + url 2.5.4 32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60 \ + utf8_iter 1.0.4 b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be \ utf8parse 0.2.1 711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a \ winapi 0.3.9 5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419 \ winapi-i686-pc-windows-gnu 0.4.0 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 \ @@ -131,4 +152,12 @@ cargo.crates \ windows_x86_64_gnullvm 0.52.6 24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d \ windows_x86_64_msvc 0.42.1 447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd \ windows_x86_64_msvc 0.48.5 ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538 \ - windows_x86_64_msvc 0.52.6 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec + windows_x86_64_msvc 0.52.6 589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec \ + writeable 0.6.1 ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb \ + yoke 0.8.0 5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc \ + yoke-derive 0.8.0 38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6 \ + zerofrom 0.1.6 50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5 \ + zerofrom-derive 0.1.6 d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502 \ + zerotrie 0.2.2 36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595 \ + zerovec 0.11.2 4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428 \ + zerovec-derive 0.11.1 5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f diff --git a/textproc/riff/files/patch-src-main-rs-moar-pager.diff b/textproc/riff/files/patch-src-main-rs-moar-pager.diff index ad14c97a9c8..8fdc5aec2d9 100644 --- a/textproc/riff/files/patch-src-main-rs-moar-pager.diff +++ b/textproc/riff/files/patch-src-main-rs-moar-pager.diff @@ -1,13 +1,13 @@ ---- src/main.rs.orig 2023-11-29 23:16:30 -+++ src/main.rs 2023-11-29 23:16:56 -@@ -240,6 +240,10 @@ - - // FIXME: Print warning at the end if $PAGER was set to something that - // doesn't exist. -+ } -+ -+ if try_pager(input, "moar-pager", color, formatter) { -+ return; +--- ./src/main.rs 2025-11-30 17:14:08 ++++ ./src/main.rs 2025-11-30 17:14:25 +@@ -356,6 +356,10 @@ + return; } - if try_pager(input, "moar", color, formatter) { ++ if try_pager(input, "moar-pager", color, formatter.clone()) { ++ return; ++ } ++ + if try_pager(input, "less", color, formatter.clone()) { + return; + }