mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

- Fix not being able to use :DEFAULT group in MASTER_SITES and PATCH_SITES.

Browse Source 
This is useful to be able to define extra mirrors in PATCH_SITES for
  a group, while still depending on the master list of PATCH_SITES

  For example:

    .if ${PORT_OPTIONS:MX509}
    PATCH_SITES=	http://mirror1/x509-${X509_VERSION}/:x509
    PATCHFILES=		${PORTNAME}-6.3p1+x509-${X509_VERSION}.diff.gz:-p1:x509
    .endif
    PATCH_SITES+=	http://mirror2/${PORTNAME}/:DEFAULT,x509

  This will use mirror1 only for the X509 option and mirror2 for X509. All
  other patches will use mirror2 but not mirror1.

With hat:	portmgr
PR:		ports/52706
Submitted by:	Alexey Neyman <alex.neyman@auriga.ru>
This commit is contained in:
Bryan Drewery 2013-10-07 10:37:08 +00:00
parent 13728ce0ec
commit 1ac0719a3b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=329679
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mk/bsd.port.mk
View File

@ -2701,6 +2701,12 @@ SORTED_PATCH_SITES_DEFAULT_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-DEFAULT
SORTED_MASTER_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} master-sites-ALL
SORTED_PATCH_SITES_ALL_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-ALL
# has similar effect to old targets, i.e., access only {MASTER,PATCH}_SITES, not working with the new _n variables
master-sites-DEFAULT:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
patch-sites-DEFAULT:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
#
# Sort the master site list according to the patterns in MASTER_SORT
# according to grouping rules (:something)
@ -2761,11 +2767,6 @@ master-sites-ALL:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_ALL}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
patch-sites-ALL:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_ALL}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
# has similar effect to old targets, i.e., access only {MASTER,PATCH}_SITES, not working with the new _n variables
master-sites-DEFAULT:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
patch-sites-DEFAULT:
@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_DEFAULT}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
# synonyms, mnemonics
master-sites-all: master-sites-ALL