Update sysutils/hared to 1.0-45
ClosedPublic
Actions

Authored by 0mp on Apr 15 2018, 11:22 PM.

Details

Reviewers

dvl

Group Reviewers

Contributor Reviewers (ports)

Commits

rP470219: Add CONFLICTS_INSTALL.
rP470100: Add CONFLICTS_INSTALL.

Summary

Changes:

Add CONFLICTS_INSTALL.
Simplify sample configuration installation after sending patches upstream.

QA:

poudriere testport: 11.1 amd64
portlint -AC

Diff Detail

Repository

rP FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

0mp created this revision.Apr 15 2018, 11:22 PM

Herald added a subscriber: mat. · View Herald TranscriptApr 15 2018, 11:22 PM

Do you want to add the conflicts to the py port too?

Do you want me to commit this now?

This revision is now accepted and ready to land.Apr 15 2018, 11:42 PM

In D15079#317666, @dvl wrote:

Do you want to add the conflicts to the py port too?

Good idea! I'll send an updated patch in moment. I've also fixed sysutils/py-hared portlint warnings and I'm running a poudriere test just to be sure everything is fine.

Add CONFLICTS_INSTALL to sysutils/py-hared
Move PLIST_FILES to pkg-plist
Change permissions of hared.ini.sample to 640 (similarly to how it is done in sysutlis/hared)

This revision now requires review to proceed.Apr 16 2018, 12:11 AM

Bonus points for sending patches upstream.

This revision was not accepted when it landed; it landed in state Needs Review.May 16 2018, 1:13 AM

Closed by commit rP470100: Add CONFLICTS_INSTALL. (authored by dvl). · Explain Why

This revision was automatically updated to reflect the committed changes.

dvl mentioned this in rP470100: Add CONFLICTS_INSTALL..

Well done. Thank you. I have this running at home.

@dvl Great!

BTW, I think you've missed the sysutils/py-hared part of the patch I provided: https://reviews.freebsd.org/D15079?id=41496

0mp reopened this revision.May 16 2018, 2:47 PM

In D15079#326073, @0mp wrote:

@dvl Great!

BTW, I think you've missed the sysutils/py-hared part of the patch I provided: https://reviews.freebsd.org/D15079?id=41496

Yes, yes I did.

This revision was not accepted when it landed; it landed in state Needs Review.May 17 2018, 2:12 PM

Closed by commit rP470219: Add CONFLICTS_INSTALL. (authored by dvl). · Explain Why

This revision was automatically updated to reflect the committed changes.

dvl mentioned this in rP470219: Add CONFLICTS_INSTALL..

mat added inline comments.May 18 2018, 1:14 PM

head/sysutils/py-hared/pkg-plist
1–3 ↗	(On Diff #42661)	@sample(,,0640) %%ETCDIR%%/hared.ini.sample (or even better, add PLIST_FILES in the Makefile.) See Expanding Package List with Keywords

0mp added inline comments.May 18 2018, 3:34 PM

head/sysutils/py-hared/pkg-plist
1–3 ↗	(On Diff #42661)	But the handbook says that it is not possible to use keywords in PLIST_FILES. I guess I missed something, right?

dvl added inline comments.May 18 2018, 3:40 PM

head/sysutils/py-hared/pkg-plist
1–3 ↗	(On Diff #42661)	See https://svnweb.freebsd.org/ports/head/sysutils/bacula-server/pkg-plist?revision=448638&view=markup for examples See also PLIST_SUB in Makefile

0mp added inline comments.May 18 2018, 3:51 PM

head/sysutils/py-hared/pkg-plist
1–3 ↗	(On Diff #42661)	Actually, my question was about using `@sample(,,0640) %%ETCDIR%%/hared.ini.sample` in `PLIST_FILES` inside the Makefile. The handbook says: The price for this way of listing a port's files and directories is that the keywords described in pkg-create(8) and Section 8.6, “Expanding Package List with Keywords” cannot be used. (source) This is why I don't understand mat's suggestion to use `PLIST_FILES` instead of `pkg-plist`.

mat added inline comments.May 21 2018, 2:59 PM

head/sysutils/py-hared/pkg-plist
1–3 ↗	(On Diff #42661)	As it does not make any sense, I have removed the paragraph saying that from the porter's handbook. Using: PLIST_FILES= "@sample(,,0640) ${ETCDIR}/hared.ini.sample" is perfectly fine.