On Sun, Feb 18, 2018 at 01:33:39AM +0100, Klemens Nanni wrote: > Simple update shipping lots of (breaking) changes, see > https://github.com/BurntSushi/ripgrep/releases/tag/0.8.0 for changelog. https://github.com/BurntSushi/ripgrep/releases/tag/0.8.1 is out fixing some minor regressions.
> Add asciidoc as missing BDEP as well as lang/rust in order to pin the > minimally required version. > > Replace the patch to disable debug symbols with a simpler MAKE_ENV line. Now with proper MODCARGO_RUSTFLAGS as committed ealier. > Move long path into helper variable (OUT_DIR is described here: > https://doc.rust-lang.org/cargo/reference/environment-variables.htmlOUT_DIR) > and adjust post-install to also install fish completions. rg's > permissions are fixed so drop chmod. > > Patch gzip's error message wording that is matched as part of the test > suite so that all tests pass again, at least on my amd64 machine. OK? Index: Makefile =================================================================== RCS file: /cvs/ports/textproc/ripgrep/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 30 Jan 2018 03:27:54 -0000 1.7 +++ Makefile 24 Feb 2018 19:23:10 -0000 @@ -4,7 +4,7 @@ COMMENT = line oriented search tool usi GH_ACCOUNT = BurntSushi GH_PROJECT = ripgrep -GH_TAGNAME = 0.7.1 +GH_TAGNAME = 0.8.1 CATEGORIES = textproc sysutils @@ -13,63 +13,77 @@ PERMIT_PACKAGE_CDROM = Yes WANTLIB += c pthread -SEPARATE_BUILD = Yes +# as devel/cargo MODULES adds DISTFILES, GH_* didn't +DISTFILES += ${DISTNAME}${EXTRACT_SUFX} MODULES = devel/cargo +BUILD_DEPENDS = lang/rust>=1.20 \ + textproc/asciidoc -# as devel/cargo MODULES adds DISTFILES, GH_* didn't -DISTFILES += ${DISTNAME}${EXTRACT_SUFX} - -MODCARGO_CRATES += aho-corasick-0.6.3 # Unlicense/MIT -MODCARGO_CRATES += ansi_term-0.9.0 # MIT -MODCARGO_CRATES += atty-0.2.3 # MIT -MODCARGO_CRATES += bitflags-0.9.1 # MIT/Apache-2.0 -MODCARGO_CRATES += bytecount-0.1.7 # Apache-2.0/MIT +MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT +MODCARGO_CRATES += ansi_term-0.10.2 # MIT +MODCARGO_CRATES += atty-0.2.6 # MIT +MODCARGO_CRATES += bitflags-1.0.1 # MIT/Apache-2.0 +MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT MODCARGO_CRATES += cfg-if-0.1.2 # MIT/Apache-2.0 -MODCARGO_CRATES += clap-2.26.2 # MIT -MODCARGO_CRATES += crossbeam-0.2.10 # Apache-2.0/MIT -MODCARGO_CRATES += encoding_rs-0.7.1 # MIT/Apache-2.0 -MODCARGO_CRATES += env_logger-0.4.3 # MIT/Apache-2.0 -MODCARGO_CRATES += fnv-1.0.5 # Apache-2.0 / MIT -MODCARGO_CRATES += fs2-0.4.2 # MIT/Apache-2.0 -MODCARGO_CRATES += kernel32-sys-0.2.2 # MIT -MODCARGO_CRATES += lazy_static-0.2.9 # MIT/Apache-2.0 -MODCARGO_CRATES += libc-0.2.32 # MIT/Apache-2.0 -MODCARGO_CRATES += log-0.3.8 # MIT/Apache-2.0 -MODCARGO_CRATES += memchr-1.0.2 # Unlicense/MIT -MODCARGO_CRATES += memchr-2.0.0 # Unlicense/MIT -MODCARGO_CRATES += memmap-0.5.2 # MIT/Apache-2.0 -MODCARGO_CRATES += num_cpus-1.7.0 # MIT/Apache-2.0 -MODCARGO_CRATES += redox_syscall-0.1.31 # MIT +MODCARGO_CRATES += clap-2.30.0 # MIT +MODCARGO_CRATES += crossbeam-0.3.2 # Apache-2.0/MIT +MODCARGO_CRATES += encoding_rs-0.7.2 # MIT/Apache-2.0 +MODCARGO_CRATES += fnv-1.0.6 # Apache-2.0 / MIT +MODCARGO_CRATES += fuchsia-zircon-0.3.3 # BSD-3-Clause +MODCARGO_CRATES += fuchsia-zircon-sys-0.3.3 # BSD-3-Clause +MODCARGO_CRATES += glob-0.2.11 # MIT/Apache-2.0 +MODCARGO_CRATES += globset-0.3.0 # Unlicense/MIT +MODCARGO_CRATES += grep-0.1.8 # Unlicense/MIT +MODCARGO_CRATES += ignore-0.4.0 # Unlicense/MIT +MODCARGO_CRATES += lazy_static-1.0.0 # MIT/Apache-2.0 +MODCARGO_CRATES += libc-0.2.36 # MIT/Apache-2.0 +MODCARGO_CRATES += log-0.4.1 # MIT/Apache-2.0 +MODCARGO_CRATES += memchr-2.0.1 # Unlicense/MIT +MODCARGO_CRATES += memmap-0.6.2 # MIT/Apache-2.0 +MODCARGO_CRATES += num_cpus-1.8.0 # MIT/Apache-2.0 +MODCARGO_CRATES += rand-0.3.22 # MIT/Apache-2.0 +MODCARGO_CRATES += rand-0.4.2 # MIT/Apache-2.0 +MODCARGO_CRATES += redox_syscall-0.1.37 # MIT MODCARGO_CRATES += redox_termios-0.1.1 # MIT -MODCARGO_CRATES += regex-0.2.2 # MIT/Apache-2.0 -MODCARGO_CRATES += regex-syntax-0.4.1 # MIT/Apache-2.0 -MODCARGO_CRATES += same-file-1.0.0 # Unlicense/MIT -MODCARGO_CRATES += simd-0.1.1 # MIT/Apache-2.0 -MODCARGO_CRATES += simd-0.2.0 # MIT/Apache-2.0 -MODCARGO_CRATES += strsim-0.6.0 # MIT -MODCARGO_CRATES += term_size-0.3.0 # MIT OR Apache-2.0 +MODCARGO_CRATES += regex-0.2.6 # MIT/Apache-2.0 +MODCARGO_CRATES += regex-syntax-0.4.2 # MIT/Apache-2.0 +MODCARGO_CRATES += same-file-1.0.2 # Unlicense/MIT +MODCARGO_CRATES += simd-0.2.1 # MIT/Apache-2.0 +MODCARGO_CRATES += strsim-0.7.0 # MIT +MODCARGO_CRATES += tempdir-0.3.5 # MIT/Apache-2.0 +MODCARGO_CRATES += termcolor-0.3.4 # Unlicense/MIT MODCARGO_CRATES += termion-1.5.1 # MIT -MODCARGO_CRATES += textwrap-0.8.0 # MIT -MODCARGO_CRATES += thread_local-0.3.4 # Apache-2.0/MIT +MODCARGO_CRATES += textwrap-0.9.0 # MIT +MODCARGO_CRATES += thread_local-0.3.5 # Apache-2.0/MIT MODCARGO_CRATES += unicode-width-0.1.4 # MIT/Apache-2.0 MODCARGO_CRATES += unreachable-1.0.0 # MIT / Apache-2.0 MODCARGO_CRATES += utf8-ranges-1.0.0 # Unlicense/MIT MODCARGO_CRATES += vec_map-0.8.0 # MIT/Apache-2.0 MODCARGO_CRATES += void-1.0.2 # MIT -MODCARGO_CRATES += walkdir-2.0.1 # Unlicense/MIT -MODCARGO_CRATES += winapi-0.2.8 # MIT -MODCARGO_CRATES += winapi-build-0.1.1 # MIT +MODCARGO_CRATES += walkdir-2.1.4 # Unlicense/MIT +MODCARGO_CRATES += winapi-0.3.4 # MIT/Apache-2.0 +MODCARGO_CRATES += winapi-i686-pc-windows-gnu-0.4.0 # MIT/Apache-2.0 +MODCARGO_CRATES += winapi-x86_64-pc-windows-gnu-0.4.0 # MIT/Apache-2.0 +MODCARGO_CRATES += wincolor-0.1.6 # Unlicense/MIT CONFIGURE_STYLE = cargo -post-install: - chmod a+rx ${PREFIX}/bin/rg - ${INSTALL_MAN} ${WRKSRC}/doc/rg.1 ${PREFIX}/man/man1/ +SEPARATE_BUILD = Yes + +MODCARGO_RUSTFLAGS = -C debuginfo=0 + +RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release +OUT_DIR = ${RELEASE_DIR}/build/ripgrep-*/out + +do-install: + ${INSTALL_PROGRAM} ${RELEASE_DIR}/rg ${PREFIX}/bin/ + ${INSTALL_MAN} ${OUT_DIR}/rg.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/bash-completion/completions - ${INSTALL_DATA} ${MODCARGO_TARGET_DIR}/release/build/ripgrep-*/out/rg.bash-completion \ - ${PREFIX}/share/bash-completion/completions/rg + ${INSTALL_DATA} ${OUT_DIR}/rg.bash \ + ${PREFIX}/share/bash-completion/completions/rg + ${INSTALL_DATA_DIR} ${PREFIX}/share/fish/completions + ${INSTALL_DATA} ${OUT_DIR}/rg.fish ${PREFIX}/share/fish/completions/ ${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${MODCARGO_TARGET_DIR}/release/build/ripgrep-*/out/_rg.ps1 \ - ${PREFIX}/share/zsh/site-functions/_rg + ${INSTALL_DATA} ${OUT_DIR}/_rg.ps1 ${PREFIX}/share/zsh/site-functions/_rg .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/textproc/ripgrep/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo 30 Jan 2018 03:23:06 -0000 1.6 +++ distinfo 24 Feb 2018 19:23:10 -0000 @@ -1,82 +1,94 @@ -SHA256 (cargo/aho-corasick-0.6.3.tar.gz) = UAkJxPh6nlI1WyZibYkIM+nh1TrFZtt2w2+qmEuIlpk= -SHA256 (cargo/ansi_term-0.9.0.tar.gz) = I6x8MAAqWsy/fomH0GMvpt4VW3w9OdAGcxejkeAKLvY= -SHA256 (cargo/atty-0.2.3.tar.gz) = IeUIAOyZFXSHYED/+O5GsTalPphShvvmo73+ZCG3iGA= -SHA256 (cargo/bitflags-0.9.1.tar.gz) = Tv0C4jCgLhj5L8JzX0RZc4XtAq2Pgx58HBFW7l4as6U= -SHA256 (cargo/bytecount-0.1.7.tar.gz) = S763wwNB/OKfYHi0vfh26kd5YAhm6Y9bLSA6U08ZUFA= +SHA256 (cargo/aho-corasick-0.6.4.tar.gz) = 1lMdRN5yOCWqgTmKZBUoMilyWgD6MHE4EquTI/qoL8Q= +SHA256 (cargo/ansi_term-0.10.2.tar.gz) = azVotIt876a4zhJfm7SYnlL7zCnr6ojfBMx8XxL3BFU= +SHA256 (cargo/atty-0.2.6.tar.gz) = g1Jlb9QsMKDDyJ0m3qAeO3fAqyrxgjCDXBXi4TzVGFk= +SHA256 (cargo/bitflags-1.0.1.tar.gz) = s8MNOALftygWgNYoXyzNqowtj+5B+TgF26XEz1DcI88= +SHA256 (cargo/bytecount-0.3.1.tar.gz) = iCWFzX7ITpAkct80peAYkSAts79iYU4fCv5FnBr890Q= SHA256 (cargo/cfg-if-0.1.2.tar.gz) = 1MgZoSh+thjfR8xkcXPFxMZroZ2Iim5Q1gVnKu0xQN4= -SHA256 (cargo/clap-2.26.2.tar.gz) = NFHkCQExeGY0NdbxX9shLxTuRCSj10+XnQgdCma28fI= -SHA256 (cargo/crossbeam-0.2.10.tar.gz) = DF6iFWZMomTaip2cO+gNLq8wkjwlnQPocDiOuSdQj5c= -SHA256 (cargo/encoding_rs-0.7.1.tar.gz) = 9SFaq/IrgxU74+5E3+P5QCFFQbLOE9QZxV56EVyMUak= -SHA256 (cargo/env_logger-0.4.3.tar.gz) = Pd8h5z4BYpj1yzfW746NqOOfkfnsiw30S33rFqn4zVs= -SHA256 (cargo/fnv-1.0.5.tar.gz) = bMSEhC8eKIT69W9Sn5YMwSrYxxzpbMerugoGfJj+40Q= -SHA256 (cargo/fs2-0.4.2.tar.gz) = mrds/SqqWbe/Zoitm6FbuuZL/5fwTqAhRM/TRD5cKGY= -SHA256 (cargo/kernel32-sys-0.2.2.tar.gz) = dQdiSylINDHAui2Crs6Mps26k4K/9N3Q90kFYMBWCY0= -SHA256 (cargo/lazy_static-0.2.9.tar.gz) = yeXlj6Gkw7kVpWGniiLuDKxquX3KJQRCi8HLB0N1+NU= -SHA256 (cargo/libc-0.2.32.tar.gz) = VszjEw/QQMKN9vSVyEkuXsWAj7TJCTwxDfArDI8DAUg= -SHA256 (cargo/log-0.3.8.tar.gz) = iA93VB76blzHTnaRDJiE2YWWgxGIOdah3DsR5jUSVls= -SHA256 (cargo/memchr-1.0.2.tar.gz) = FI+rLlG08c/GbaKnwymB0dPAg6gDl4JouxH+S4aSXno= -SHA256 (cargo/memchr-2.0.0.tar.gz) = 4B5k2QF9GOf8Cdjk/g4o/2kxAZ6Xn7gBkxnbfKgn+KY= -SHA256 (cargo/memmap-0.5.2.tar.gz) = RvPHNZAosxmZKH2uTlBH3f6Qojt9yiKCznWbSRCAyZs= -SHA256 (cargo/num_cpus-1.7.0.tar.gz) = UU8Nc+ZL5T/zIGgMpnG2T+P7kdoB4a4t3JnrUdRTsg0= -SHA256 (cargo/redox_syscall-0.1.31.tar.gz) = jd4R8YwQgom+8kRpY4oE3OSdpWCE8tUGGLIm5H6wRQk= +SHA256 (cargo/clap-2.30.0.tar.gz) = HAe5JXoA8/yTt/PEF/wVYH7HpWgjvCw37HROJmOH3ls= +SHA256 (cargo/crossbeam-0.3.2.tar.gz) = JM6XgtTVxTZ0ZGpqTBhjohqPwMtkmzyU38FuRQcd6hk= +SHA256 (cargo/encoding_rs-0.7.2.tar.gz) = mP0PJNH7caSmuTMMjKBMvU58xdhGtUynT/N2vHyfeY0= +SHA256 (cargo/fnv-1.0.6.tar.gz) = L62FVT4JpviB9znCnwsAsPATV8dDJm1Hi2iVHOIyhfM= +SHA256 (cargo/fuchsia-zircon-0.3.3.tar.gz) = Lpdjxp66rmMLo190iI20ZeSeJZuhvA7afQb0oGdhXYI= +SHA256 (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = Pcqprncl0SzbhbOtmaQ023C0aMCd7RfgEthrXBAQ96c= +SHA256 (cargo/glob-0.2.11.tar.gz) = i+GN4JpWtg7Q7fhLyd8AfjAEBpGves0cQYdPqsWJW/s= +SHA256 (cargo/globset-0.3.0.tar.gz) = HparkjYsBoETha6aNNJpjooRYHReDHj7tDSkTI3j+rw= +SHA256 (cargo/grep-0.1.8.tar.gz) = /X/9lNtJJKj4x7AxMV3nj6pndyx3NN/ZLo6PI6Cn44E= +SHA256 (cargo/ignore-0.4.0.tar.gz) = TzoJna8JAGsn43+oubu0ndxYZ//i1mO7VrG41nJ3SqY= +SHA256 (cargo/lazy_static-1.0.0.tar.gz) = yPMQR9qjZfGb4UtHwp3098O1gYMkB9qr5q53OXYZI30= +SHA256 (cargo/libc-0.2.36.tar.gz) = Hl2X1nCO2qQHQp+qZxuULcDycnIi+2tlOb8duTbksSE= +SHA256 (cargo/log-0.4.1.tar.gz) = ifAQ6EPysaMdvTFrO41EN1i8Y0vtN6q63lnGhtZE4KI= +SHA256 (cargo/memchr-2.0.1.tar.gz) = eW+6cOdmElie0s5/RSgvWvhp4P3XzGGZ+hqh8dWRup0= +SHA256 (cargo/memmap-0.6.2.tar.gz) = 4v+iyYbeEanfeGIMAe6q8n2U0/8Cv4G/zKlTEC3Qxv8= +SHA256 (cargo/num_cpus-1.8.0.tar.gz) = xRozIuS8qdISrZoVigKrxpNNAFSQwFSid433OnCqCjA= +SHA256 (cargo/rand-0.3.22.tar.gz) = Facyq/nSDwrY7rb5Cb9oaHItmgbh5QgCtqcDUfQLTrE= +SHA256 (cargo/rand-0.4.2.tar.gz) = 66X4y1nMUO1WvoiApce0lr/ZvSY5ThdrxniECUFFwsU= +SHA256 (cargo/redox_syscall-0.1.37.tar.gz) = DZLuzrrSK3Z5FeTVKfifKO6W279aSBDSuEQ3PxNkF/0= SHA256 (cargo/redox_termios-0.1.1.tar.gz) = fokc/kjpEApwo7brZS/vKJIMEX02Yzloe9VXYWDbD3Y= -SHA256 (cargo/regex-0.2.2.tar.gz) = FzEWRzQJYoXsKl7H/qUkiuL1SFs/7rARWvT9ohg7LRs= -SHA256 (cargo/regex-syntax-0.4.1.tar.gz) = rYkKXu95U/VUJ8UFdcaAxChBZTq9KwKLaM0iPRV/Yts= -SHA256 (cargo/same-file-1.0.0.tar.gz) = cKGHINdF+5ymoEGzfLNtCyEGYAa2z/i1s2AULUuB+2A= -SHA256 (cargo/simd-0.1.1.tar.gz) = Y7WEfC12bKfOcidnKFCVWAL6vXebphauq+rUwsOHcCM= -SHA256 (cargo/simd-0.2.0.tar.gz) = epTRSirh8fEQk33l+2nklDclYBgcfhc5oJf8ws7je6A= -SHA256 (cargo/strsim-0.6.0.tar.gz) = tNFcgQUZqRz4d+fjbmP+BogVxngYFDny8p4lYhR8NpQ= -SHA256 (cargo/term_size-0.3.0.tar.gz) = 4ra1XfMZjMkzcuhd0u2Bfw44zozA8i6zI5G/rZxL8gk= +SHA256 (cargo/regex-0.2.6.tar.gz) = W+U0e94MSM/Yw/3Admzf6dinVe+E1iDWeUx3jJHeiys= +SHA256 (cargo/regex-syntax-0.4.2.tar.gz) = jpMcWLk9hvCAxzS/0rzn3QB5riMxI1gYEzyL5/Qi4g4= +SHA256 (cargo/same-file-1.0.2.tar.gz) = z7bt7QsGoLUSyN288ECJE4ybQ2LC9pbzw9dgOdaPNjc= +SHA256 (cargo/simd-0.2.1.tar.gz) = PdCAXHNjq1GoKaFRGtJLbtA0n+qnVsS8L5d/n0luZnM= +SHA256 (cargo/strsim-0.7.0.tar.gz) = u084ASWSapnlK8J5JBU5wBgyP6sFrWNotW+T2Taf9VA= +SHA256 (cargo/tempdir-0.3.5.tar.gz) = h5dKb1wd+zRNczBVYBZQBZozY94qYQSBkpO6/2YhMtY= +SHA256 (cargo/termcolor-0.3.4.tar.gz) = c+g4ltp0CkVBpvIWBrNfKqS62ltl2J3GERS/nW/y3H4= SHA256 (cargo/termion-1.5.1.tar.gz) = aJo736q0Of2SvIffXEx4QX08vlN0hydOmwstznbpIJY= -SHA256 (cargo/textwrap-0.8.0.tar.gz) = 344Ir8QK40WeSDjzA+RlqlDYI9+Nf4PKiBCPbTr+ft0= -SHA256 (cargo/thread_local-0.3.4.tar.gz) = FpfEtXrut6U2tkcWWigl+t3/sdO604bVB3Cb1RqQuxQ= +SHA256 (cargo/textwrap-0.9.0.tar.gz) = wLWba0tE2GfxNw7xvZG/smK/B78K5lwgLqL7wWFTtpM= +SHA256 (cargo/thread_local-0.3.5.tar.gz) = J57zHBnt7fV3v9Et+ucoBAoh9jWwaiTNZw/1EO3TiWM= SHA256 (cargo/unicode-width-0.1.4.tar.gz) = vzoRN3VxSiLct3TY6jZVxToy3rrmOgY6zACpHMWGJF8= SHA256 (cargo/unreachable-1.0.0.tar.gz) = OCgQh3/kSJkd/H8N1uOuXVgIj9DqXjUYllX4TmgU+lY= SHA256 (cargo/utf8-ranges-1.0.0.tar.gz) = Zi+rZSWpi+/ykh1/YaOefVngtCXrx9DZ5m0xblUSQSI= SHA256 (cargo/vec_map-0.8.0.tar.gz) = iHtbYxwq0BYou7qn3UyGn4DTGGaI+NC29Yd0++MkmIw= SHA256 (cargo/void-1.0.2.tar.gz) = agLkiF7TvA8t6Q6m3UXry7ZtrP/gNUf627DuridwiH0= -SHA256 (cargo/walkdir-2.0.1.tar.gz) = QLbSAfT4mYqDcZa23pxz41rxTJksu5LEq2QdLC3OUt4= -SHA256 (cargo/winapi-0.2.8.tar.gz) = Fn3J1pSam4V/NFEnXpEcP0QlWELB96dvM8VRA6kJCHo= -SHA256 (cargo/winapi-build-0.1.1.tar.gz) = LTFe7js0rKR5ey2msT7Ygmbm1hJWKgxGOQr4KZ/Gmbw= -SHA256 (ripgrep-0.7.1.tar.gz) = 4BBpNjes67QJ89unyvWe8JPRiUozsUAVBBuNQ1R2ZfU= -SIZE (cargo/aho-corasick-0.6.3.tar.gz) = 24963 -SIZE (cargo/ansi_term-0.9.0.tar.gz) = 11718 -SIZE (cargo/atty-0.2.3.tar.gz) = 5486 -SIZE (cargo/bitflags-0.9.1.tar.gz) = 12406 -SIZE (cargo/bytecount-0.1.7.tar.gz) = 10121 +SHA256 (cargo/walkdir-2.1.4.tar.gz) = Y2Nr0Os9AMy4uQNjgbUm76xTyvESt3g7cwqz+ORNo2k= +SHA256 (cargo/winapi-0.3.4.tar.gz) = BOO9Ih/L6KJxNZwE8hp2230MYCiGLRu1US2F4eLrW7M= +SHA256 (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = rDuHxjYgQm3ZuZHlzgMp7/VFvMu7NPO+Cf9vtqtRt7Y= +SHA256 (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = cS4ieEHQV8HuHNL7Ivp+WlRhro5I+iynnsQs/BkxGD8= +SHA256 (cargo/wincolor-0.1.6.tar.gz) = 7rBkmaOk1EMCeRBS3wBdUjK5J+0allgUbYQhZcTed2c= +SHA256 (ripgrep-0.8.1.tar.gz) = cDU3n84MHjJVLo7lKLksPQG405Neox0mxRpzKHvnS7M= +SIZE (cargo/aho-corasick-0.6.4.tar.gz) = 25443 +SIZE (cargo/ansi_term-0.10.2.tar.gz) = 16642 +SIZE (cargo/atty-0.2.6.tar.gz) = 5617 +SIZE (cargo/bitflags-1.0.1.tar.gz) = 13451 +SIZE (cargo/bytecount-0.3.1.tar.gz) = 12347 SIZE (cargo/cfg-if-0.1.2.tar.gz) = 6668 -SIZE (cargo/clap-2.26.2.tar.gz) = 182509 -SIZE (cargo/crossbeam-0.2.10.tar.gz) = 32993 -SIZE (cargo/encoding_rs-0.7.1.tar.gz) = 1220716 -SIZE (cargo/env_logger-0.4.3.tar.gz) = 10891 -SIZE (cargo/fnv-1.0.5.tar.gz) = 6295 -SIZE (cargo/fs2-0.4.2.tar.gz) = 12815 -SIZE (cargo/kernel32-sys-0.2.2.tar.gz) = 24537 -SIZE (cargo/lazy_static-0.2.9.tar.gz) = 11024 -SIZE (cargo/libc-0.2.32.tar.gz) = 228762 -SIZE (cargo/log-0.3.8.tar.gz) = 17756 -SIZE (cargo/memchr-1.0.2.tar.gz) = 8639 -SIZE (cargo/memchr-2.0.0.tar.gz) = 9824 -SIZE (cargo/memmap-0.5.2.tar.gz) = 14465 -SIZE (cargo/num_cpus-1.7.0.tar.gz) = 9626 -SIZE (cargo/redox_syscall-0.1.31.tar.gz) = 13420 +SIZE (cargo/clap-2.30.0.tar.gz) = 190562 +SIZE (cargo/crossbeam-0.3.2.tar.gz) = 33440 +SIZE (cargo/encoding_rs-0.7.2.tar.gz) = 1241345 +SIZE (cargo/fnv-1.0.6.tar.gz) = 11131 +SIZE (cargo/fuchsia-zircon-0.3.3.tar.gz) = 22565 +SIZE (cargo/fuchsia-zircon-sys-0.3.3.tar.gz) = 7191 +SIZE (cargo/glob-0.2.11.tar.gz) = 18065 +SIZE (cargo/globset-0.3.0.tar.gz) = 21315 +SIZE (cargo/grep-0.1.8.tar.gz) = 236744 +SIZE (cargo/ignore-0.4.0.tar.gz) = 41412 +SIZE (cargo/lazy_static-1.0.0.tar.gz) = 12611 +SIZE (cargo/libc-0.2.36.tar.gz) = 310575 +SIZE (cargo/log-0.4.1.tar.gz) = 20731 +SIZE (cargo/memchr-2.0.1.tar.gz) = 9858 +SIZE (cargo/memmap-0.6.2.tar.gz) = 15015 +SIZE (cargo/num_cpus-1.8.0.tar.gz) = 10539 +SIZE (cargo/rand-0.3.22.tar.gz) = 11318 +SIZE (cargo/rand-0.4.2.tar.gz) = 76170 +SIZE (cargo/redox_syscall-0.1.37.tar.gz) = 13980 SIZE (cargo/redox_termios-0.1.1.tar.gz) = 3227 -SIZE (cargo/regex-0.2.2.tar.gz) = 193403 -SIZE (cargo/regex-syntax-0.4.1.tar.gz) = 121453 -SIZE (cargo/same-file-1.0.0.tar.gz) = 8746 -SIZE (cargo/simd-0.1.1.tar.gz) = 39577 -SIZE (cargo/simd-0.2.0.tar.gz) = 35102 -SIZE (cargo/strsim-0.6.0.tar.gz) = 8500 -SIZE (cargo/term_size-0.3.0.tar.gz) = 9932 +SIZE (cargo/regex-0.2.6.tar.gz) = 197800 +SIZE (cargo/regex-syntax-0.4.2.tar.gz) = 126234 +SIZE (cargo/same-file-1.0.2.tar.gz) = 8870 +SIZE (cargo/simd-0.2.1.tar.gz) = 35716 +SIZE (cargo/strsim-0.7.0.tar.gz) = 8435 +SIZE (cargo/tempdir-0.3.5.tar.gz) = 10605 +SIZE (cargo/termcolor-0.3.4.tar.gz) = 13385 SIZE (cargo/termion-1.5.1.tar.gz) = 20659 -SIZE (cargo/textwrap-0.8.0.tar.gz) = 14903 -SIZE (cargo/thread_local-0.3.4.tar.gz) = 11760 +SIZE (cargo/textwrap-0.9.0.tar.gz) = 15795 +SIZE (cargo/thread_local-0.3.5.tar.gz) = 11794 SIZE (cargo/unicode-width-0.1.4.tar.gz) = 15283 SIZE (cargo/unreachable-1.0.0.tar.gz) = 6355 SIZE (cargo/utf8-ranges-1.0.0.tar.gz) = 8599 SIZE (cargo/vec_map-0.8.0.tar.gz) = 13742 SIZE (cargo/void-1.0.2.tar.gz) = 2356 -SIZE (cargo/walkdir-2.0.1.tar.gz) = 21483 -SIZE (cargo/winapi-0.2.8.tar.gz) = 455145 -SIZE (cargo/winapi-build-0.1.1.tar.gz) = 669 -SIZE (ripgrep-0.7.1.tar.gz) = 474458 +SIZE (cargo/walkdir-2.1.4.tar.gz) = 22695 +SIZE (cargo/winapi-0.3.4.tar.gz) = 905247 +SIZE (cargo/winapi-i686-pc-windows-gnu-0.4.0.tar.gz) = 2918815 +SIZE (cargo/winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz) = 2947998 +SIZE (cargo/wincolor-0.1.6.tar.gz) = 4799 +SIZE (ripgrep-0.8.1.tar.gz) = 521088 Index: patches/patch-Cargo_toml =================================================================== RCS file: patches/patch-Cargo_toml diff -N patches/patch-Cargo_toml --- patches/patch-Cargo_toml 1 Nov 2017 20:27:22 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-Cargo_toml,v 1.3 2017/11/01 20:27:22 danj Exp $ -Don't use debug on release. -Index: Cargo.toml ---- Cargo.toml.orig -+++ Cargo.toml -@@ -60,4 +60,4 @@ simd-accel = [ - ] - - [profile.release] --debug = true -+debug = false Index: patches/patch-tests_tests_rs =================================================================== RCS file: patches/patch-tests_tests_rs diff -N patches/patch-tests_tests_rs --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tests_tests_rs 24 Feb 2018 19:23:10 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: tests/tests.rs +--- tests/tests.rs.orig ++++ tests/tests.rs +@@ -1765,7 +1765,7 @@ fn compressed_failing_gzip() { + + let output = cmd.output().unwrap(); + let err = String::from_utf8_lossy(&output.stderr); +- assert_eq!(err.contains("not in gzip format"), true); ++ assert_eq!(err.contains("unrecognized file format"), true); + } + + sherlock!(feature_196_persistent_config, "sherlock", Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/textproc/ripgrep/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 3 Feb 2017 15:00:33 -0000 1.1.1.1 +++ pkg/PLIST 24 Feb 2018 19:23:10 -0000 @@ -4,6 +4,9 @@ share/bash-completion/ share/bash-completion/completions/ share/bash-completion/completions/rg +share/fish/ +share/fish/completions/ +share/fish/completions/rg.fish share/zsh/ share/zsh/site-functions/ share/zsh/site-functions/_rg