Merge remote-tracking branch 'upstream/master'

Conflicts:
	lang/python26/Makefile
	net/samba36/files/samba.in
Support staging.
Support STAGEDIR.
Support STAGEDIR.
- Support STAGEDIR
- Add LICENSE
- Support staging
- Take maintainership
- Remove regression-test:
Support staging.
- Add LICENSE
- Fix *_DEPENDS
- Bump PORTREVISION for dependency change
- Use CPAN as primary WWW
- Pass maintainership to perl
Remove expired ports:
2013-11-15 editors/xxe: XXE becomes unfetchable every 3-4 months as distfile is replaced with new version.  This high-maintenance port requires a maintainer to avoid removal.
2013-11-15 editors/xml2rfc-xxe: Depends on editors/xxe, which is due to be removed due to lack of maintainer
- Support staging
- Add LICENSE
- Fully support optionsng
Support staging.
- Convert to new options helper
- Pet portlint: use a tab (not space) after a variable name
- Mark DEPRECATED and set EXPIRATION_DATE to 2013-12-31
- Use CONFLICTS_INSTALL instead of CONFLICTS
- Remove leading indefinite article from COMMENT
- Use = instead of +=
Update to version 1.5.2.
- Add LICENSE
- Reformat pkg-descr
- Take maintainership
- Use = instead of +=
- Support staging
- Add license
- Define used DOCS option
- Fix PLIST
- Convert to new options helper
- Remove no-op WWWDOCROOT
- Bump PORTREVISION for package change

Submitted by:	sunpoet (myself)
Approved by:	kevlo (maintainer)