diff --git a/en_US.ISO8859-1/books/porters-handbook/book.sgml b/en_US.ISO8859-1/books/porters-handbook/book.sgml
index 1c1dc2ed39..1c16088a35 100644
--- a/en_US.ISO8859-1/books/porters-handbook/book.sgml
+++ b/en_US.ISO8859-1/books/porters-handbook/book.sgml
@@ -2293,28 +2293,132 @@ PORTEPOCH= 1
helping this effort.
If the original tarball is part of one of the popular
- archives such as X-contrib, GNU, or Perl CPAN, you may be able
+ archives such as SourceForge, GNU, or Perl CPAN, you may be able
refer to those sites in an easy compact form using
MASTER_SITE_*
- (e.g., MASTER_SITE_XCONTRIB,
+ (e.g., MASTER_SITE_SOURCEFORGE,
MASTER_SITE_GNU and
MASTER_SITE_PERL_CPAN). Simply set
MASTER_SITES to one of these variables and
MASTER_SITE_SUBDIR to the path within the
archive. Here is an example:
- MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+ MASTER_SITES= ${MASTER_SITE_GNU}
+MASTER_SITE_SUBDIR= make
+
+ Or you can use a condensed format:
+
+ MASTER_SITES= GNU/make
These variables are defined in
/usr/ports/Mk/bsd.sites.mk. There are
new entries added all the time, so make sure to check the
latest version of this file before submitting a port.
- The user can also set the MASTER_SITE_*
- variables in /etc/make.conf to override our
- choices, and use their favorite mirrors of these popular archives
- instead.
+ Several magic macros exist for popular sites
+ with a predictable directory structure. For these, just use the
+ abbreviation and the system will try to guess the correct
+ subdirectory for you.
+
+ MASTER_SITES= SF
+
+ If the guess is incorrect, it can be overriden as follows.
+
+ MASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}
+
+
+ Popular magic <makevar>MASTER_SITES</makevar> macros
+
+
+
+
+ Macro
+
+ Assumed subdirectory
+
+
+
+
+
+ APACHE_JAKARTA
+
+ /dist/jakarta/${PORTNAME:S,-,,/,}/source
+
+
+
+ BERLIOS
+
+ /${PORTNAME:L}
+
+
+
+ CHEESESHOP
+
+ /packages/source/source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/}
+
+
+
+ DEBIAN
+
+ /debian/pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME}
+
+
+
+ GCC
+
+ /pub/gcc/releases/${DISTNAME}
+
+
+
+ GNOME
+
+ /pub/GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+
+
+ GNU
+
+ /gnu/${PORTNAME}
+
+
+
+ MOZDEV
+
+ /pub/mozdev/${PORTNAME:L}
+
+
+
+ PERL_CPAN
+
+ /pub/CPAN/modules/by-module/${PORTNAME:C/-.*//}
+
+
+
+ PYTHON
+
+ /ftp/python/${PYTHON_PORTVERSION:C/rc[0-9]//}
+
+
+
+ RUBYFORGE
+
+ /${PORTNAME:L}
+
+
+
+ SAVANNAH
+
+ /${PORTNAME:L}
+
+
+
+ SF
+
+ /project/${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
+
+
+
+