Bug 277322

Summary: meta: man to share/man for all of my affected ports
Product: Ports & Packages Reporter: Chris Hutchinson <portmaster>
Component: Individual Port(s)Assignee: Gleb Popov <arrowd>
Status: Closed FIXED    
Severity: Affects Some People CC: arrowd
Priority: ---    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
patch for man to share/man of my ports
portmaster: maintainer-approval+
patch for 11 of my ports to move man to share/man
portmaster: maintainer-approval+
patch for man to share/man conversion for all my ports (final phase)
portmaster: maintainer-approval+
patch for sysutils/cronolog-devel portmaster: maintainer-approval+

Description Chris Hutchinson 2024-02-26 01:57:37 UTC
Created attachment 248748 [details]
patch for man to share/man of my ports

The patch attached to this pr(1) converts
man to share/man for some 36 of my ports.
While here; add missing LICENSE for those affected.

Affected ports:
deskutils/bigyear/Makefile
devel/clig/pkg-plist
dns/fastresolve/pkg-plist
dns/hesiod/pkg-plist
editors/2bsd-vi/pkg-plist
graphics/autotrace/pkg-plist
graphics/gdtclft/Makefile
irc/ezbounce/Makefile
misc/hotkeys/pkg-plist
net-mgmt/tcptrack/Makefile
net/pen/Makefile
net/spread/pkg-plist
net/trafshow/Makefile
net/turnserver/Makefile
net/wackamole/pkg-plist
print/trueprint/Makefile
shells/rc/pkg-plist
sysutils/afio/Makefile
sysutils/and/pkg-plist
sysutils/bkpupsd/Makefile
sysutils/confctl/Makefile
sysutils/cronolog-devel/Makefile
sysutils/fusefs-chironfs/Makefile
sysutils/jailutils/Makefile
sysutils/kldpatch/Makefile
sysutils/lxterminal/Makefile
sysutils/thefish/Makefile
sysutils/upsdaemon/Makefile
www/httptunnel/Makefile
www/links/Makefile
x11-fm/pcmanfm/Makefile
x11-toolkits/iwidgets/Makefile
x11-wm/emerald/Makefile
x11/libfm/Makefile
x11/xvt/Makefile
x11/xvt/pkg-plist

That's it.
Thanks!

--Chris
Comment 1 commit-hook freebsd_committer freebsd_triage 2024-02-26 19:29:17 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3806cf1dc00761df2cb5ceb6182deb1fb54d8b21

commit 3806cf1dc00761df2cb5ceb6182deb1fb54d8b21
Author:     Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-02-26 19:27:22 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-02-26 19:27:48 +0000

    net/trafshow: Move manpages to share/man

    PR:             277322

 net/trafshow/Makefile  | 4 ++--
 net/trafshow/pkg-plist | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Comment 2 Gleb Popov freebsd_committer freebsd_triage 2024-02-26 19:30:58 UTC
Chris, most of your changes cause build failures. It is not enough to change "man/" to "share/man/" in the plist. You also need to adjust Makefile somehow and bump PORTREVISION.

