Bug 266558 - graphics/cairo DOCS option - Coordinating GNOME_HTML_DIR for Makefile and DOCSDIR for pkg-plist
Summary: graphics/cairo DOCS option - Coordinating GNOME_HTML_DIR for Makefile and DOC...
Status: New
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: freebsd-desktop (Team)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-09-23 03:04 UTC by Sean Champ
Modified: 2022-09-23 03:16 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (desktop)


Attachments
GNOME_HTML_DIR update for graphics/cairo (796 bytes, patch)
2022-09-23 03:04 UTC, Sean Champ
no flags Details | Diff
updated GNOME_HTML_DIR patch for graphics/cairo (510 bytes, patch)
2022-09-23 03:16 UTC, Sean Champ
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Sean Champ 2022-09-23 03:04:57 UTC
Created attachment 236755 [details]
GNOME_HTML_DIR update for graphics/cairo

After beginning a ports upgrade this week, I noticed that the docs option has been updated for graphics/cairo. Candidly, it seems that I'll have to catch up with my ports email, for any info/follow through about the docs patches.

In review of my earlier patch, I guess this is a sort of patch update? 

Presently, I wasn't able to install the updated graphics/cairo port with the updated docs option enabled. 

To my best estimate: With DOCSDIR set to ${PREFIX}/share/gtk-doc/html and that being used in a similar way to GNOME_HTML_DIR from /usr/ports/Mk/Uses/gnome.mk then the docs are then installed under ${PREFIX}/share/gtk-doc/html/cairo. The pkg-plist is set to locate the docs directly in ${DOCSDIR} however.

At the time when I'd sent the earlier patch, I believe I wasn't then aware of how GNOME_HTML_DIR is used in gnome.mk. /usr/ports/Mk/Uses/gnome.mk will pass GNOME_HTML_DIR as the --with-html-dir to configure.

With the attached diff, graphics/cairo would use a DOCSDIR as ${GNOME_HTML_DIR}/${PORTNAME} and a GNOME_HTML_DIR as ${PREFIX}/share/gtk-doc/html. The gtk-doc files can then be located without update to the pkg-plist


Thx for noticing the patch!

[1] https://gitlab.com/FreeBSD/freebsd-ports/-/blob/main/graphics/cairo/Makefile
Comment 1 Sean Champ 2022-09-23 03:16:36 UTC
Created attachment 236756 [details]
updated GNOME_HTML_DIR patch for graphics/cairo

Here is a diff for graphics/cairo/Makefile without the cruft from my earlier patch