Page MenuHomeFreeBSD
Differential D40549

Subpackages!
ClosedPublic
Actions

Authored by pizzamig on Jun 14 2023, 8:24 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 30, 11:46 PM
Unknown Object (File)
Sun, Mar 23, 1:45 AM
Unknown Object (File)
Sun, Mar 16, 9:17 PM
Unknown Object (File)
Fri, Mar 14, 5:34 PM
Unknown Object (File)
Feb 27 2025, 2:25 PM
Unknown Object (File)
Feb 26 2025, 6:53 AM
Unknown Object (File)
Feb 26 2025, 4:49 AM
Unknown Object (File)
Feb 26 2025, 3:06 AM
View All Files
Subscribers
agh_riseup.net
cy
eduardo
fuz
guest-patmaddox
madpilot
mat
View All 13 Subscribers

Details

Reviewers
rene
Group Reviewers
portmgr
Commits
R11:47564762a319: component: add SUBPACKAGES
Summary

Initial implementation of subpackages.

Based on previous mat's implementation: https://reviews.freebsd.org/D16457
To add subpackages to a port, define:

SUBPACKAGES=  foo bar

and in the plist, prefix files to put in a subpackage with @@foo@@.

For each subpackage, some variables can be set, if needed.

  • DESCR.<subpkg> defaults to the pkg-descr if pkg-descr.<subpkg> does not exist (with a warning)
  • COMMENT.<subpkg> defaults to ${COMMENT} (subpkg: <subpkg>)
  • All the PKGMESSAGE/PKGINSTALL/... variable have .<subpkg> version, pointing to pkg-message.<subpkg>/pkg-install.<subpkg> files.
  • A few options helpers <opt>_SUBPACKAGES and <opt>_*_DEPENDS.<subpkg> can be used.
  • PLIST_FILES.<subpkg> and PLIST_DIRS.subpkg were added too.

Subpackages can depend on each other, a new variable has been introduced, SELF_DEPENDS, and a special subpackage name has been introduced to refer to the main package. For example:

If the foo subpackage depends on the main subpackage:

SUBPACKAGES=  foo
SELF_DEPENDS.foo= main

If the main package depends on the tools subpackage:

SUBPACKAGE=   tools
SELF_DEPENDS=  tools

An OPTIONcan define a SUBPACKAGEwith

<OPT>_SUBPACKAGES=  subpkg

Licenses are currently propagated on every subpackage. Open to suggestions.

Diff Detail

Repository
R11 FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 54908
Build 51797: arc lint + arc unit

Event Timeline

pizzamig created this revision.Jun 14 2023, 8:24 PM
Herald added a reviewer: portmgr. · View Herald TranscriptJun 14 2023, 8:24 PM
Herald added subscribers: Contributor Reviewers (ports), mat. · View Herald Transcript
pizzamig requested review of this revision.Jun 14 2023, 8:24 PM
Harbormaster completed remote builds in B52061: Diff 123248.Jun 14 2023, 8:24 PM
pizzamig edited the summary of this revision. (Show Details)Jun 14 2023, 8:24 PM
pizzamig edited the summary of this revision. (Show Details)Jun 14 2023, 8:27 PM
pizzamig edited the summary of this revision. (Show Details)
pizzamig updated this revision to Diff 123249.Jun 14 2023, 8:34 PM
This comment was removed by pizzamig.
Harbormaster completed remote builds in B52062: Diff 123249.Jun 14 2023, 8:34 PM
pizzamig updated this revision to Diff 123250.Jun 14 2023, 8:38 PM
This comment was removed by pizzamig.
Harbormaster completed remote builds in B52063: Diff 123250.Jun 14 2023, 8:38 PM
pizzamig updated this revision to Diff 123367.Jun 17 2023, 3:05 PM
  • Fix dependencies in sub-packages
Harbormaster completed remote builds in B52115: Diff 123367.Jun 17 2023, 3:05 PM
rene accepted this revision.Jun 25 2023, 1:35 PM
rene added a subscriber: rene.

Rubberstamping this one and D40550 as discussed during the last portmgr meeting.

This revision is now accepted and ready to land.Jun 25 2023, 1:35 PM
pizzamig updated this revision to Diff 124003.Jun 29 2023, 8:38 PM
  • Initial import of the subpackage framework
  • Fix [build|run]-depends-list targets
  • Fix type in PKGFILE
  • Fix METADIR
  • Fix type in RE
  • Fix PLIST
  • Fix _PKGDIR initialization
  • Fix typo
  • Fix the case when there are no subpackages
  • Fix _PLIST
  • Simplify METADIR as in the original patch
  • Fix _strip_perms
  • More fixes
  • Fix package creation
  • Add SUBPACKES to the list of OPTIONS_HELPERS
  • Make DESCR.subpkg warning message shorter
  • Fix PLIST_FILES.subpkg
  • Implement LICENSE support
  • Fix dependencies in sub-packages
  • Fix actual-package-depends target
  • Add PKGBASE.subpkg variable
  • Make do-depends aware of the subpackages
  • do-depends.sh: fix a typo
This revision now requires review to proceed.Jun 29 2023, 8:38 PM
Harbormaster completed remote builds in B52340: Diff 124003.Jun 29 2023, 8:38 PM
pizzamig updated this revision to Diff 124321.Jul 7 2023, 9:43 PM
  • Add annotation to packages about being a subpkg
