diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-07 18:37:08 +0800 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-10-07 18:37:08 +0800 |
| commit | 1ac0719a3bad712637f5e4d8270b37b4d6603793 (patch) | |
| tree | 76039cdb4f28042a41434397da9ab35164a88217 /Mk | |
| parent | 13728ce0ecf87c82331f6af0c4c54ce2bcdcf6d4 (diff) | |
| download | freebsd-ports-gnome-1ac0719a3bad712637f5e4d8270b37b4d6603793.tar.gz freebsd-ports-gnome-1ac0719a3bad712637f5e4d8270b37b4d6603793.tar.zst freebsd-ports-gnome-1ac0719a3bad712637f5e4d8270b37b4d6603793.zip | |
- Fix not being able to use :DEFAULT group in MASTER_SITES and PATCH_SITES.
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>
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 8885dec20990..bd6557e2fac0 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 |