Page MenuHomeFreeBSD
Differential D23261

net-mgmt/pmacct: Rework/fix plist logic
AbandonedPublic
Actions

Authored by otis on Jan 19 2020, 1:16 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Jun 27, 11:36 AM
Unknown Object (File)
Thu, Jun 25, 9:19 AM
Unknown Object (File)
Wed, Jun 24, 7:53 PM
Unknown Object (File)
Sat, Jun 20, 10:16 PM
Unknown Object (File)
Sat, Jun 20, 5:04 PM
Unknown Object (File)
Sat, Jun 20, 2:22 PM
Unknown Object (File)
Tue, Jun 16, 7:25 AM
Unknown Object (File)
Sun, Jun 14, 11:46 PM
View All Files
Subscribers
diizzy
mat
pi
tcberner
Contributor Reviewers (ports)

Details

Reviewers
pi
Summary

Fix substitution of SQLDOC in plist. Previously, SQLDOC was always overwritten to "@comment " by subsequent condition (except from the last one).

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 28798
Build 26807: arc lint + arc unit

Event Timeline

otis created this revision.Jan 19 2020, 1:16 PM
Herald added subscribers: Contributor Reviewers (ports), mat. · View Herald TranscriptJan 19 2020, 1:16 PM
Harbormaster completed remote builds in B28768: Diff 66996.Jan 19 2020, 1:16 PM
otis updated this revision to Diff 66997.Jan 19 2020, 1:25 PM
  • net-mgmt/pmacct: Fix the SQLDOC substitution logic
Harbormaster completed remote builds in B28769: Diff 66997.Jan 19 2020, 1:26 PM
otis updated this revision to Diff 67008.EditedJan 19 2020, 6:52 PM
  • net-mgmt/pmacct: Use also pkgconfig to help database library detection
  • Remove obsolete/unused options
Harbormaster completed remote builds in B28770: Diff 67008.Jan 19 2020, 6:52 PM
diizzy added a subscriber: diizzy.Jan 20 2020, 1:02 PM

Instead of defining localbase manually doesn't USES= localbase work?
https://www.freebsd.org/doc/en/books/porters-handbook/uses-localbase.html

otis updated this revision to Diff 67069.Jan 20 2020, 9:57 PM
  • net-mgmt/pmacct: Update Makefile
Harbormaster completed remote builds in B28798: Diff 67069.Jan 20 2020, 9:57 PM
tcberner added a subscriber: tcberner.Jan 21 2020, 5:29 AM

you could get rid of most of the if-fery

net-mgmt/pmacct/Makefile
41

why not

MYSQL_USES=mysql
MYSQL_CONFIGURE_ENABLE=mysql
68
MLAYER2_CONFIGURE_ENABLE=...
otis updated this revision to Diff 67096.Jan 21 2020, 10:41 AM
  • net-mgmt/pmacct: Rework port options a bit.
Harbormaster completed remote builds in B28814: Diff 67096.Jan 21 2020, 10:41 AM
diizzy added a comment.Jan 22 2020, 10:15 AM

Instead of the IGNORE can't you use IMPLIES instead to avoid breakage?
https://svnweb.freebsd.org/ports/head/audio/cmus/Makefile?revision=519931&view=markup#l116

otis updated this revision to Diff 67153.Jan 22 2020, 7:23 PM
  • Rework options processing logic
Harbormaster completed remote builds in B28850: Diff 67153.Jan 22 2020, 7:23 PM
otis marked an inline comment as done.Jan 23 2020, 10:35 PM
In D23261#510700, @tcberner wrote:

you could get rid of most of the if-fery

net-mgmt/pmacct/Makefile
68

WIthout leading M.

pi added a subscriber: pi.Feb 22 2020, 4:47 PM
pi requested changes to this revision.Feb 22 2020, 4:53 PM

I've tried to apply the diff, but it failed. Can you update the patch to the most recent version of the Makefile and
test, wether it applies ?

This revision now requires changes to proceed.Feb 22 2020, 4:53 PM
otis updated this revision to Diff 68681.Feb 22 2020, 8:38 PM
otis marked an inline comment as done.

Fix plist logic and pgsql module

Harbormaster completed remote builds in B29533: Diff 68681.Feb 22 2020, 8:38 PM
pi added a comment.Feb 23 2020, 9:40 AM

Please check the diff again. I updated the port to 1.7.4p1 yesterday, and this diff does not look similar to your first version of the patch ?

otis abandoned this revision.Feb 23 2020, 10:10 AM

New diff revision will be created.

Revision Contents
Changeset List

PathSize
net-mgmt/
pmacct/
39 lines

Diff 67069

View Options

net-mgmt/pmacct/Makefile

Loading...