Harbormaster completed remote builds in B52488: Diff 124321.Jul 7 2023, 9:43 PM
eduardo added a subscriber: eduardo.Jul 10 2023, 12:55 AM
guest-patmaddox added a subscriber: guest-patmaddox.Jul 27 2023, 8:34 AM
fuz added a subscriber: fuz.Sep 8 2023, 8:04 AM
madpilot added a subscriber: madpilot.Sep 8 2023, 9:05 AM
pi added a subscriber: pi.Sep 8 2023, 10:16 AM
cy added a subscriber: cy.Sep 9 2023, 4:26 AM
pizzamig updated this revision to Diff 127423.Sep 15 2023, 2:07 PM
  • Remove a weird copy&pasta leftover
Harbormaster completed remote builds in B53601: Diff 127423.Sep 15 2023, 2:07 PM
romain added a subscriber: romain.Sep 26 2023, 4:00 PM
agh_riseup.net added a subscriber: agh_riseup.net.Oct 5 2023, 11:08 AM
pizzamig updated this revision to Diff 131292.Dec 12 2023, 10:36 PM
  • Initial import of the subpackage framework
  • Fix [build|run]-depends-list targets
  • Fix type in PKGFILE
  • Fix METADIR
  • Fix type in RE
  • Fix PLIST
  • Fix _PKGDIR initialization
  • Fix typo
  • Fix the case when there are no subpackages
  • Fix _PLIST
  • Simplify METADIR as in the original patch
  • Fix _strip_perms
  • More fixes
  • Fix package creation
  • Add SUBPACKES to the list of OPTIONS_HELPERS
  • Make DESCR.subpkg warning message shorter
  • Fix PLIST_FILES.subpkg
  • Implement LICENSE support
  • Fix dependencies in sub-packages
  • Fix actual-package-depends target
  • Add PKGBASE.subpkg variable
  • Make do-depends aware of the subpackages
  • do-depends.sh: fix a typo
  • Add annotation to packages about being a subpkg
  • Remove a weird copy&pasta leftover
  • Fix subpackages in some dependency list
Harbormaster completed remote builds in B54908: Diff 131292.Dec 12 2023, 10:36 PM
tcberner added a subscriber: tcberner.Dec 20 2023, 9:33 AM
tcberner added inline comments.
Mk/bsd.licenses.mk
813

^missed a ${LICENSE_DIR.${sp} here on line 813, I think

pizzamig updated this revision to Diff 131611.Dec 20 2023, 6:31 PM
  • Fix multi/dual license
Harbormaster completed remote builds in B55046: Diff 131611.Dec 20 2023, 6:31 PM
se added a subscriber: se.Dec 22 2023, 8:47 PM
pizzamig updated this revision to Diff 131905.Dec 27 2023, 1:01 PM
  • Fix users of _LICENSE_DIR
Harbormaster completed remote builds in B55135: Diff 131905.Dec 27 2023, 1:02 PM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 1 2024, 9:59 PM
Closed by commit R11:47564762a319: component: add SUBPACKAGES (authored by pizzamig). · Explain Why
This revision was automatically updated to reflect the committed changes.
pizzamig added a commit: R11:47564762a319: component: add SUBPACKAGES.
arrowd mentioned this in D43791: Framework: Fix `make describe` for SUBPACKAGES case.Feb 8 2024, 3:20 PM

Revision Contents
Changeset List

PathSize
Mk/
Scripts/
6 lines
23 lines
3 lines
67 lines
27 lines
296 lines

Diff 131292

View Options

Mk/Scripts/depends-list.sh

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.
View Options

Mk/Scripts/do-depends.sh

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.
View Options

Mk/Scripts/functions.sh

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.
View Options

Mk/bsd.licenses.mk

Context not available.
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd October 8, 2010 .Dd February 11, 2016
.Dt MAILER.CONF 5 .Dt MAILER.CONF 5
.Os .Os
.Sh NAME .Sh NAME
Context not available.
sendmail /usr/local/bin/mini_sendmail -srelayhost sendmail /usr/local/bin/mini_sendmail -srelayhost
send-mail /usr/local/bin/mini_sendmail -srelayhost send-mail /usr/local/bin/mini_sendmail -srelayhost
.Ed .Ed
.Pp
This example shows the use of
.Xr dma 8
in place of
wblockUnsubmitted
Not Done
Inline Actions

This is probably better like the comment, "instead of". I suspect that is more common and easier for translators.
...Ah, I see that the other examples use "in place of". Well, no time like the present to break with tradition.

wblock: This is probably better like the comment, "instead of". I suspect that is more common and…
wblockUnsubmitted
Not Done
Inline Actions

"in favor of" usually means the second thing is better than/preferred to/replacing the first. It is kind of confusing here.

Sometimes difficulty in simplifying a sentence means that it is trying to say to much or working too hard to get there.
What about changing this to be more direct than the original man page wording, like so:

This example shows how to use
.Xr dma 8
as a replacement for
.Xr sendmail 8 :

That could be even simpler:

Using
.Xr dma 8
to replace
.Xr sendmail 8 :
wblock: "in favor of" usually means the second thing is better than/preferred to/replacing the first.
.Xr sendmail 8 :
.Bd -literal -offset indent
# Execute dma instead of sendmail
sendmail /usr/libexec/dma
send-mail /usr/libexec/dma
mailq /usr/libexec/dma
newaliases /usr/libexec/dma
rmail /usr/libexec/dma
.Ed
.Sh SEE ALSO .Sh SEE ALSO
.Xr mail 1 , .Xr mail 1 ,
.Xr mailq 1 , .Xr mailq 1 ,
Context not available.
View Options

Mk/bsd.options.mk

Loading...
View Options

Mk/bsd.port.mk

Loading...