Index: en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
===================================================================
--- en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
+++ en_US.ISO8859-1/books/porters-handbook/makefiles/chapter.xml
@@ -1643,36 +1643,63 @@
set.
- If the original tarball is part of one of the popular
- archives such as SourceForge, GNU, or Perl CPAN, it may be
- possible refer to those sites in an easy compact form using
- predefined macros (for example, SF,
- GNU or CPAN).
- Set MASTER_SITES to one of these values.
- Here is an example:
+
+ Using
+ <varname>MASTER_SITE_<replaceable>*</replaceable></varname>
+ variables
+
+ Shortcut abbreviations are available for popular archives
+ like SourceForge (SF), GNU
+ (GNU), or Perl CPAN
+ (CPAN). MASTER_SITES can
+ use them directly:MASTER_SITES= GNU/make
- The older expanded format can still be used, although there
- really is no reason to do so:
+ The older expanded format still works, but all ports
+ should be converted to the compact format. The expanded
+ format looks like this:MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= make
- These values and 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.
+ These values and variables are defined in Mk/bsd.sites.mk.
+ New entries are added often, so make sure to check the latest
+ version of this file before submitting a port.
+
+
+ For any
+ MASTER_SITE_FOO
+ variable, the shorthand
+ FOO can be
+ used. For example, use:
+
+ MASTER_SITES= FOO
+
+ If MASTER_SITE_SUBDIR is needed, use
+ this:
+
+ MASTER_SITES= FOO/bar
+
+
+
+
+ Magic MASTER_SITES MacrosSeveral 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 automatically.
+ guess the correct subdirectory automatically. For a port
+ named Stardict, of version
+ 1.2.3, and hosted on SourceForge, adding
+ this line:
MASTER_SITES= SF
- If the guess is incorrect, it can be overridden as
- follows.
+ Will infer a subdirectory named
+ /project/stardict/stardict/1.2.3. If the
+ guess is incorrect, it can be overridden as follows.MASTER_SITES= SF/stardict/WyabdcRealPeopleTTS/${PORTVERSION}
@@ -1696,96 +1723,107 @@
APACHE_JAKARTA
- /dist/jakarta/${PORTNAME:S,-,,/,}/source
+ ${PORTNAME:S,-,/,}/sourceBERLIOS
- /${PORTNAME:L}
+ ${PORTNAME:tl}.berliosCHEESESHOP
- /packages/source/source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/}
+ source/${DISTNAME:C/(.).*/\1/}/${DISTNAME:C/(.*)-[0-9].*/\1/}DEBIAN
- /debian/pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME}
+ pool/main/${PORTNAME:C/^((lib)?.).*$/\1/}/${PORTNAME}GCC
- /pub/gcc/releases/${DISTNAME}
+ releases/${DISTNAME}GH
- /${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}
+ ${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${GH_TAGNAME}?dummy=/GHC
- /downloads/${GH_ACCOUNT}/${GH_PROJECT}/
+ ${GH_ACCOUNT}/${GH_PROJECT}/
+
+
+
+ GHL
+ ${GH_ACCOUNT}/${GH_PROJECT}/legacy.tar.gz/${GH_TAGNAME}?dummy=/GNOME
- /pub/GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+ sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+
+
+ GIMP
+ ${PORTNAME}/${PORTVERSION:R}/GNU
- /gnu/${PORTNAME}
+ ${PORTNAME}
- HORDE
- /pub/${PORTNAME}
+ GNU_ALPHA
+ ${PORTNAME}
- LOGILAB
- /pub/${PORTNAME}
+ HORDE
+ ${PORTNAME}
- MATE
- /releases/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+ LODEV
+ ${PORTNAME}
- MOZDEV
- /pub/mozdev/${PORTNAME:L}
+ MATE
+ ${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
- CPAN
- /pub/CPAN/modules/by-module/${PORTNAME:C/-.*//}
+ MOZDEV
+ ${PORTNAME:tl}
- PYTHON
- /ftp/python/${PYTHON_PORTVERSION:C/rc[0-9]//}
+ NL
+ ${PORTNAME}
- RUBYFORGE
- /${PORTNAME:L}
+ CPAN
+ ${PORTNAME:C/-.*//}SAVANNAH
- /${PORTNAME:L}
+ ${PORTNAME:tl}SF
- /project/${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION}
+ ${PORTNAME:tl}/${PORTNAME:tl}/${PORTVERSION}
+ <varname>USE_GITHUB</varname>