For ports with GNU_CONFIGURE=yes it is sufficient to add GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
Comment 3 Chris Hutchinson 2024-02-26 20:43:46 UTC
(In reply to Gleb Popov from comment #2)
SOrry. They passed locally. I did bump PORTREVISION
I'll get right on it and port and post an updated
patch.

Sorry, and thanks!

--Chris
Comment 4 Gleb Popov freebsd_committer freebsd_triage 2024-02-26 20:52:35 UTC
If you're not using poudriere, make sure to run "make check-plist"
Comment 5 Chris Hutchinson 2024-02-27 00:22:00 UTC
(In reply to Gleb Popov from comment #4)
I spin up a fresh jail and:
git clone -o freebsd --config remote.freebsd.fetch='+refs/notes/*:refs/notes/*' https://git.freebsd.org/ports.git ports

hack,hack,hack. Then perform:
$ make -DBATCH check-plist
$ make stage-qa
$ make check-sanity
$ portlint

If everything checks out;
cd /usr/ports
git add .
git diff --staged>~/some-patch-file.diff

I swear to you, all the man pages showed up in:
/usr/local/share/manN

I feel sick about this. The above procedure has never failed
me before.

I'll have something for you shortly.

Thanks!

--Chris
Comment 6 Gleb Popov freebsd_committer freebsd_triage 2024-02-27 06:27:24 UTC
Maybe the problem is how you generated a patch. If you look at it, you'll see that for instance devel/clig changes only touch plist and not Makefile.
Comment 7 Chris Hutchinson 2024-02-27 08:00:23 UTC
Created attachment 248783 [details]
patch for 11 of my ports to move man to share/man

Agreed. I looked at the patch earlier and it appeared
that not everything I did got recorded. So I'm guessing
I just entered the commands, and either it complained and I
didn't see it. Or I fat-fingered something and didn't notice.

Well today was a hectic day. too many interruptions to finish.
But I *guarantee* this patch will do what it's supposed to do. :)
I'll have a patch for the rest of the ports by noon (my time) tomorrow.

Thanks! :)

--Chris
Comment 8 commit-hook freebsd_committer freebsd_triage 2024-02-27 16:32:44 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f755375b37c8a681c898ff07259f101e621c3618

commit f755375b37c8a681c898ff07259f101e621c3618
Author:     Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-02-27 16:30:28 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-02-27 16:30:55 +0000

    *: Move manpages to share/man

    PR:             277322

 deskutils/bigyear/Makefile                   |  8 +++----
 devel/clig/Makefile                          |  6 +----
 devel/clig/files/patch-install               |  4 ++--
 devel/clig/files/patch-makefile              | 34 ++++++++++++++++++++++++++--
 devel/clig/pkg-plist                         | 28 +++++++++++------------
 dns/fastresolve/Makefile                     |  3 ++-
 dns/fastresolve/pkg-plist                    | 20 ++++++++--------
 dns/hesiod/Makefile                          |  3 ++-
 dns/hesiod/pkg-plist                         | 34 ++++++++++++++--------------
 editors/2bsd-vi/Makefile                     |  2 +-
 editors/2bsd-vi/files/patch-Makefile         | 17 ++++++--------
 editors/2bsd-vi/pkg-plist                    | 10 ++++----
 graphics/autotrace/Makefile                  |  3 ++-
 graphics/autotrace/pkg-plist                 |  2 +-
 graphics/gdtclft/Makefile                    | 11 ++++++---
 graphics/gdtclft/files/Makefile.bsd          |  2 +-
 irc/ezbounce/Makefile                        |  9 ++++----
 irc/ezbounce/pkg-plist                       |  2 +-
 misc/hotkeys/Makefile                        | 13 +++++++----
 misc/hotkeys/pkg-plist                       |  2 +-
 net-mgmt/tcptrack/Makefile                   |  5 ++--
 net-mgmt/tcptrack/files/patch-IPAddress.h    |  4 ++--
 net-mgmt/tcptrack/files/patch-IPv6Address.cc |  4 ++--
 net-mgmt/tcptrack/files/patch-headers.h      |  4 ++--
 net-mgmt/tcptrack/files/patch-util.cc        |  4 ++--
 net/pen/Makefile                             |  8 ++++---
 26 files changed, 141 insertions(+), 101 deletions(-)
Comment 9 Chris Hutchinson 2024-02-27 22:25:58 UTC
Created attachment 248802 [details]
patch for man to share/man conversion for all my ports (final phase)

OK this patch completes the conversion from /man to
/share/man for all my ports. While here; add missing
LICENSEs where needed and perform some *long* overdue
housekeeping. :)

That's it. This patch is good. All I can figure for the
first one is that the a git command reported something
and it scrolled off screen and I missed it. I promise to
better proof my work going forward.

Thanks a million, Gleb, for all your time and efforts here! :)

--Chris
Comment 10 commit-hook freebsd_committer freebsd_triage 2024-03-01 18:13:31 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8eca8a15825949e81a09844aae3454c98182bbe1

commit 8eca8a15825949e81a09844aae3454c98182bbe1
Author:     Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-03-01 18:11:32 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-01 18:11:59 +0000

    www/links: Improve knob ordering

    PR:             277322

 www/links/Makefile | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)
