summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz>2014-05-19 13:59:15 +0000
committerwiz <wiz>2014-05-19 13:59:15 +0000
commit102c4fd863e2deb0e6034bb50d9eeee134340cdb (patch)
tree10726272cf63e977a237579afc20eab9d402d665
parent8a7d436e3eb2af0ceca41c2a29d20a8fb71ca3d5 (diff)
downloadpkgsrc-102c4fd863e2deb0e6034bb50d9eeee134340cdb.tar.gz
Improve previous.
-rw-r--r--doc/guide/files/build.xml18
-rw-r--r--mk/fetch/sites.mk6
2 files changed, 14 insertions, 10 deletions
diff --git a/doc/guide/files/build.xml b/doc/guide/files/build.xml
index 4cada7bb3fe..a11e4ae3378 100644
--- a/doc/guide/files/build.xml
+++ b/doc/guide/files/build.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.68 2014/05/19 13:47:22 obache Exp $ -->
+<!-- $NetBSD: build.xml,v 1.69 2014/05/19 13:59:15 wiz Exp $ -->
<chapter id="build">
<title>The build process</title>
@@ -299,14 +299,18 @@ MASTER_SITES= http://www.example.com/download.cgi?file=
</programlisting>
<para> The exception to this rule are URLs starting with a dash.
- In that case the URL is taken as is, fetched and the result stored
- under the name of the distfile.
- You can use this style for the case download URL style does not
- match to above usuall case.
- For example, permanent download URL is a redirecter to real download URL,
- or download file name is offerd by HTTP Content-Disposition header.</para>
+ In that case the URL is taken as is, fetched and the result
+ stored under the name of the distfile. You can use this style
+ for the case when the download URL style does not match the
+ above common case. For example, if permanent download URL is a
+ redirector to the real download URL, or the download file name
+ is offered by an HTTP Content-Disposition header. In the
+ following example, <filename>foo-1.0.0.tar.gz</filename> will be
+ created instead of the default
+ <filename>v1.0.0.tar.gz</filename>.</para>
<programlisting>
+DISTNAME= foo-1.0.0
MASTER_SITES= -http://www.example.com/archive/v1.0.0
</programlisting>
diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk
index 9910a4e50e1..6fc03361ce1 100644
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,10 +1,10 @@
-# $NetBSD: sites.mk,v 1.105 2014/05/19 13:52:33 obache Exp $
+# $NetBSD: sites.mk,v 1.106 2014/05/19 14:02:52 wiz Exp $
#
# This Makefile fragment defines read-only MASTER_SITE_* variables
# representing some well-known master distribution sites for software.
#
-# When variables are added/removed, pkgsrc guid (build.xml) also
-# should be updated.
+# When variables are added or removed, the pkgsrc guide (build.xml)
+# should also be updated.
MASTER_SITE_XCONTRIB+= \
ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \