bsd.port.mk: Remove confusing double "/" from _DISTDIR
ClosedPublic
Actions

Authored by 0mp on Dec 22 2020, 3:54 PM.

Details

Reviewers

Group Reviewers

O5: Ports Framework	(Owns No Changed Paths)
portmgr

Commits

R11:3fc4fad26362: Mk/bsd.port.mk: Remove confusing double "/" from _DISTDIR

Summary

bsd.port.mk: Remove confusing double "/" from _DISTDIR

_DISTDIR is a variable which stores the distfiles directory of the port that is
currently being worked on. In practice, it is usually just the DISTDIR,
although some ports also define a subdirectory. Currently, a slash separating
DISTDIR from DIST_SUBDIR is added to _DISTDIR no matter if DIST_SUBDIR is set
or not. This may cause confusion to ports users by looking like a bug while it
is not.

In particular, this patch casuses diagnostic logs of failed archive extraction
to look like this:

    ===>  Failed to extract "/portdistfiles/ttf-iosevka-ss05-4.1.1.zip".

instead of this:

    ===>  Failed to extract "/portdistfiles//ttf-iosevka-ss05-4.1.1.zip".

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=282291

Diff Detail

Repository

R11 FreeBSD ports repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 65392
Build 62275: arc lint + arc unit

Event Timeline

0mp created this revision.Dec 22 2020, 3:54 PM

Owners added a reviewer: O5: Ports Framework.Dec 22 2020, 3:54 PM

Herald added a reviewer: portmgr. · View Herald TranscriptDec 22 2020, 3:54 PM

Herald added a subscriber: mat. · View Herald Transcript

0mp requested review of this revision.Dec 22 2020, 3:54 PM

Harbormaster completed remote builds in B35616: Diff 81056.Dec 22 2020, 3:54 PM

otis added a subscriber: otis.Jan 16 2021, 10:38 PM

otis added inline comments.

Mk/bsd.port.mk
1010	Couldn't it be more like: `${DISTDIR}${DIST_SUBDIR:C,//+,/,g}` ? And also this seems that `DIST_SUBDIR`is duplicated.

otis added inline comments.Jan 16 2021, 10:40 PM

Mk/bsd.port.mk
1010	Couldn't it be more like: `${DISTDIR}${DIST_SUBDIR:C,//+,/,g}` ? And also this seems that `DIST_SUBDIR`is duplicated. Sorry, disregard, please.

0mp marked 2 inline comments as done.Jan 17 2021, 1:26 PM

0mp added inline comments.

Mk/bsd.port.mk
1010	No worries!

0mp edited the summary of this revision. (Show Details)Oct 23 2024, 8:19 PM

I don't quite understand where the problem is.
Is the fact that there are two / sometime breaks stuff?
If this is actually the case, I'd rather the source of the second / be somewhat fixed.