Comment 11 commit-hook freebsd_committer freebsd_triage 2024-03-01 18:13:32 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=138eb13e8b73d136518d79ebd2820b827d8e1419

commit 138eb13e8b73d136518d79ebd2820b827d8e1419
Author:     Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-03-01 18:09:54 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-01 18:11:59 +0000

    *: Move manpages to share/man

    PR:             277322

 net/spread/Makefile                                |   4 +-
 net/spread/pkg-plist                               |  38 ++++----
 net/turnserver/Makefile                            |   3 +-
 net/turnserver/pkg-plist                           |  18 ++--
 net/wackamole/Makefile                             |   4 +-
 net/wackamole/pkg-plist                            |   6 +-
 print/trueprint/Makefile                           |   8 +-
 shells/rc/Makefile                                 |   3 +-
 shells/rc/pkg-plist                                |   4 +-
 sysutils/afio/Makefile                             |   3 +-
 sysutils/afio/files/patch-Makefile                 |   2 +-
 sysutils/and/Makefile                              |   2 +-
 sysutils/and/files/patch-Makefile                  |   6 +-
 sysutils/and/pkg-plist                             |   6 +-
 sysutils/bkpupsd/Makefile                          |   3 +
 sysutils/bkpupsd/files/patch-Makefile              |   6 +-
 sysutils/bkpupsd/pkg-plist                         |   2 +-
 sysutils/confctl/Makefile                          |   4 +-
 sysutils/fusefs-chironfs/Makefile                  |   5 +-
 sysutils/jailutils/Makefile                        |   2 +
 sysutils/jailutils/pkg-plist                       |  12 +--
 sysutils/kldpatch/Makefile                         |   7 +-
 sysutils/lxterminal/Makefile                       |   3 +-
 sysutils/lxterminal/distinfo                       |   3 +-
 sysutils/lxterminal/pkg-plist                      |   2 +-
 sysutils/thefish/Makefile                          |   6 +-
 sysutils/upsdaemon/Makefile                        |   5 +
 sysutils/upsdaemon/pkg-plist                       |   2 +-
 www/httptunnel/Makefile                            |   5 +-
 www/httptunnel/distinfo                            |   3 +-
 x11-fm/pcmanfm/Makefile                            |  14 +--
 x11-fm/pcmanfm/pkg-plist                           |   2 +-
 x11-toolkits/iwidgets/Makefile                     |  15 ++-
 .../iwidgets/files/patch-Makefile.in (new)         |  37 ++++++++
 x11-toolkits/iwidgets/pkg-plist                    | 104 ++++++++++-----------
 x11-wm/emerald/Makefile                            |  10 +-
 x11-wm/emerald/pkg-plist                           |   4 +-
 x11/libfm/Makefile                                 |   6 +-
 x11/libfm/pkg-plist                                |   4 +-
 x11/xvt/Makefile                                   |   4 +-
 x11/xvt/pkg-plist                                  |   2 +-
 41 files changed, 223 insertions(+), 156 deletions(-)
Comment 12 Gleb Popov freebsd_committer freebsd_triage 2024-03-01 18:15:05 UTC
The build of sysutils/cronolog-devel failed, I omitted the hunk from the commit.
Comment 13 Chris Hutchinson 2024-03-02 05:14:16 UTC
Created attachment 248866 [details]
patch for sysutils/cronolog-devel

Here's a replacement patch for sysutils/cronolog-devel.
Sorry about that. :(

Thanks!

--Chris
Comment 14 commit-hook freebsd_committer freebsd_triage 2024-03-02 12:00:21 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f4f598cc9230f4dc9ba8a2151f8333267f763b4

commit 3f4f598cc9230f4dc9ba8a2151f8333267f763b4
Author:     Chris Hutchinson <portmaster@bsdforge.com>
AuthorDate: 2024-03-02 11:55:03 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-02 11:55:03 +0000

    sysutils/cronolog-devel: Move manpages to share/man

    PR:             277322

 sysutils/cronolog-devel/Makefile  | 21 ++++++++++-----------
 sysutils/cronolog-devel/pkg-descr |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)
Comment 15 Gleb Popov freebsd_committer freebsd_triage 2024-03-02 12:00:44 UTC
Pushed, thank you.