Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 7 Oct 2013 10:37:08 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329679 - head/Mk
Message-ID:  <201310071037.r97Ab8JB030237@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bdrewery
Date: Mon Oct  7 10:37:08 2013
New Revision: 329679
URL: http://svnweb.freebsd.org/changeset/ports/329679

Log:
  - 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>

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Mon Oct  7 10:36:07 2013	(r329678)
+++ head/Mk/bsd.port.mk	Mon Oct  7 10:37:08 2013	(r329679)
@@ -2701,6 +2701,12 @@ SORTED_PATCH_SITES_DEFAULT_CMD=		cd ${.C
 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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310071037.r97Ab8JB030237>