Re: shells/fish

[Chavdar Ivanov <ci4ic4%gmail.com@localhost>]

On Fri, 26 Nov 2021 at 23:07, Robert Elz <kre%munnari.oz.au@localhost> wrote:
>
> Try rm -fr /usr/pkgsrc/shells/fish/work
> instead of (or in addition to if you like)
> make clean  (a "make clean" before the
> cvs update might have worked, but it is too
> late for that now).

I've never seen 'make clean' not to remove the work directory so
far;anyway, I am pretty sure that it does remove it in this case.

>
> The latter tends to only remove files that it
> believes were created, when a file exists (or was
> created) in an old version, but no longer exists,
> of is no longer created, in the new version, a make
> clean done from the new Makefile will typically simply
> leave the file behind.

As I said, shells/fish/work was removed after 'make clean'.
>
> You could also check if underscore-1.12.0.js is in the
> fish-3.1.1 tarball, if not, and it exists after "make
> extract" (before even "make patch") then it must have
> existed immediately before the "make extract" as all the
> latter really does is untar the tarball (after checksum
> verification, etc).

Yes, I checked. The original tarball contains underscore.js and
underscore-1.12.0.js, but definitely not underscore-1.13.1.js.

Here is the script output again:
.............
Script started on Sat Nov 27 09:45:31 2021
# tar tvf  /usr/pkgsrc/distfiles/fish-3.3.1.tar.xz | grep underscore
    ### The current distf ile has *only* underscore-1.12.0.js
-rw-rw-r--  0 root   root    19358 Jul  6 15:52
fish-3.3.1/user_doc/html/_static/underscore.js
-rw-rw-r--  0 root   root    67692 Jul  6 15:52
fish-3.3.1/user_doc/html/_static/underscore-1.12.0.js
# pwd
/usr/pkgsrc/shells/fish
# ls
CVS      DESCR    Makefile PLIST    distinfo patches
# rm PLIST           ### obtaining the original PLIST
# cvs up -dPA
cvs update: Updating .
P Makefile                                  ### this commit only
removes python's application.mk from the .includes
cvs update: warning: `PLIST' was lost
U PLIST
cvs update: Updating patches
# make extract
=> Bootstrap dependency digest>=20211023: found digest-20211023
=> Checksum BLAKE2s OK for fish-3.3.1.tar.xz
=> Checksum SHA512 OK for fish-3.3.1.tar.xz
===> Installing dependencies for fish-3.3.1nb1
==========================================================================
The following variables will affect the build process of this package,
fish-3.3.1nb1.  Their current value is shown below:

        * CURSES_DEFAULT = ncursesw

Based on these variables, the following variables have been set:

        * CURSES_TYPE = ncursesw

You may want to abort the process now with CTRL-C and change the value
of variables in the first group before continuing.  Be sure to run
`/usr/bin/make clean' after the changes.
==========================================================================
=> Tool dependency cmake>=2.8.1nb1: found cmake-3.22.0
=> Build dependency cwrappers>=20150314: found cwrappers-20180325
=> Full dependency pcre2>=10.30: found pcre2-10.39
=> Full dependency gettext-tools>=0.18.1.1nb3: found gettext-tools-0.21nb3
=> Full dependency desktop-file-utils>=0.10nb1: found desktop-file-utils-0.26
=> Full dependency ncursesw>=6.0: found ncursesw-6.3
===> Checking for vulnerabilities in fish-3.3.1nb1
===> Overriding tools for fish-3.3.1nb1
===> Extracting for fish-3.3.1nb1
mv -f /usr/pkgsrc/shells/fish/work/fish-3.3.1/version
/usr/pkgsrc/shells/fish/work/fish-3.3.1/version.txt
# find .. -name underscore\*                          ### As expected,
the working tree contains only underscore-1.12.0.js ######
./work/fish-3.3.1/user_doc/html/_static/underscore.js
./work/fish-3.3.1/user_doc/html/_static/underscore-1.12.0.js
# make >/tmp/fish_build.log 2>&1                           ### clean make
# find . -name underscore\*                                ###
Below, suddenly we have underscore-1.13.1.js appear ###
./work/fish-3.3.1/user_doc/html/_static/underscore.js
./work/fish-3.3.1/user_doc/html/_static/underscore-1.12.0.js
./work/fish-3.3.1/user_doc/html/_static/underscore-1.13.1.js     #<<<<<<<
# make package
=> Bootstrap dependency digest>=20211023: found digest-20211023
===> Checking for vulnerabilities in fish-3.3.1nb1
===> Installing for fish-3.3.1nb1
=> Generating pre-install file lists
[  1%] Built target pofiles_1
...
[100%] Built target fish_test_helper
[100%] Built target build_fish_pc
Install the project...
-- Install configuration: "RelWithDebInfo"
=> Automatic manual page handling
=> Generating post-install file lists
=> Checking file-check results for fish-3.3.1nb1
ERROR: ************************************************************
ERROR: The following files are in
/usr/pkgsrc/shells/fish/work/.destdir/usr/pkg but not in the PLIST:
ERROR:         /usr/pkgsrc/shells/fish/work/.destdir/usr/pkg/share/doc/fish/_static/underscore-1.13.1.js
*** Error code 1

Stop.
make[1]: stopped in /usr/pkgsrc/shells/fish
*** Error code 1

Stop.
make: stopped in /usr/pkgsrc/shells/fish
#
Script done on Sat Nov 27 09:54:34 2021


(
they look like that - after the 'make package attempt:

find . -name underscore\* -ls
4114461     40 -rw-rw-r--    1 root              wheel
19530 Jul  7 00:54
./work/fish-3.3.1/user_doc/html/_static/underscore.js
4114472    136 -rw-rw-r--    1 root              wheel
67692 Jul  6 15:52
./work/fish-3.3.1/user_doc/html/_static/underscore-1.12.0.js
4115619    136 -rw-r--r--    1 root              wheel
68420 Jul  7 00:54
./work/fish-3.3.1/user_doc/html/_static/underscore-1.13.1.js
4398856     40 -rw-r--r--    1 root              wheel
19530 Jul  7 00:54
./work/.destdir/usr/pkg/share/doc/fish/_static/underscore.js
4398867    136 -rw-r--r--    1 root              wheel
67692 Jul  6 15:52
./work/.destdir/usr/pkg/share/doc/fish/_static/underscore-1.12.0.js
4398874    136 -rw-r--r--    1 root              wheel
68420 Jul  7 00:54
./work/.destdir/usr/pkg/share/doc/fish/_static/underscore-1.13.1.js

)

So the question is where does this mysterious underscore-1.13.1.js
file appear from (its contents is similar, obviously further developed
underscore-1.12.0.js, no point in attaching the diffs in my view).


>
> kre
>

Chavdar

-- 
----