diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-27 15:16:44 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-27 15:16:44 +0000 |
| commit | e7af7b2e05a05619d928f4bb3855ebca2c58f684 (patch) | |
| tree | 3529dbe2fb2a983115d50f591b6a7a2501a1d59c /mk | |
| parent | a5163ad93efe3955028881dd69253ff3a5809704 (diff) | |
| download | pkgsrc-e7af7b2e05a05619d928f4bb3855ebca2c58f684.tar.gz | |
Apply the "convention over configuration" principle:
If ${FILESDIR}/getsite.sh exists, then use it to determine the fetch
URL for each of the distfiles for the package. Otherwise, use
SITE_<file> and MASTER_SITES, in order, to determine the URL for each
distfile.
If the script path differs from ${FILESDIR}/getsite.sh, then set
DYNAMIC_SITE_SCRIPT to the full path to that script.
Remove the need to set DYNAMIC_MASTER_SITES explicitly in the package
Makefile for:
graphics/ns-cult3d
wm/sawfish-themes
www/apache-tomcat55
www/jakarta-tomcat4
www/jakarta-tomcat5
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/fetch/fetch-list.mk | 8 | ||||
| -rw-r--r-- | mk/fetch/fetch.mk | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mk/fetch/fetch-list.mk b/mk/fetch/fetch-list.mk index de0136afd97..6a6b5039b5b 100644 --- a/mk/fetch/fetch-list.mk +++ b/mk/fetch/fetch-list.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch-list.mk,v 1.3 2006/07/27 13:51:21 jlam Exp $ +# $NetBSD: fetch-list.mk,v 1.4 2006/07/27 15:16:44 jlam Exp $ # Prints out a script to fetch all needed files (no checksumming). .PHONY: fetch-list @@ -44,7 +44,7 @@ fetch-list-one-pkg: @location=`${PWD_CMD} | ${AWK} -F / '{ print $$(NF-1) "/" $$NF }'`; \ ${ECHO} '# Need additional files for ${PKGNAME} ('$$location')...' . for fetchfile in ${_ALLFILES} -. if defined(DYNAMIC_MASTER_SITES) +. if exists(${DYNAMIC_SITE_SCRIPT}) @(if [ ! -f ${_DISTDIR}/${fetchfile:T} ]; then \ ${ECHO}; \ filesize=`${AWK} ' \ @@ -53,7 +53,7 @@ fetch-list-one-pkg: ${ECHO} '# Fetch ${fetchfile} ('$${filesize-???}' bytes):'; \ ${ECHO} '#'; \ ${ECHO} '${SH} -s ${fetchfile:T} <<"EOF" |('; \ - ${CAT} ${FILESDIR}/getsite.sh; \ + ${CAT} ${DYNAMIC_SITE_SCRIPT}; \ ${ECHO} EOF; \ ${ECHO} read unsorted_sites; \ ${ECHO} 'unsorted_sites="$${unsorted_sites} ${_MASTER_SITE_BACKUP}"'; \ @@ -83,7 +83,7 @@ fetch-list-one-pkg: ${ECHO} ' ${ECHO} ${fetchfile:T} not fetched'; \ ${ECHO} done; \ fi) -. endif # defined(DYNAMIC_MASTER_SITES) +. endif . endfor . endif # !empty(_ALLFILES) .endif # !target(fetch-list-one-pkg) diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index 6300bb8a296..25c27371784 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.17 2006/07/27 07:41:40 rillig Exp $ +# $NetBSD: fetch.mk,v 1.18 2006/07/27 15:16:44 jlam Exp $ _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -54,9 +54,11 @@ _ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites # # Associate each file to fetch with the correct site(s). # -.if defined(DYNAMIC_MASTER_SITES) +DYNAMIC_SITE_SCRIPT?= ${FILESDIR}/getsite.sh +DYNAMIC_SITE_CMD?= ${SETENV} PATH=${PATH:Q} ${SH} ${DYNAMIC_SITE_SCRIPT} +.if exists(${DYNAMIC_SITE_SCRIPT}) . for fetchfile in ${_ALLFILES} -SITES_${fetchfile:T:S/=/--/}?= `${SH} ${FILESDIR}/getsite.sh ${fetchfile:T}` +SITES_${fetchfile:T:S/=/--/}?= `${DYNAMIC_SITE_CMD} ${fetchfile:T}` SITES.${fetchfile:T:S/=/--/}?= ${SITES_${fetchfile:T:S/=/--/}} . endfor .endif |