textproc/tkdiff: update to 4.3

[fernape]

Summary

Sent by maintainer via PR 229159

Related to the closed PR 228842

Test Plan

• portlint -AC OK
• poudriere builds for {10.4,11.1}{amd64,i386}, 12i386 OK
• run test in 11.1 amd64 OK

[tcberner]

Sorry, I misread the diff -- you already get rid of the icons here \o/

[tcberner]

textproc/tkdiff/Makefile

8 ↗

(On Diff #44080)

^ you pick ports with silly numbers to work on :D -- would probably make sense to ${PORTVERS:<do something>} here :)

And you probably should use DISVTERSION=4-3 which will give you a PORTVERISON of 4.3 and still the proper distfile.

26 ↗

(On Diff #44080)

^ if you define them without ${WRKSRC} here, you might be able to reuse it with some make replacment int he PLIST_FILES section too.

Otherwise, you could also just get rid of that variable and use a glob to copy the files in the install target.

[fernape]

• Set DISTVERSION and use it where appropriate
• Reuse IKONS in PLIST_FILES and do-install

[mat]

textproc/tkdiff/Makefile

8 ↗

(On Diff #44098)

DISTFILES= ${DISTNAME}.zip tkicons.txz:ikon

16 ↗

(On Diff #44098)

Remove, default. (Also, wrong place.)

29–30 ↗

(On Diff #44098)

This looks like you could use a pkg-plist file.

[fernape]

• Use ${DISTNAME}
• Remove manual WRKSRC definition
• Use pkg-plist instead of PLIST_FILES

[tcberner]

textproc/tkdiff/pkg-plist

2 ↗

(On Diff #44153)

^ this does not belong in the pkg-plist

[fernape]

Remove .desktop entry from pkg-plist. It will be added automatically

[fernape]

I can't commit this one:

Do not commit ports without TIMESTAMP in their distinfo files.

But it has a TIMESTAMP:

$ cat textproc/tkdiff/distinfo 
TIMESTAMP =  1529386575
SHA256 (tkdiff-4-3.zip) = 60acdb57da030a5697e801996e30ae7d3a49f60898abdc63286bb7be98b58bb3
SIZE (tkdiff-4-3.zip) = 136616
SHA256 (tkicons.txz) = cf1e6559894e9462284a1ff37fc174ecd384eb7b96dcca1d77725cbc691125a4
SIZE (tkicons.txz) = 65720

[tcberner]

Did you maybe apply it with svn patch and lost all the file permissions? ... well, no, then you wouldn't be able to read it :D

[fernape]

In D15907#337696, @tcberner wrote:

Did you maybe apply it with svn patch and lost all the file permissions? ... well, no, then you wouldn't be able to read it :D

No, it's not that...

fernape@hammer:~/FreeBSD-repos/ports/head$ ls -latrh textproc/tkdiff/
total 64
-rw-r--r--     1 fernape  fernape   100B May 25 18:05 pkg-descr
-rw-r--r--     1 fernape  fernape   261B Jun 19 16:24 distinfo
-rw-r--r--     1 fernape  fernape   854B Jun 20 15:58 Makefile
-rw-r--r--     1 fernape  fernape   122B Jun 21 17:02 pkg-plist
drwxr-xr-x     2 fernape  fernape   512B Jun 21 17:06 ./
drwxr-xr-x  1844 fernape  fernape    44K Jun 21 18:41 ../
fernape@hammer:~/FreeBSD-repos/ports/head$

So I reverted all the changes and arc patched the port.

Now it looks like this:

fernape@hammer:~/FreeBSD-repos/ports/head$ ls -latrh textproc/tkdiff/
total 64
-rw-r--r--     1 fernape  fernape   100B May 25 18:05 pkg-descr
drwxr-xr-x  1844 fernape  fernape    44K Jun 21 18:41 ../
-rw-r--r--     1 fernape  wheel     122B Jun 21 20:34 pkg-plist
-rw-r--r--     1 fernape  wheel     261B Jun 21 20:35 distinfo
-rw-r--r--     1 fernape  wheel     854B Jun 21 20:35 Makefile
drwxr-xr-x     2 fernape  fernape   512B Jun 21 20:46 ./

And still fails...

[tobik]

In D15907#337689, @fernape wrote:

I can't commit this one:

Do not commit ports without TIMESTAMP in their distinfo files.

But it has a TIMESTAMP:

$ cat textproc/tkdiff/distinfo 
TIMESTAMP =  1529386575
SHA256 (tkdiff-4-3.zip) = 60acdb57da030a5697e801996e30ae7d3a49f60898abdc63286bb7be98b58bb3
SIZE (tkdiff-4-3.zip) = 136616
SHA256 (tkicons.txz) = cf1e6559894e9462284a1ff37fc174ecd384eb7b96dcca1d77725cbc691125a4
SIZE (tkicons.txz) = 65720

I had the same problem a couple of hours ago. There's an extra space after the =. The pre-commit hook does grep -q '^TIMESTAMP = [0-9]*$' so it fails when it's there.

[mat]

Mmmm, what commands did you run that generated a bad distinfo file?

[tobik]

In D15907#337807, @mat wrote:

Mmmm, what commands did you run that generated a bad distinfo file?

In my case it was submitted with a bad format, so I'm not sure. Some contributors refuse or don't know how to use make makesum for some reason and write their own tooling. Usually this is easy to spot when TIMESTAMP is missing in distinfo, but this variant was new.

[fernape]

In D15907#337950, @tobik wrote:

In D15907#337807, @mat wrote:

Mmmm, what commands did you run that generated a bad distinfo file?

In my case it was submitted with a bad format, so I'm not sure. Some contributors refuse or don't know how to use make makesum for some reason and write their own tooling. Usually this is easy to spot when TIMESTAMP is missing in distinfo, but this variant was new.

Same in my case:

https://bz-attachments.freebsd.org/attachment.cgi?id=194409