kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove support for distfiles in cdrom

Browse source 
No cdrom distfiles has been shipped for a while, and it causes issues
for users having /cdrom configured in autofs

Reported by:	glebius
Tested by:	glebius
Approved by:	swills
Reviewed by:	swills
Differential Revision:	https://reviews.freebsd.org/D2888
This commit is contained in:
Baptiste Daroussin 2015-07-02 23:17:27 +00:00
parent 85c761f385
commit b822a87609
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=391207
1 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Mk/bsd.port.mk
View file

@ -148,9 +148,6 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# - If set, prepend the MASTER_SITES setting with this value.
# MASTER_SITE_FREEBSD
# - If set, prepend ${MASTER_SITE_BACKUP} in MASTER_SITES.
# CD_MOUNTPTS - List of CDROM mountpoints to look for distfiles under.
# This variable supercedes CD_MOUNTPT, which is
# obsolete.
#
# Set these if your port should not be built under certain circumstances.
# These are string variables; you should set them to the reason why
@ -1473,9 +1470,6 @@ EXTRACT_SUFX?= .tar.gz
.endif
.endif
# Location of mounted CDROM(s) to search for files
CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT}
# Owner and group of the WWW user
WWWOWN?= www
WWWGRP?= www
@ -2412,17 +2406,6 @@ _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE}
_MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP}
.endif
# Search CDROM first if mounted, symlink instead of copy if
# FETCH_SYMLINK_DISTFILES is set
.for MOUNTPT in ${CD_MOUNTPTS}
.if exists(${MOUNTPT}/ports/distfiles)
_MASTER_SITE_OVERRIDE:= file:${MOUNTPT}/ports/distfiles/${DIST_SUBDIR}/ ${_MASTER_SITE_OVERRIDE}
.if defined(FETCH_SYMLINK_DISTFILES)
FETCH_BEFORE_ARGS+= -l
.endif
.endif
.endfor
NOFETCHFILES?=
# Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL