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".Details
Details
- Reviewers
- None
- Group Reviewers
O5: Ports Framework (Owns No Changed Paths) portmgr
Diff Detail
Diff Detail
- Repository
- rP FreeBSD ports repository
- Lint
No Lint Coverage - Unit
No Test Coverage - Build Status
Buildable 35616 Build 32515: arc lint + arc unit
Event Timeline
| Mk/bsd.port.mk | ||
|---|---|---|
| 1026 | Couldn't it be more like: ${DISTDIR}${DIST_SUBDIR:C,//+,/,g} ? And also this seems that DIST_SUBDIRis duplicated. | |
| Mk/bsd.port.mk | ||
|---|---|---|
| 1026 |
Sorry, disregard, please. | |
| Mk/bsd.port.mk | ||
|---|---|---|
| 1026 | No worries! | |
Comment Actions
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.
| Mk/bsd.port.mk | ||
|---|---|---|
| 1026 | ||