Updated diff to CVS head.
On 1/29/23 19:41, Volker Schlecht wrote:
* Update devel/difftastic to release 0.42* Get rid of the Cargo.toml.orig files in extracted crates to make update-patches less painful * patch book.toml to not copy and install Open Sans and Source Code Pro webfonts with the html documentation
Index: Makefile =================================================================== RCS file: /cvs/ports/devel/difftastic/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- Makefile 30 Jan 2023 13:28:39 -0000 1.3 +++ Makefile 31 Jan 2023 20:10:02 -0000 @@ -2,7 +2,7 @@ COMMENT = diff tool that compares files GH_ACCOUNT = Wilfred GH_PROJECT = difftastic -GH_TAGNAME = 0.40.0 +GH_TAGNAME = 0.42.0 HOMEPAGE = https://difftastic.wilfred.me.uk/ @@ -27,6 +27,10 @@ post-extract: sed -i 's/DFT_VERSION_HERE/${GH_TAGNAME}/g' \ ${WRKSRC}/manual/src/introduction.md sed -i '18,20d' ${WRKSRC}/manual/book.toml + +# Get rid of the Cargo.toml.orig files in extracted crates +pre-patch: + find ${WRKSRC}/modcargo-crates -name '*.orig' -delete # Build and install HTML manual with mdBook pre-install: Index: crates.inc =================================================================== RCS file: /cvs/ports/devel/difftastic/crates.inc,v retrieving revision 1.2 diff -u -p -r1.2 crates.inc --- crates.inc 29 Dec 2022 15:31:32 -0000 1.2 +++ crates.inc 31 Jan 2023 20:10:02 -0000 @@ -3,9 +3,9 @@ MODCARGO_CRATES += ansi_term 0.12.1 # MI MODCARGO_CRATES += atty 0.2.14 # MIT MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0 -MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0 +MODCARGO_CRATES += bumpalo 3.11.1 # MIT/Apache-2.0 MODCARGO_CRATES += bytecount 0.6.2 # Apache-2.0/MIT -MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0 +MODCARGO_CRATES += cc 1.0.78 # MIT OR Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 MODCARGO_CRATES += clap 3.1.18 # MIT OR Apache-2.0 MODCARGO_CRATES += clap_lex 0.2.0 # MIT OR Apache-2.0 @@ -51,8 +51,8 @@ MODCARGO_CRATES += proc-macro2 1.0.39 # MODCARGO_CRATES += quick-error 1.2.3 # MIT/Apache-2.0 MODCARGO_CRATES += quote 1.0.18 # MIT OR Apache-2.0 MODCARGO_CRATES += radix-heap 0.4.2 # MIT -MODCARGO_CRATES += rayon 1.5.3 # MIT OR Apache-2.0 -MODCARGO_CRATES += rayon-core 1.9.3 # MIT OR Apache-2.0 +MODCARGO_CRATES += rayon 1.6.1 # MIT OR Apache-2.0 +MODCARGO_CRATES += rayon-core 1.10.1 # MIT OR Apache-2.0 MODCARGO_CRATES += regex 1.5.6 # MIT OR Apache-2.0 MODCARGO_CRATES += regex-syntax 0.6.26 # MIT OR Apache-2.0 MODCARGO_CRATES += rustc-hash 1.1.0 # Apache-2.0/MIT @@ -67,7 +67,7 @@ MODCARGO_CRATES += terminal_size 0.1.17 MODCARGO_CRATES += terminal_size 0.2.1 # MIT OR Apache-2.0 MODCARGO_CRATES += textwrap 0.15.0 # MIT MODCARGO_CRATES += tree-sitter 0.20.9 # MIT -MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT +MODCARGO_CRATES += tree_magic_mini 3.0.3 # MIT MODCARGO_CRATES += typed-arena 2.0.1 # MIT MODCARGO_CRATES += unicode-ident 1.0.0 # MIT OR Apache-2.0 MODCARGO_CRATES += unicode-width 0.1.9 # MIT/Apache-2.0 Index: distinfo =================================================================== RCS file: /cvs/ports/devel/difftastic/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- distinfo 29 Dec 2022 15:31:32 -0000 1.2 +++ distinfo 31 Jan 2023 20:10:02 -0000 @@ -3,9 +3,9 @@ SHA256 (cargo/ansi_term-0.12.1.tar.gz) = SHA256 (cargo/atty-0.2.14.tar.gz) = 2bOb4Ydw0RQhzbG5lHpF3T836TCSy/N3YUgooxnV/ug= SHA256 (cargo/autocfg-1.1.0.tar.gz) = 1GiAK6sXy8DMV16bBT9B5yqja/prf1XjUp/6QxYbl/o= SHA256 (cargo/bitflags-1.3.2.tar.gz) = vvONRRY8Lx3eCUp9/TPM9ZXJKQXI+PT9wY0G+xA3cYo= -SHA256 (cargo/bumpalo-3.9.1.tar.gz) = pKRaRqsfJBLlPToK3nb/rSAlgEKUVpquOHIxoM1uCJk= +SHA256 (cargo/bumpalo-3.11.1.tar.gz) = Vy9pUTYhEYgwjxatLKXIUacSxGQGCuaXSURFjrg4gLo= SHA256 (cargo/bytecount-0.6.2.tar.gz) = cv6zH/yGSY2s29D867VhOOcXeozFzqRRYDHRWuhadC4= -SHA256 (cargo/cc-1.0.73.tar.gz) = L/8qaSezu4f5WV1nGWpwST9idoenHYeg1pIkLDP1jBE= +SHA256 (cargo/cc-1.0.78.tar.gz) = ogEE4jNc6KZZ1t2SpRp2egwGJZnHOzQ/0VLLQB6CjD0= SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0= SHA256 (cargo/clap-3.1.18.tar.gz) = 0tvfS9rLM0ZuhUzoie7o39Vymr98zXZk0KLWDNOERAs= SHA256 (cargo/clap_lex-0.2.0.tar.gz) = o3w18REtrV5uCxra/3mFB0l6GPzuswzOs7rn0UJ7khM= @@ -51,8 +51,8 @@ SHA256 (cargo/proc-macro2-1.0.39.tar.gz) SHA256 (cargo/quick-error-1.2.3.tar.gz) = odAZQdgvoqtQvh555nFCid183njrpMB0vFpDdPZQ3+A= SHA256 (cargo/quote-1.0.18.tar.gz) = of61TtaTuTqE4UCUlDuEt8Tq4gTFErfMuVqwxm0nitE= SHA256 (cargo/radix-heap-0.4.2.tar.gz) = Wf/snfRkATKVtJkpiBHmo94xv4EoCSE1gmUX2xLe5gE= -SHA256 (cargo/rayon-1.5.3.tar.gz) = vZnldy6ti6pSFSeMmxW/kgh3CenBstH5fNtaGDyTOn0= -SHA256 (cargo/rayon-core-1.9.3.tar.gz) = JYvNtaxtrUhJG7KZLba3z3SHiwOEkIrxJII9EYyZaD8= +SHA256 (cargo/rayon-1.6.1.tar.gz) = bbOiE63wKzvP0tOEa7QcsihX0TF4ngHfQ0+357wHWbc= +SHA256 (cargo/rayon-core-1.10.1.tar.gz) = ysQQr10Aq2iEUotKtp0ejhRujUcSAYAPobRSQSbeatM= SHA256 (cargo/regex-1.5.6.tar.gz) = 2D8SfZS9vNpMjMLlD2+E9LYR9pyQJpnKOFo5w6dfn/E= SHA256 (cargo/regex-syntax-0.6.26.tar.gz) = SbPensXcCjQX2jcaqxfXKZl8FQEOf9JP9wd3OjO922Q= SHA256 (cargo/rustc-hash-1.1.0.tar.gz) = CNQ/eqawjUnzgs3mp5ggR8NCbblJsUJLxLfsmuEsbOI= @@ -85,15 +85,15 @@ SHA256 (cargo/windows_i686_msvc-0.36.1.t SHA256 (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = Tc0XG4d2xBuXUh5doSei2GrSgBFIB9Cyqx5GK8dk2eE= SHA256 (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = yBHKSoyFPvQgq9hZK6U927rJBBD6tpA7PnmXKmMfdoA= SHA256 (cargo/wu-diff-0.1.2.tar.gz) = jj5nNfzeBkMocNuNydfjqxuTcnwU6u8ymWlCYpnyiJM= -SHA256 (difftastic-0.40.0.tar.gz) = xURXP5TY0eRkaDyd/V1jAOBQL8yb6jSdLJQiz05M70E= +SHA256 (difftastic-0.42.0.tar.gz) = 7/xW5MAAsAM66jmvCKy7xk1QHGN1j45J5LMEm+on2TA= SIZE (cargo/aho-corasick-0.7.18.tar.gz) = 112923 SIZE (cargo/ansi_term-0.12.1.tar.gz) = 24838 SIZE (cargo/atty-0.2.14.tar.gz) = 5470 SIZE (cargo/autocfg-1.1.0.tar.gz) = 13272 SIZE (cargo/bitflags-1.3.2.tar.gz) = 23021 -SIZE (cargo/bumpalo-3.9.1.tar.gz) = 77507 +SIZE (cargo/bumpalo-3.11.1.tar.gz) = 81207 SIZE (cargo/bytecount-0.6.2.tar.gz) = 12347 -SIZE (cargo/cc-1.0.73.tar.gz) = 57880 +SIZE (cargo/cc-1.0.78.tar.gz) = 61375 SIZE (cargo/cfg-if-1.0.0.tar.gz) = 7934 SIZE (cargo/clap-3.1.18.tar.gz) = 209664 SIZE (cargo/clap_lex-0.2.0.tar.gz) = 9581 @@ -139,8 +139,8 @@ SIZE (cargo/proc-macro2-1.0.39.tar.gz) = SIZE (cargo/quick-error-1.2.3.tar.gz) = 15066 SIZE (cargo/quote-1.0.18.tar.gz) = 28911 SIZE (cargo/radix-heap-0.4.2.tar.gz) = 9323 -SIZE (cargo/rayon-1.5.3.tar.gz) = 167246 -SIZE (cargo/rayon-core-1.9.3.tar.gz) = 65300 +SIZE (cargo/rayon-1.6.1.tar.gz) = 166330 +SIZE (cargo/rayon-core-1.10.1.tar.gz) = 70008 SIZE (cargo/regex-1.5.6.tar.gz) = 238593 SIZE (cargo/regex-syntax-0.6.26.tar.gz) = 293912 SIZE (cargo/rustc-hash-1.1.0.tar.gz) = 9331 @@ -173,4 +173,4 @@ SIZE (cargo/windows_i686_msvc-0.36.1.tar SIZE (cargo/windows_x86_64_gnu-0.36.1.tar.gz) = 790934 SIZE (cargo/windows_x86_64_msvc-0.36.1.tar.gz) = 661999 SIZE (cargo/wu-diff-0.1.2.tar.gz) = 33439 -SIZE (difftastic-0.40.0.tar.gz) = 28787155 +SIZE (difftastic-0.42.0.tar.gz) = 50324806 Index: patches/patch-Cargo_lock =================================================================== RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_lock,v retrieving revision 1.1 diff -u -p -r1.1 patch-Cargo_lock --- patches/patch-Cargo_lock 29 Dec 2022 15:31:32 -0000 1.1 +++ patches/patch-Cargo_lock 31 Jan 2023 20:10:02 -0000 @@ -3,7 +3,7 @@ https://github.com/Wilfred/difftastic/co Index: Cargo.lock --- Cargo.lock.orig +++ Cargo.lock -@@ -637,8 +637,9 @@ dependencies = [ +@@ -635,8 +635,9 @@ dependencies = [ [[package]] name = "tree_magic_mini" Index: patches/patch-Cargo_toml =================================================================== RCS file: /cvs/ports/devel/difftastic/patches/patch-Cargo_toml,v retrieving revision 1.1 diff -u -p -r1.1 patch-Cargo_toml --- patches/patch-Cargo_toml 29 Dec 2022 15:31:32 -0000 1.1 +++ patches/patch-Cargo_toml 31 Jan 2023 20:10:02 -0000 @@ -6,10 +6,10 @@ Index: Cargo.toml @@ -51,7 +51,7 @@ const_format = "0.2.22" owo-colors = "3.3.0" wu-diff = "0.1.2" - rayon = "1.5.2" + rayon = "1.6.1" -tree_magic_mini = "3.0.2" +tree_magic_mini = "3.0.3" - bumpalo = "3.9.1" + bumpalo = "3.11.1" unicode-width = "0.1.9" term_size = "0.3.2" @@ -73,6 +73,3 @@ path = "src/main.rs" Index: patches/patch-manual_book_toml =================================================================== RCS file: patches/patch-manual_book_toml diff -N patches/patch-manual_book_toml --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-manual_book_toml 31 Jan 2023 20:10:02 -0000 @@ -0,0 +1,11 @@ +Index: manual/book.toml +--- manual/book.toml.orig ++++ manual/book.toml +@@ -7,6 +7,7 @@ description = "The official manual for difftastic, the + + [output.html] + git-repository-url = "https://github.com/wilfred/difftastic"; ++copy-fonts = false + + [output.html.redirect] + "/getting_started.html" = "./installation.html" Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/devel/difftastic/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 8 Nov 2022 14:54:43 -0000 1.1.1.1 +++ pkg/PLIST 31 Jan 2023 20:10:02 -0000 @@ -26,21 +26,6 @@ share/doc/difftastic/diffing.html share/doc/difftastic/elasticlunr.min.js share/doc/difftastic/favicon.png share/doc/difftastic/favicon.svg -share/doc/difftastic/fonts/ -share/doc/difftastic/fonts/OPEN-SANS-LICENSE.txt -share/doc/difftastic/fonts/SOURCE-CODE-PRO-LICENSE.txt -share/doc/difftastic/fonts/fonts.css -share/doc/difftastic/fonts/open-sans-v17-all-charsets-300.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-300italic.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-600.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-600italic.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-700.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-700italic.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-800.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-800italic.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-italic.woff2 -share/doc/difftastic/fonts/open-sans-v17-all-charsets-regular.woff2 -share/doc/difftastic/fonts/source-code-pro-v11-all-charsets-500.woff2 share/doc/difftastic/getting_started.html share/doc/difftastic/git.html share/doc/difftastic/glossary.html
