diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-14 10:15:04 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-05-14 10:15:04 +0000 |
| commit | 60d1a83c2a113150cedbc43ff12a7375144f741a (patch) | |
| tree | 627649ff7699a289d5d78c11bf8d105881402ca8 /www | |
| parent | Update MASTER_SITES (diff) | |
MASTER_SITES cleanup.
- Replace ${MASTER_SITE_FOO} with FOO.
- Merge MASTER_SITE_SUBDIR into MASTER_SITES when possible. (This means 99.9%
of the time.)
- Remove occurrences of MASTER_SITE_LOCAL when no subdirectory was present and
no hint of what it should be was present.
- Fix some logic.
- And generally, make things more simple and easy to understand.
While there, add magic values to the FESTIVAL, GENTOO, GIMP, GNUPG, QT and
SAMBA macros.
Also, replace some EXTRACT_SUFX occurences with USES=tar:*.
Checked by: make fetch-urlall-list
With hat: portmgr
Sponsored by: Absolight
Notes
Notes:
svn path=/head/; revision=386312
Diffstat (limited to 'www')
131 files changed, 130 insertions, 243 deletions
diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 93bd486343cb..a7e54b4ac81e 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -4,7 +4,7 @@ PORTNAME= apache22 PORTVERSION= 2.2.29 PORTREVISION?= 2 CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache22 diff --git a/www/apache24/Makefile b/www/apache24/Makefile index 24628a65f1cb..a3dee05da099 100644 --- a/www/apache24/Makefile +++ b/www/apache24/Makefile @@ -3,7 +3,7 @@ PORTNAME= apache24 PORTVERSION= 2.4.12 CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache24 diff --git a/www/axis/Makefile b/www/axis/Makefile index e814bb6092ac..cdd928048055 100644 --- a/www/axis/Makefile +++ b/www/axis/Makefile @@ -2,12 +2,11 @@ # $FreeBSD$ PORTNAME= axis -PORTVERSION= 1.4 +DISTVERSION= 1_4 PORTREVISION= 6 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= ws/axis/${PORTVERSION:S,.,_,g} -DISTNAME= axis-bin-${PORTVERSION:S,.,_,g} +MASTER_SITES= APACHE/ws/axis/${DISTVERSION} +DISTNAME= axis-bin-${DISTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Java SOAP implementation by Apache @@ -39,7 +38,7 @@ JAVA_VERSION= 1.6+ USER= www GROUP= www -WRKSRC= ${WRKDIR}/axis-${PORTVERSION:S,.,_,g} +WRKSRC= ${WRKDIR}/axis-${DISTVERSION} PORTDOCS= * PORTEXAMPLES= * diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile index 0419226139a3..ec1f0334a0cd 100644 --- a/www/bozohttpd/Makefile +++ b/www/bozohttpd/Makefile @@ -5,7 +5,7 @@ PORTNAME= bozohttpd PORTVERSION= 20130711 CATEGORIES= www ipv6 MASTER_SITES= http://www.eterna.com.au/bozohttpd/ \ - ${MASTER_SITE_NETBSD} + NETBSD MAINTAINER= jmohacsi@bsd.hu COMMENT= The bozotic HTTP server diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile index ff90c8e5f90b..dccfd95be5ce 100644 --- a/www/cgi-lib.pl/Makefile +++ b/www/cgi-lib.pl/Makefile @@ -5,8 +5,7 @@ PORTNAME= cgi-lib_pl PORTVERSION= 2.18 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= sada +MASTER_SITES= LOCAL/sada DISTNAME= cgi-lib.pl-${PORTVERSION} EXTRACT_SUFX= .gz diff --git a/www/cgi-lib/Makefile b/www/cgi-lib/Makefile index bfe637fb1331..f7e830a7d2aa 100644 --- a/www/cgi-lib/Makefile +++ b/www/cgi-lib/Makefile @@ -5,8 +5,7 @@ PORTNAME= cgi-lib PORTVERSION= 1.4 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= alex +MASTER_SITES= LOCAL/alex MAINTAINER= gonza@techline.ru COMMENT= ANSI C Library for CGI Programming diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 56ffdd454cd6..d6d047f4738b 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -4,8 +4,7 @@ PORTNAME= cocoon PORTVERSION= 2.1.11 PORTREVISION= 1 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= APACHE/${PORTNAME} DISTNAME= ${PDISTNAME}-src MAINTAINER= ports@FreeBSD.org diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile index deb4c9d2ec3f..5832c0a73111 100644 --- a/www/demoroniser/Makefile +++ b/www/demoroniser/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 1.0.20030916 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.fourmilab.ch/webtools/demoroniser/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR=jedgar + LOCAL/jedgar DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org diff --git a/www/diamanda/Makefile b/www/diamanda/Makefile index 5d7fef94d30c..058100f6e26a 100644 --- a/www/diamanda/Makefile +++ b/www/diamanda/Makefile @@ -5,7 +5,7 @@ PORTNAME= diamanda PORTVERSION= 0.0.${SNAPSHOT:S/.//g} PORTREVISION= 3 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}-${SNAPSHOT} MAINTAINER= ports@FreeBSD.org diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index 684ca208980a..e7dc9b9dc491 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -5,9 +5,7 @@ PORTNAME= dillo PORTVERSION= 3.0.4.1 CATEGORIES= www ipv6 MASTER_SITES= http://www.dillo.org/download/ LOCAL/bf/dillo/ \ - TEX_CTAN:hyphen -MASTER_SITE_SUBDIR= \ - language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen + TEX_CTAN/language/hyph-utf8/tex/generic/hyph-utf8/patterns/txt/:hyphen DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 2a340cb166bb..0260d24e4ea1 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -5,8 +5,7 @@ PORTNAME= emacs-w3m PORTVERSION= 1.4.538.b.${SNAPDATE} PORTREVISION= 1 CATEGORIES= www elisp -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= nobutaka +MASTER_SITES= LOCAL/nobutaka PKGNAMESUFFIX= -${EMACS_PORT_NAME} DISTNAME= ${PORTNAME}-1.4.538-${SNAPDATE} diff --git a/www/eventum/Makefile b/www/eventum/Makefile index a57f76928521..f96f4833ef7d 100644 --- a/www/eventum/Makefile +++ b/www/eventum/Makefile @@ -5,8 +5,7 @@ PORTNAME= eventum PORTVERSION= 2.2 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MYSQL} -MASTER_SITE_SUBDIR= eventum +MASTER_SITES= MYSQL/eventum MAINTAINER= ports@FreeBSD.org COMMENT= Eventum issue tracking system diff --git a/www/feedonfeeds/Makefile b/www/feedonfeeds/Makefile index 8e6e2267c3b3..e24f10071bfb 100644 --- a/www/feedonfeeds/Makefile +++ b/www/feedonfeeds/Makefile @@ -4,7 +4,7 @@ PORTNAME= feedonfeeds PORTVERSION= 0.5 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE EXTRACT_SUFX= .tgz MAINTAINER= wtp@bsdserwis.com diff --git a/www/free-sa-devel/Makefile b/www/free-sa-devel/Makefile index 5f640e496e59..23aa839372d6 100644 --- a/www/free-sa-devel/Makefile +++ b/www/free-sa-devel/Makefile @@ -4,8 +4,7 @@ PORTNAME= free-sa PORTVERSION= 2.0.0b6.7 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR= free-sa/free-sa-dev/2.0.0b6p7 +MASTER_SITES= SF/free-sa/free-sa-dev/2.0.0b6p7 PKGNAMESUFFIX= -devel DISTNAME= free-sa-2.0.0b6p7 diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile index e80c39e2ddf6..4b45947a64a9 100644 --- a/www/fswiki/Makefile +++ b/www/fswiki/Makefile @@ -4,8 +4,7 @@ PORTNAME= fswiki PORTVERSION= 3.6.2 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= fswiki/20797 +MASTER_SITES= SFJP/fswiki/20797 DISTNAME= wiki${PORTVERSION:S|.|_|g} MAINTAINER= kuriyama@FreeBSD.org diff --git a/www/fusionpbx/Makefile b/www/fusionpbx/Makefile index eb6059767a1a..17645dc4580b 100644 --- a/www/fusionpbx/Makefile +++ b/www/fusionpbx/Makefile @@ -6,7 +6,7 @@ DISTVERSION= 3.3 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://www.fusionpbx.com/downloads/ \ - ${MASTER_SITE_GOOGLE_CODE} + GOOGLE_CODE MAINTAINER= ports@FreeBSD.org COMMENT= PHP5 Graphical User Interface for FreeSwitch diff --git a/www/gaeo/Makefile b/www/gaeo/Makefile index f547a1e5fd8a..1237e7d13aee 100644 --- a/www/gaeo/Makefile +++ b/www/gaeo/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.3 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE MAINTAINER= ports@FreeBSD.org COMMENT= Open-source web framework running on Google App Engine diff --git a/www/geronimo/Makefile b/www/geronimo/Makefile index 60556d03b149..86957af36276 100644 --- a/www/geronimo/Makefile +++ b/www/geronimo/Makefile @@ -5,8 +5,7 @@ PORTNAME= geronimo DISTVERSION= 3.0-beta-1 PORTREVISION= 1 CATEGORIES= www devel java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= geronimo/${DISTVERSION} +MASTER_SITES= APACHE/geronimo/${DISTVERSION} DISTNAME= ${PORTNAME}-${WEBSERVER}-javaee6-${DISTVERSION}-bin MAINTAINER= ports@FreeBSD.org diff --git a/www/grr/Makefile b/www/grr/Makefile index 05af2f0e07f8..83470dc6c894 100644 --- a/www/grr/Makefile +++ b/www/grr/Makefile @@ -4,8 +4,7 @@ PORTNAME= grr PORTVERSION= 1.0 PORTREVISION= 2 CATEGORIES= www gnustep -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= gap +MASTER_SITES= SAVANNAH/gap DISTNAME= Grr-${PORTVERSION} MAINTAINER= ports@FreeBSD.org diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile index 53479463a151..4f6ef4fd50ab 100644 --- a/www/gtkhtml3/Makefile +++ b/www/gtkhtml3/Makefile @@ -6,8 +6,7 @@ PORTNAME= gtkhtml3 PORTVERSION= 3.32.1 PORTREVISION= 4 CATEGORIES= www gnome -MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +MASTER_SITES= GNOME/sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= ${PORTNAME:S/3$//}-${PORTVERSION} DIST_SUBDIR= gnome2 diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile index e34e9c4e352c..f4593bb56c82 100644 --- a/www/guile-www/Makefile +++ b/www/guile-www/Makefile @@ -5,8 +5,7 @@ PORTNAME= guile-www PORTVERSION= 1.1.1 PORTREVISION= 2 CATEGORIES= www devel scheme -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= guile +MASTER_SITES= GNU/guile MAINTAINER= ports@FreeBSD.org COMMENT= Guile modules for WWW interaction diff --git a/www/gurlchecker/Makefile b/www/gurlchecker/Makefile index 01ccf992cd42..528ada29f2be 100644 --- a/www/gurlchecker/Makefile +++ b/www/gurlchecker/Makefile @@ -5,8 +5,7 @@ PORTNAME= gurlchecker PORTVERSION= 0.10.1 PORTREVISION= 22 CATEGORIES= www gnome -MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/%SUBDIR%/ -MASTER_SITE_SUBDIR= 547 +MASTER_SITES= http://labs.libre-entreprise.org/frs/download.php/547/ MAINTAINER= ports@FreeBSD.org COMMENT= Gnome program to check a page/website for broken links diff --git a/www/htdigest/Makefile b/www/htdigest/Makefile index bf9da723b6a3..cda470481f3d 100644 --- a/www/htdigest/Makefile +++ b/www/htdigest/Makefile @@ -4,7 +4,7 @@ PORTNAME= htdigest PORTVERSION= 2.4.6 PORTREVISION= 1 CATEGORIES= www ipv6 -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-${PORTVERSION} DIST_SUBDIR= apache24 diff --git a/www/html2hdml/Makefile b/www/html2hdml/Makefile index a2dc04a77887..ab277aba1285 100644 --- a/www/html2hdml/Makefile +++ b/www/html2hdml/Makefile @@ -4,8 +4,7 @@ PORTNAME= html2hdml PORTVERSION= 1.0.5 CATEGORIES= www textproc -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= html2hdml/6351 +MASTER_SITES= SFJP/html2hdml/6351 MAINTAINER= ports@FreeBSD.org COMMENT= I-mode HTML to EZweb HDML converter diff --git a/www/httpasyncclient/Makefile b/www/httpasyncclient/Makefile index 27b0e0af23c5..f37ed63f1142 100644 --- a/www/httpasyncclient/Makefile +++ b/www/httpasyncclient/Makefile @@ -4,8 +4,7 @@ PORTNAME= httpasyncclient DISTVERSION= 4.0.2 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary +MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary DISTNAME= httpcomponents-asyncclient-${DISTVERSION}-bin MAINTAINER= ale@FreeBSD.org diff --git a/www/httpclient/Makefile b/www/httpclient/Makefile index 1703ee926f11..eaf856d26816 100644 --- a/www/httpclient/Makefile +++ b/www/httpclient/Makefile @@ -4,8 +4,7 @@ PORTNAME= httpclient DISTVERSION= 4.3.6 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary +MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary DISTNAME= httpcomponents-client-${DISTVERSION}-bin MAINTAINER= ale@FreeBSD.org diff --git a/www/httpcore/Makefile b/www/httpcore/Makefile index bbb7b3e2e360..2c38cd5906a4 100644 --- a/www/httpcore/Makefile +++ b/www/httpcore/Makefile @@ -4,8 +4,7 @@ PORTNAME= httpcore DISTVERSION= 4.3.3 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= httpcomponents/${PORTNAME}/binary +MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/binary DISTNAME= httpcomponents-core-${DISTVERSION}-bin MAINTAINER= ale@FreeBSD.org diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile index 66bcd54e8746..d2d2a1efbb48 100644 --- a/www/httpsqs/Makefile +++ b/www/httpsqs/Makefile @@ -5,7 +5,7 @@ PORTNAME= httpsqs PORTVERSION= 1.7 PORTREVISION= 1 CATEGORIES= www devel -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE MAINTAINER= lichray@gmail.com COMMENT= Simple Queue Service based on HTTP GET/POST protocol diff --git a/www/ikiwiki/Makefile b/www/ikiwiki/Makefile index 1a507a330792..53d1024b59bb 100644 --- a/www/ikiwiki/Makefile +++ b/www/ikiwiki/Makefile @@ -4,7 +4,7 @@ PORTNAME= ikiwiki PORTVERSION= 3.20141016.2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} \ +MASTER_SITES= DEBIAN_POOL \ http://kitenet.net/~joey/debian/unstable/ \ LOCAL/mat/${PORTNAME} DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/www/jetty/Makefile b/www/jetty/Makefile index 4ce8e2fca1a2..ad52d8c834e6 100644 --- a/www/jetty/Makefile +++ b/www/jetty/Makefile @@ -5,8 +5,7 @@ PORTNAME= jetty PORTVERSION= 8.1.15 CATEGORIES= www java -MASTER_SITES= ${MASTER_SITE_ECLIPSE} -MASTER_SITE_SUBDIR=jetty/${PORTVERSION}.${JDVDATE}/dist +MASTER_SITES= ECLIPSE/jetty/${PORTVERSION}.${JDVDATE}/dist DISTNAME= jetty-distribution-${PORTVERSION}.${JDVDATE} MAINTAINER= olgeni@FreeBSD.org diff --git a/www/jmeter/Makefile b/www/jmeter/Makefile index 93deccaa6b1a..157effd04686 100644 --- a/www/jmeter/Makefile +++ b/www/jmeter/Makefile @@ -4,8 +4,7 @@ PORTNAME= apache-jmeter PORTVERSION= 2.11 CATEGORIES= www benchmarks java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= jmeter/binaries +MASTER_SITES= APACHE/jmeter/binaries EXTRACT_SUFX= .tgz MAINTAINER= mi@aldan.algebra.com diff --git a/www/libapreq2/Makefile b/www/libapreq2/Makefile index c4a0119f117c..9f9cd41f37e2 100644 --- a/www/libapreq2/Makefile +++ b/www/libapreq2/Makefile @@ -5,8 +5,7 @@ PORTNAME= libapreq2 PORTVERSION= 2.13 PORTREVISION= 4 CATEGORIES= www devel -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} -MASTER_SITE_SUBDIR=libapreq +MASTER_SITES= APACHE_HTTPD/libapreq MAINTAINER= apache@FreeBSD.org COMMENT= Generic Apache2 Request Library diff --git a/www/lighttpd-mod_geoip/Makefile b/www/lighttpd-mod_geoip/Makefile index d24c6c03dd63..c588802edd1d 100644 --- a/www/lighttpd-mod_geoip/Makefile +++ b/www/lighttpd-mod_geoip/Makefile @@ -17,9 +17,8 @@ MASTERDIR= ${.CURDIR}/../lighttpd DESCR= ${.CURDIR}/pkg-descr PLIST= ${.CURDIR}/pkg-plist -PATCH_SITES+= ${MASTER_SITE_LOCAL} +PATCH_SITES+= LOCAL/mm PATCHFILES+= lighttpd-1.4.26_mod_geoip.patch.gz -PATCH_SITE_SUBDIR+= mm BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= ${PORTNAME}.la diff --git a/www/lighttpd-mod_h264_streaming/Makefile b/www/lighttpd-mod_h264_streaming/Makefile index 5bc054df5c14..b915288a1234 100644 --- a/www/lighttpd-mod_h264_streaming/Makefile +++ b/www/lighttpd-mod_h264_streaming/Makefile @@ -25,9 +25,8 @@ PLIST= ${.CURDIR}/pkg-plist MANUAL_PACKAGE_BUILD= free for non-commercial use only -PATCH_SITES+= ${MASTER_SITE_LOCAL} +PATCH_SITES+= LOCAL/mm PATCHFILES+= lighttpd-1.4.26_mod_h264_streaming-2.2.9.patch.gz -PATCH_SITE_SUBDIR+= mm BUILD_WRKSRC= ${WRKSRC}/src ALL_TARGET= ${PORTNAME}.la diff --git a/www/mod_amazon_proxy/Makefile b/www/mod_amazon_proxy/Makefile index 9678a10700e4..4e92f81eac09 100644 --- a/www/mod_amazon_proxy/Makefile +++ b/www/mod_amazon_proxy/Makefile @@ -5,8 +5,7 @@ PORTNAME= mod_amazon_proxy PORTVERSION= 20100913 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= LOCAL -MASTER_SITE_SUBDIR= tota/${PORTNAME} +MASTER_SITES= LOCAL/tota/${PORTNAME} MAINTAINER= tota@FreeBSD.org COMMENT= Amazon Auth Proxy for Product Advertising API diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile index 78dca95a7c82..e27931bb7851 100644 --- a/www/mod_asn/Makefile +++ b/www/mod_asn/Makefile @@ -4,9 +4,8 @@ PORTNAME= mod_asn PORTVERSION= 1.5 PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} \ +MASTER_SITES= LOCAL/kuriyama \ http://mirrorbrain.org/files/releases/ -MASTER_SITE_SUBDIR= kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= Look up the AS and network prefix of IP address diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile index f9cb8ac79ea9..f2528e85df05 100644 --- a/www/mod_auth_tkt/Makefile +++ b/www/mod_auth_tkt/Makefile @@ -4,9 +4,8 @@ PORTNAME= mod_auth_tkt PORTVERSION= 2.1.0 PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} \ +MASTER_SITES= LOCAL/kuriyama \ http://www.openfusion.com.au/labs/dist/mod_auth_tkt/ -MASTER_SITE_SUBDIR= kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= Lightweight single-sign-on authentication module for apache diff --git a/www/mod_authn_sasl/Makefile b/www/mod_authn_sasl/Makefile index d2221687c744..835947051abb 100644 --- a/www/mod_authn_sasl/Makefile +++ b/www/mod_authn_sasl/Makefile @@ -5,8 +5,7 @@ PORTNAME= mod_authn_sasl PORTVERSION= 1.2 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR=mod-authn-sasl/mod-authn-sasl/${PORTVERSION} +MASTER_SITES= SF/mod-authn-sasl/mod-authn-sasl/${PORTVERSION} MAINTAINER= apache@FreeBSD.org COMMENT= Allows user authentication based on libsasl2 mechanisms on apache 2.2 diff --git a/www/mod_fcgid/Makefile b/www/mod_fcgid/Makefile index 977316ba2ef6..59860c0b6410 100644 --- a/www/mod_fcgid/Makefile +++ b/www/mod_fcgid/Makefile @@ -4,8 +4,7 @@ PORTNAME= mod_fcgid PORTVERSION= 2.3.9 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= APACHE_HTTPD/${PORTNAME} PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} DIST_SUBDIR= apache2 diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile index c4b71866d3b3..6470a4d6e03f 100644 --- a/www/mod_jk/Makefile +++ b/www/mod_jk/Makefile @@ -5,8 +5,7 @@ PORTNAME= mod_jk PORTVERSION= 1.2.40 PORTEPOCH?= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= tomcat/tomcat-connectors/jk/ +MASTER_SITES= APACHE/tomcat/tomcat-connectors/jk/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} DISTNAME= tomcat-connectors-${PORTVERSION}-src diff --git a/www/mod_memcache/Makefile b/www/mod_memcache/Makefile index 99b30036c4cb..764c39e58eee 100644 --- a/www/mod_memcache/Makefile +++ b/www/mod_memcache/Makefile @@ -5,7 +5,7 @@ PORTNAME= mod_memcache PORTVERSION= 0.1.0 PORTREVISION= 4 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile index 6ff000cc914b..1ddc61387ca2 100644 --- a/www/mod_perl2/Makefile +++ b/www/mod_perl2/Makefile @@ -10,8 +10,7 @@ MASTER_SITES= APACHE/perl PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 2 -PATCH_SITES= ${MASTER_SITE_LOCAL} -PATCH_SITE_SUBDIR= ohauer +PATCH_SITES= LOCAL/ohauer MAINTAINER= apache@FreeBSD.org COMMENT= Embeds a Perl interpreter in the Apache2 server diff --git a/www/mod_python33/Makefile b/www/mod_python33/Makefile index 04c989abb640..136b480deeeb 100644 --- a/www/mod_python33/Makefile +++ b/www/mod_python33/Makefile @@ -5,8 +5,7 @@ PORTNAME= mod_python PORTVERSION= 3.3.1 PORTREVISION= 7 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} -MASTER_SITE_SUBDIR= modpython +MASTER_SITES= APACHE_HTTPD/modpython PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 33 DIST_SUBDIR= apache2 diff --git a/www/mod_python35/Makefile b/www/mod_python35/Makefile index 06e6827d0364..0fcfad008c7d 100644 --- a/www/mod_python35/Makefile +++ b/www/mod_python35/Makefile @@ -7,7 +7,6 @@ PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://dist.modpython.org/dist/ \ LOCAL/ohauer -MASTER_SITE_SUBDIR= modpython PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} PKGNAMESUFFIX= 35 DIST_SUBDIR= apache2 diff --git a/www/mod_qos/Makefile b/www/mod_qos/Makefile index 190b9a6a3b55..afca39a0d229 100644 --- a/www/mod_qos/Makefile +++ b/www/mod_qos/Makefile @@ -4,8 +4,7 @@ PORTNAME= mod_qos PORTVERSION= 11.12 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR= mod-qos +MASTER_SITES= SF/mod-qos DIST_SUBDIR= apache2 MAINTAINER= fax@nohik.ee diff --git a/www/mod_remoteip/Makefile b/www/mod_remoteip/Makefile index 00e304471c7a..fe08fb63fc6f 100644 --- a/www/mod_remoteip/Makefile +++ b/www/mod_remoteip/Makefile @@ -5,7 +5,7 @@ PORTNAME= mod_remoteip PORTVERSION= 2.3.5.a PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} +MASTER_SITES= APACHE_HTTPD DISTNAME= httpd-2.3.5-alpha MAINTAINER= ports@christianserving.org diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile index fdeee2d668eb..f6854c966a58 100644 --- a/www/mod_reproxy/Makefile +++ b/www/mod_reproxy/Makefile @@ -3,8 +3,7 @@ PORTNAME= mod_reproxy PORTVERSION= 0.02.20110826 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= kuriyama +MASTER_SITES= LOCAL/kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= Apache module to support x-reproxy-url header diff --git a/www/mod_rivet/Makefile b/www/mod_rivet/Makefile index bddd976b2cfd..0484ff045ad7 100644 --- a/www/mod_rivet/Makefile +++ b/www/mod_rivet/Makefile @@ -4,8 +4,7 @@ PORTNAME= mod_rivet PORTVERSION= 2.2.2 CATEGORIES= www tcl -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= tcl/rivet +MASTER_SITES= APACHE/tcl/rivet DISTNAME= rivet-${PORTVERSION} MAINTAINER= jeff.lawson@flightaware.com diff --git a/www/mod_setenvifplus/Makefile b/www/mod_setenvifplus/Makefile index d33e951065a4..cc0954347ebc 100644 --- a/www/mod_setenvifplus/Makefile +++ b/www/mod_setenvifplus/Makefile @@ -4,8 +4,7 @@ PORTNAME= mod_setenvifplus PORTVERSION= 0.22 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR= modsetenvifplus +MASTER_SITES= SF/modsetenvifplus EXTRACT_SUFX= -src.tar.gz DIST_SUBDIR= apache2 diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile index 6f0b09fb61e0..ad7bf6ba136b 100644 --- a/www/mod_spdy/Makefile +++ b/www/mod_spdy/Makefile @@ -5,7 +5,7 @@ PORTNAME= mod_spdy PORTVERSION= 0.9.4.1 CATEGORIES= www MASTER_SITES= http://www.club.kyutech.ac.jp/~masaki/ports/:mod_spdy \ - ${MASTER_SITE_APACHE_HTTPD}:apache22 + APACHE_HTTPD:apache22 DISTFILES= mod_spdy_source_${PORTVERSION}.tar.xz:mod_spdy \ httpd-2.2.22.tar.gz:apache22 DIST_SUBDIR= ${PORTNAME} diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile index 3eb628033eb5..279a98c44d98 100644 --- a/www/mod_vhost_ldap/Makefile +++ b/www/mod_vhost_ldap/Makefile @@ -5,8 +5,7 @@ PORTNAME= mod_vhost_ldap PORTVERSION= 2.0.8 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_DEBIAN} -MASTER_SITE_SUBDIR=pool/main/m/mod-vhost-ldap +MASTER_SITES= DEBIAN/pool/main/m/mod-vhost-ldap DISTNAME= ${PORTNAME:S/_/-/g}_${PORTVERSION}.orig DIST_SUBDIR= apache2 diff --git a/www/myfaces/Makefile b/www/myfaces/Makefile index 356ce761a016..b0e6f0d37f02 100644 --- a/www/myfaces/Makefile +++ b/www/myfaces/Makefile @@ -5,8 +5,7 @@ PORTNAME= myfaces PORTVERSION= 1.1.1 PORTREVISION= 2 CATEGORIES= www devel java -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR= ${PORTNAME}/binaries +MASTER_SITES= APACHE/${PORTNAME}/binaries MAINTAINER= ports@FreeBSD.org COMMENT= Free open source JavaServer(tm) Faces implementation diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 5e43c0b243c3..188f2ee9c936 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 1.9.0 PORTREVISION= 1 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ -MASTER_SITES+= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= osa +MASTER_SITES+= LOCAL/osa PKGNAMESUFFIX= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -272,8 +271,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} NGINX_ACCESSKEY_VERSION= 2.0.3 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/} -MASTER_SITE_SUBDIR+= osa/:accesskey +MASTER_SITES+= LOCAL/osa:accesskey DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION} .endif @@ -455,8 +453,7 @@ CONFIGURE_ARGS+=--with-http_realip_module .if ${PORT_OPTIONS:MHTTP_REDIS} NGINX_REDIS_VERSION= 0.3.7 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/} -MASTER_SITE_SUBDIR+= osa/:redis +MASTER_SITES+= LOCAL/osa:redis DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION} .endif @@ -498,8 +495,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${ .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) NGINX_UPSTREAM_FAIR_VERSION= 20090923 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} -MASTER_SITE_SUBDIR+= osa/:upstreamfair +MASTER_SITES+= LOCAL/osa:upstreamfair DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} .endif diff --git a/www/nginx/Makefile b/www/nginx/Makefile index 99c63e1b5f46..6a5b8d13bb12 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -7,8 +7,7 @@ PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= http://nginx.org/download/ -MASTER_SITES+= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= osa +MASTER_SITES+= LOCAL/osa DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= osa@FreeBSD.org @@ -268,8 +267,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} NGINX_ACCESSKEY_VERSION= 2.0.3 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/} -MASTER_SITE_SUBDIR+= osa/:accesskey +MASTER_SITES+= LOCAL/osa:accesskey DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION} .endif @@ -451,8 +449,7 @@ CONFIGURE_ARGS+=--with-http_realip_module .if ${PORT_OPTIONS:MHTTP_REDIS} NGINX_REDIS_VERSION= 0.3.7 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/} -MASTER_SITE_SUBDIR+= osa/:redis +MASTER_SITES+= LOCAL/osa:redis DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION} .endif @@ -494,8 +491,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${ .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) NGINX_UPSTREAM_FAIR_VERSION= 20090923 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} -MASTER_SITE_SUBDIR+= osa/:upstreamfair +MASTER_SITES+= LOCAL/osa:upstreamfair DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} .endif diff --git a/www/p5-Apache-Clean2/Makefile b/www/p5-Apache-Clean2/Makefile index 57adac6d411d..fefc9ec01328 100644 --- a/www/p5-Apache-Clean2/Makefile +++ b/www/p5-Apache-Clean2/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 2.00 DISTVERSIONSUFFIX= _7 PORTREVISION= 3 CATEGORIES= www perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Apache/GEOFF +MASTER_SITES= CPAN/Apache/GEOFF PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile index 9941ccaedd95..c9f6aa8dcac0 100644 --- a/www/p5-Ark/Makefile +++ b/www/p5-Ark/Makefile @@ -5,8 +5,7 @@ PORTVERSION= 0.1.r1 PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= http://cloud.github.com/downloads/typester/ark-perl/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= kuriyama + LOCAL/kuriyama PKGNAMEPREFIX= p5- DISTNAME= Ark-0.001000_001 diff --git a/www/p5-CGI-Compress-Gzip/Makefile b/www/p5-CGI-Compress-Gzip/Makefile index e6f62db653b2..6fadb278d6ca 100644 --- a/www/p5-CGI-Compress-Gzip/Makefile +++ b/www/p5-CGI-Compress-Gzip/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 1.03 PORTREVISION= 3 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CGI PKGNAMEPREFIX= p5- MAINTAINER= tobez@FreeBSD.org diff --git a/www/p5-CGI-Session-ExpireSessions/Makefile b/www/p5-CGI-Session-ExpireSessions/Makefile index 002320fcfe1a..d066170e927a 100644 --- a/www/p5-CGI-Session-ExpireSessions/Makefile +++ b/www/p5-CGI-Session-ExpireSessions/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 1.12 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CGI PKGNAMEPREFIX= p5- MAINTAINER= gerard@seibercom.net diff --git a/www/p5-CSS-DOM/Makefile b/www/p5-CSS-DOM/Makefile index 5283c8f737bb..f8ba29673186 100644 --- a/www/p5-CSS-DOM/Makefile +++ b/www/p5-CSS-DOM/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.15 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= CSS PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-Catalyst-View-Jemplate/Makefile b/www/p5-Catalyst-View-Jemplate/Makefile index 081dbdc2b7ae..45e88951eb4a 100644 --- a/www/p5-Catalyst-View-Jemplate/Makefile +++ b/www/p5-Catalyst-View-Jemplate/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.06 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Catalyst PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org diff --git a/www/p5-Catalyst-View-XML-Simple/Makefile b/www/p5-Catalyst-View-XML-Simple/Makefile index 61a2156034d6..f30ea4b06722 100644 --- a/www/p5-Catalyst-View-XML-Simple/Makefile +++ b/www/p5-Catalyst-View-XML-Simple/Makefile @@ -4,8 +4,7 @@ PORTNAME= Catalyst-View-XML-Simple PORTVERSION= 0.01 PORTREVISION= 2 CATEGORIES= www perl5 -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= kuriyama +MASTER_SITES= LOCAL/kuriyama PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org diff --git a/www/p5-Data-Validate-URI/Makefile b/www/p5-Data-Validate-URI/Makefile index 7ed44a39974e..8e3c25d0631c 100644 --- a/www/p5-Data-Validate-URI/Makefile +++ b/www/p5-Data-Validate-URI/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.06 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Data PKGNAMEPREFIX= p5- MAINTAINER= freebsd-ports@t-b-o-h.net diff --git a/www/p5-HTML-FromANSI/Makefile b/www/p5-HTML-FromANSI/Makefile index 635dbbab2bda..fe8559ecbd08 100644 --- a/www/p5-HTML-FromANSI/Makefile +++ b/www/p5-HTML-FromANSI/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 2.03 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= HTML PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-HTTP-Response-Encoding/Makefile b/www/p5-HTTP-Response-Encoding/Makefile index 7cc67eb2b493..73590015fd88 100644 --- a/www/p5-HTTP-Response-Encoding/Makefile +++ b/www/p5-HTTP-Response-Encoding/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.06 PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= HTTP PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-HTTP-Server-Simple-Static/Makefile b/www/p5-HTTP-Server-Simple-Static/Makefile index 3eaa13ed2a16..552bd6823976 100644 --- a/www/p5-HTTP-Server-Simple-Static/Makefile +++ b/www/p5-HTTP-Server-Simple-Static/Makefile @@ -5,7 +5,6 @@ PORTVERSION= 0.09 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= HTTP PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org diff --git a/www/p5-LWP-UserAgent-POE/Makefile b/www/p5-LWP-UserAgent-POE/Makefile index 44f40ec7f372..17712efe87c8 100644 --- a/www/p5-LWP-UserAgent-POE/Makefile +++ b/www/p5-LWP-UserAgent-POE/Makefile @@ -5,7 +5,6 @@ PORTNAME= LWP-UserAgent-POE PORTVERSION= 0.05 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= LWP PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org diff --git a/www/p5-Net-Trac/Makefile b/www/p5-Net-Trac/Makefile index fd9d55c0677f..f59e4c2a9a73 100644 --- a/www/p5-Net-Trac/Makefile +++ b/www/p5-Net-Trac/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.16 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Net PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-PodToHTML/Makefile b/www/p5-PodToHTML/Makefile index c901dee2056b..d0c605b52cc8 100644 --- a/www/p5-PodToHTML/Makefile +++ b/www/p5-PodToHTML/Makefile @@ -5,8 +5,7 @@ PORTNAME= PodToHTML PORTVERSION= 0.08 PORTREVISION= 2 CATEGORIES= www perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Pod +MASTER_SITES= CPAN/Pod PKGNAMEPREFIX= p5- MAINTAINER= hrs@FreeBSD.org diff --git a/www/p5-Template-Plugin-FillInForm/Makefile b/www/p5-Template-Plugin-FillInForm/Makefile index 46d019165d9a..014f67ad2f11 100644 --- a/www/p5-Template-Plugin-FillInForm/Makefile +++ b/www/p5-Template-Plugin-FillInForm/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.04 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Template PKGNAMEPREFIX= p5- MAINTAINER= lth@FreeBSD.org diff --git a/www/p5-TestGen4Web-Runner/Makefile b/www/p5-TestGen4Web-Runner/Makefile index b87cefd7e6d3..f57376bfcb28 100644 --- a/www/p5-TestGen4Web-Runner/Makefile +++ b/www/p5-TestGen4Web-Runner/Makefile @@ -5,8 +5,7 @@ PORTNAME= TestGen4Web-Runner PORTVERSION= 0.11 PORTREVISION= 2 CATEGORIES= www perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= WWW/MACKERS +MASTER_SITES= CPAN/WWW/MACKERS PKGNAMEPREFIX= p5- MAINTAINER= eg@fbsd.lt diff --git a/www/p5-URI-Title/Makefile b/www/p5-URI-Title/Makefile index 12266956d99e..52a8a8b2982d 100644 --- a/www/p5-URI-Title/Makefile +++ b/www/p5-URI-Title/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 1.86 PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= URI PKGNAMEPREFIX= p5- MAINTAINER= tobez@FreeBSD.org diff --git a/www/p5-WWW-DHL/Makefile b/www/p5-WWW-DHL/Makefile index 0c3e754204b0..0fc12e3a6b0a 100644 --- a/www/p5-WWW-DHL/Makefile +++ b/www/p5-WWW-DHL/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.03 PORTREVISION= 2 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= WWW PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-WebService-Google-Sets/Makefile b/www/p5-WebService-Google-Sets/Makefile index d198a4920f30..23ed14b5f78e 100644 --- a/www/p5-WebService-Google-Sets/Makefile +++ b/www/p5-WebService-Google-Sets/Makefile @@ -6,7 +6,6 @@ PORTVERSION= 0.03 PORTREVISION= 1 CATEGORIES= www perl5 MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= WebService PKGNAMEPREFIX= p5- MAINTAINER= tobez@FreeBSD.org diff --git a/www/p5-chklinks/Makefile b/www/p5-chklinks/Makefile index 201bb63171c8..d641e9fa4d52 100644 --- a/www/p5-chklinks/Makefile +++ b/www/p5-chklinks/Makefile @@ -5,8 +5,7 @@ PORTNAME= chklinks PORTVERSION= 3.09 PORTREVISION= 1 CATEGORIES= www perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= Locale/IMACAT +MASTER_SITES= CPAN/Locale/IMACAT PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile index 0691c1f155c0..440a7ddfb232 100644 --- a/www/p5-libapreq2/Makefile +++ b/www/p5-libapreq2/Makefile @@ -4,8 +4,7 @@ PORTNAME= libapreq2 PORTVERSION= 2.13 PORTREVISION= 5 CATEGORIES= www perl5 devel -MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD} -MASTER_SITE_SUBDIR=libapreq +MASTER_SITES= APACHE_HTTPD/libapreq DISTFILE= libapreq2-${PORTVERSION} PKGNAMEPREFIX= p5- diff --git a/www/phpgroupware/Makefile b/www/phpgroupware/Makefile index 603ff63ba775..f03c35eb590d 100644 --- a/www/phpgroupware/Makefile +++ b/www/phpgroupware/Makefile @@ -3,8 +3,7 @@ PORTNAME= phpgroupware PORTVERSION= 0.9.16.017 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR= phpgroupware/phpgroupware/${PORTVERSION} +MASTER_SITES= SF/phpgroupware/phpgroupware/${PORTVERSION} MAINTAINER= olgeni@FreeBSD.org COMMENT= Web based GroupWare system diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile index 5c0f41ee1a38..ce9afba6d05c 100644 --- a/www/py-HTMLgen/Makefile +++ b/www/py-HTMLgen/Makefile @@ -4,10 +4,9 @@ PORTNAME= HTMLgen PORTVERSION= 2.2.2 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_LOCAL} \ +MASTER_SITES= LOCAL/dryice \ http://dryice.name/computer/FreeBSD/distfiles/ \ http://starship.python.net/crew/friedrich/ -MASTER_SITE_SUBDIR= dryice PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= HTMLgen diff --git a/www/py-apachelog/Makefile b/www/py-apachelog/Makefile index 8b4cede0da71..a33b701fa78a 100644 --- a/www/py-apachelog/Makefile +++ b/www/py-apachelog/Makefile @@ -5,7 +5,7 @@ PORTNAME= apachelog PORTVERSION= 1.1 PORTREVISION= 1 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ +MASTER_SITES= GOOGLE_CODE \ http://freebsd.unixfreunde.de/sources/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/py-django-app-plugins/Makefile b/www/py-django-app-plugins/Makefile index 4ccdec4f5694..8e5f9a02a5bc 100644 --- a/www/py-django-app-plugins/Makefile +++ b/www/py-django-app-plugins/Makefile @@ -5,7 +5,7 @@ PORTNAME= django-app-plugins PORTVERSION= 0.1.1 PORTREVISION= 1 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org diff --git a/www/py-django-classy-tags/Makefile b/www/py-django-classy-tags/Makefile index 5906e3b2bd2c..004a0806566c 100644 --- a/www/py-django-classy-tags/Makefile +++ b/www/py-django-classy-tags/Makefile @@ -4,8 +4,7 @@ PORTNAME= django-classy-tags PORTVERSION= 0.5.1 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_CHEESESHOP} -MASTER_SITE_SUBDIR= source/d/${PORTNAME} +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@FreeBSD.org diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile index 5bdc0e30f524..dbe044e040a8 100644 --- a/www/py-django-livesettings/Makefile +++ b/www/py-django-livesettings/Makefile @@ -4,8 +4,7 @@ PORTNAME= django-livesettings DISTVERSION= 1.4-14 CATEGORIES= www python -MASTER_SITES= CHEESESHOP -MASTER_SITE_SUBDIR= source/d/${PORTNAME} +MASTER_SITES= CHEESESHOP/source/d/${PORTNAME} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= ports@caomhin.org diff --git a/www/py-formalchemy/Makefile b/www/py-formalchemy/Makefile index 60e6243eb1a6..ab6d4207a197 100644 --- a/www/py-formalchemy/Makefile +++ b/www/py-formalchemy/Makefile @@ -5,7 +5,7 @@ PORTNAME= formalchemy PORTVERSION= 1.3.3 PORTREVISION= 2 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= FormAlchemy-${DISTVERSION} diff --git a/www/py-pywebdav/Makefile b/www/py-pywebdav/Makefile index 544c1411c432..9ae54cc5f045 100644 --- a/www/py-pywebdav/Makefile +++ b/www/py-pywebdav/Makefile @@ -5,9 +5,7 @@ PORTNAME= PyWebDAV PORTVERSION= 0.9.8 PORTREVISION= 1 CATEGORIES= www net python -MASTER_SITES= GOOGLE_CODE \ - CHEESESHOP -MASTER_SITE_SUBDIR= source/P/PyWebDAV +MASTER_SITES= GOOGLE_CODE CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wen@FreeBSD.org diff --git a/www/py-recaptcha/Makefile b/www/py-recaptcha/Makefile index ff8f7e8088f2..c119894eb21c 100644 --- a/www/py-recaptcha/Makefile +++ b/www/py-recaptcha/Makefile @@ -5,8 +5,7 @@ PORTNAME= recaptcha PORTVERSION= 1.0.6 PORTREVISION= 1 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_CHEESESHOP} -MASTER_SITE_SUBDIR= source/r/recaptcha-client +MASTER_SITES= CHEESESHOP/source/r/recaptcha-client PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= ${PORTNAME}-client-${PORTVERSION} diff --git a/www/py-utidy/Makefile b/www/py-utidy/Makefile index 87bbb276ee7c..3e58fbdfe382 100644 --- a/www/py-utidy/Makefile +++ b/www/py-utidy/Makefile @@ -5,8 +5,7 @@ PORTNAME= utidy PORTVERSION= 0.2 PORTREVISION= 1 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_BERLIOS} -MASTER_SITE_SUBDIR= utidylib +MASTER_SITES= SF/utidylib PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= uTidylib-${PORTVERSION} diff --git a/www/py-wikitools/Makefile b/www/py-wikitools/Makefile index 1851e251f138..df278fe9a89a 100644 --- a/www/py-wikitools/Makefile +++ b/www/py-wikitools/Makefile @@ -5,7 +5,7 @@ PORTNAME= wikitools PORTVERSION= 1.1.1 PORTREVISION= 1 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org diff --git a/www/py-wsgiauth/Makefile b/www/py-wsgiauth/Makefile index 1f0f24761612..cc0d2ea139ac 100644 --- a/www/py-wsgiauth/Makefile +++ b/www/py-wsgiauth/Makefile @@ -5,8 +5,7 @@ PORTNAME= wsgiauth PORTVERSION= 0.1 PORTREVISION= 1 CATEGORIES= www python -MASTER_SITES= ${MASTER_SITE_CHEESESHOP} -MASTER_SITE_SUBDIR= source/w/wsgiauth +MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= bamby@sippysoft.com diff --git a/www/pylot/Makefile b/www/pylot/Makefile index aea5cb3181f4..f4e16731b27c 100644 --- a/www/pylot/Makefile +++ b/www/pylot/Makefile @@ -5,7 +5,7 @@ PORTNAME= pylot PORTVERSION= 1.26 PORTREVISION= 5 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= nivit@FreeBSD.org diff --git a/www/sahi/Makefile b/www/sahi/Makefile index 0ad8e83e86de..83d49659cff6 100644 --- a/www/sahi/Makefile +++ b/www/sahi/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 3.5.${SAHI_BUILD} #PORTREVISION= 0 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= SF -MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/ +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-v${PORTVERSION:R:R:R:S,.,,}/${SAHI_BUILD:S,.,,g}/ DISTNAME= ${PORTNAME}_${SAHI_BUILD:S,.,,g} MAINTAINER= nivit@FreeBSD.org diff --git a/www/samidare/Makefile b/www/samidare/Makefile index 4f17c1ab60c1..c64a745a2e20 100644 --- a/www/samidare/Makefile +++ b/www/samidare/Makefile @@ -6,7 +6,7 @@ PORTVERSION= 0.7 PORTREVISION= 1 CATEGORIES= www ruby MASTER_SITES= http://www.a-k-r.org/${PORTNAME}/ \ - ${MASTER_SITE_LOCAL:S|%SUBDIR%|tota/samidare|} + LOCAL/tota/samidare MAINTAINER= tota@FreeBSD.org COMMENT= Web page update checker written in Ruby diff --git a/www/selenium/Makefile b/www/selenium/Makefile index 4efaaad3814b..ccf97943382a 100644 --- a/www/selenium/Makefile +++ b/www/selenium/Makefile @@ -4,8 +4,7 @@ PORTNAME= selenium PORTVERSION= 0.6.1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_JP} -MASTER_SITE_SUBDIR= ${PORTNAME}/17210 +MASTER_SITES= SFJP/${PORTNAME}/17210 MAINTAINER= kaworu@users.sourceforge.jp COMMENT= Selenium is web application test tool! diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile index 7aa0dcc9aeb2..d399511d546e 100644 --- a/www/sitecopy/Makefile +++ b/www/sitecopy/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 0.16.6 PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://www.manyfish.co.uk/${PORTNAME}/ \ - ${MASTER_SITE_GENTOO} -MASTER_SITE_SUBDIR= distfiles + GENTOO MAINTAINER= sitecopy@oldach.net COMMENT= Maintains remote websites, uses FTP or WebDAV to sync up w/ local copy diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile index 8aafd31f885c..f5a3746dad4a 100644 --- a/www/smb_auth/Makefile +++ b/www/smb_auth/Makefile @@ -5,8 +5,7 @@ PORTNAME= smb_auth PORTVERSION= 0.05 PORTREVISION= 5 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= dinoex +MASTER_SITES= LOCAL/dinoex MAINTAINER= dinoex@FreeBSD.org COMMENT= Proxy authentication module against an SMB server diff --git a/www/squid/Makefile b/www/squid/Makefile index 927bcb151dbe..3ab3debf6a11 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -9,7 +9,6 @@ MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www1.at.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www.eu.squid-cache.org/Versions/v3/${PORTVERSION:R}/ \ http://www1.jp.squid-cache.org/Versions/v3/${PORTVERSION:R}/ -MASTER_SITE_SUBDIR= squid DIST_SUBDIR= squid${PORTVERSION:R} PATCH_SITES= http://www.squid-cache.org/%SUBDIR%/ \ diff --git a/www/squidstats/Makefile b/www/squidstats/Makefile index e3fead732f1e..a416b1011222 100644 --- a/www/squidstats/Makefile +++ b/www/squidstats/Makefile @@ -5,7 +5,7 @@ PORTNAME= squidstats PORTVERSION= 54 PORTREVISION= 3 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} +MASTER_SITES= GOOGLE_CODE DISTNAME= squidstats-r${PORTVERSION} MAINTAINER= ports@FreeBSD.org diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile index d4970312f477..ec7579a24f06 100644 --- a/www/tclhttpd/Makefile +++ b/www/tclhttpd/Makefile @@ -5,8 +5,7 @@ PORTNAME= tclhttpd PORTVERSION= 3.5.1 PORTREVISION= 3 CATEGORIES= www tcl -MASTER_SITES= ${MASTER_SITE_TCLTK} -MASTER_SITE_SUBDIR= httpd +MASTER_SITES= TCLTK/httpd DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= mi@aldan.algebra.com diff --git a/www/tengine/Makefile b/www/tengine/Makefile index e16cceb46f52..d1ed2c6f796e 100644 --- a/www/tengine/Makefile +++ b/www/tengine/Makefile @@ -272,8 +272,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/giom-nginx_accept_language_module-${GIT_A .if ${PORT_OPTIONS:MHTTP_ACCESSKEY} NGINX_ACCESSKEY_VERSION= 2.0.3 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:accesskey/} -MASTER_SITE_SUBDIR+= osa/:accesskey +MASTER_SITES+= LOCAL/osa:accesskey DISTFILES+= nginx-accesskey-${NGINX_ACCESSKEY_VERSION}.tar.gz:accesskey CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx-accesskey-${NGINX_ACCESSKEY_VERSION} .endif @@ -363,8 +362,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/vkholodkov-nginx-eval-module-${GIT_EVAL_V .if ${PORT_OPTIONS:MHTTP_FANCYINDEX} NGINX_FANCYINDEX_VERSION= 0.3.1 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:fancyindex/} -MASTER_SITE_SUBDIR+= osa/:fancyindex +MASTER_SITES+= LOCAL/osa:fancyindex DISTFILES+= ngx-fancyindex-${NGINX_FANCYINDEX_VERSION}.tar.gz:fancyindex CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx-fancyindex-${NGINX_FANCYINDEX_VERSION} .endif @@ -415,8 +413,7 @@ CONFIGURE_ARGS+=--with-http_realip_module .if ${PORT_OPTIONS:MHTTP_REDIS} NGINX_REDIS_VERSION= 0.3.7 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:redis/} -MASTER_SITE_SUBDIR+= osa/:redis +MASTER_SITES+= LOCAL/osa:redis DISTFILES+= ngx_http_redis-${NGINX_REDIS_VERSION}.tar.gz:redis CONFIGURE_ARGS+=--add-module=${WRKDIR}/ngx_http_redis-${NGINX_REDIS_VERSION} .endif @@ -449,8 +446,7 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/masterzen-nginx-upload-progress-module-${ .if !empty(PORT_OPTIONS:MHTTP_UPSTREAM_FAIR) || !empty(PORT_OPTIONS:MSUPERVISORD) NGINX_UPSTREAM_FAIR_VERSION= 20090923 -MASTER_SITES+= ${MASTER_SITE_LOCAL:S/$/:upstreamfair/} -MASTER_SITE_SUBDIR+= osa/:upstreamfair +MASTER_SITES+= LOCAL/osa:upstreamfair DISTFILES+= nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION}.tar.gz:upstreamfair CONFIGURE_ARGS+=--add-module=${WRKDIR}/nginx_upstream_fair-${NGINX_UPSTREAM_FAIR_VERSION} .endif diff --git a/www/testlink/Makefile b/www/testlink/Makefile index 99a63372cf01..24b442554d31 100644 --- a/www/testlink/Makefile +++ b/www/testlink/Makefile @@ -4,8 +4,7 @@ PORTNAME= testlink PORTVERSION= 1.9.13 CATEGORIES= www devel -MASTER_SITES= SF -MASTER_SITE_SUBDIR= ${PORTNAME}/TestLink%201.9/TestLink%20${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/TestLink%201.9/TestLink%20${PORTVERSION} MAINTAINER= tota@FreeBSD.org COMMENT= Web based test management and test execution system diff --git a/www/thundercache/Makefile b/www/thundercache/Makefile index e871da0d935b..6ad814a2d686 100644 --- a/www/thundercache/Makefile +++ b/www/thundercache/Makefile @@ -8,7 +8,7 @@ MASTER_SITES= http://www.thundercache.com.br/dist/ \ http://www.bmsoftware.org/packs/ \ http://www8.freebsdbrasil.com.br/~eksffa/thunder/ \ http://www6.freebsdbrasil.com.br/~eksffa/l/dev/thunder/ \ - ${MASTER_SITE_LOCAL}/jmelo + LOCAL/jmelo DISTNAME= thundercache-6.1.201104260900-${BITS}-fbsd MAINTAINER= eksffa@freebsdbrasil.com.br diff --git a/www/thundersnarf/Makefile b/www/thundersnarf/Makefile index 6d66989f2d96..60caa40c8f08 100644 --- a/www/thundersnarf/Makefile +++ b/www/thundersnarf/Makefile @@ -6,7 +6,7 @@ PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://www.tracanelli.com.br/l/dev/thunder/ \ - ${MASTER_SITE_LOCAL}/jmelo + LOCAL/jmelo MAINTAINER= eksffa@freebsdbrasil.com.br COMMENT= Web reporting and trending analysis for Thunder Cache Pro diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index 20bac1e841fc..9f2a53eb7f44 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -5,11 +5,10 @@ PORTNAME?= tidy DISTVERSION= 090315-cvs PORTREVISION= 2 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} +MASTER_SITES= LOCAL/thierry #MASTER_SITES= http://tidy.sourceforge.net/src/%SUBDIR%/ \ # http://tidy.sourceforge.net/docs/:docs #MASTER_SITE_SUBDIR= . old -MASTER_SITE_SUBDIR= thierry PKGNAMESUFFIX?= -devel MAINTAINER?= thierry@FreeBSD.org diff --git a/www/tinytinyhttpd/Makefile b/www/tinytinyhttpd/Makefile index 8df84b68129e..02de8a4ae4d7 100644 --- a/www/tinytinyhttpd/Makefile +++ b/www/tinytinyhttpd/Makefile @@ -4,8 +4,7 @@ PORTNAME= tinytinyhttpd PORTVERSION= 0.0.11 CATEGORIES= www -MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/ \ - ${MASTER_SITE_LOCAL} +MASTER_SITES= http://cloud.github.com/downloads/mattn/tinytinyhttpd/ MAINTAINER= smatsui@karashi.org COMMENT= Tiny tiny httpd diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile index c3841c02a57d..fdc61801b373 100644 --- a/www/trac-accountmanager/Makefile +++ b/www/trac-accountmanager/Makefile @@ -5,9 +5,8 @@ PORTVERSION= 0.5.${REV} PORTEPOCH= 1 PORTREVISION= 1 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} \ +MASTER_SITES= LOCAL/kuriyama \ http://trac-hacks.org/changeset/${REV}/accountmanagerplugin/trunk?old_path=/&format=zip&filename= -MASTER_SITE_SUBDIR= kuriyama PKGNAMEPREFIX= trac- DIST_SUBDIR= trac diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile index 588f7c1b65ea..aac116abb918 100644 --- a/www/trac-discussion/Makefile +++ b/www/trac-discussion/Makefile @@ -4,8 +4,7 @@ PORTNAME= discussion PORTVERSION= 0.7 PORTREVISION= 2 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile index 68971deff761..dea5b843cb17 100644 --- a/www/trac-downloads/Makefile +++ b/www/trac-downloads/Makefile @@ -4,8 +4,7 @@ PORTNAME= downloads PORTVERSION= ${TRAC_VERSION}.${PLUGIN_VERSION}.${SVN_REV} PORTREVISION= 2 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile index 7982019b1505..76ad3bfea250 100644 --- a/www/trac-fivestarvote/Makefile +++ b/www/trac-fivestarvote/Makefile @@ -4,8 +4,7 @@ PORTNAME= fivestarvote PORTVERSION= 0.1 PORTREVISION= 4 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile index 40ffb3f2af8e..68f0492709df 100644 --- a/www/trac-fullblog/Makefile +++ b/www/trac-fullblog/Makefile @@ -4,8 +4,7 @@ PORTNAME= fullblog PORTVERSION= 0.1.1 PORTREVISION= 2 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile index bbf899ef2982..b17b840d8f01 100644 --- a/www/trac-fullblognotification/Makefile +++ b/www/trac-fullblognotification/Makefile @@ -4,8 +4,7 @@ PORTNAME= fullblognotification PORTVERSION= 0.2.1 PORTREVISION= 2 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} DIST_SUBDIR= trac diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile index 7cc97139fafb..f23245531e4d 100644 --- a/www/trac-graphviz/Makefile +++ b/www/trac-graphviz/Makefile @@ -4,8 +4,7 @@ PORTNAME= ${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl} PORTVERSION= 0.7.4 PORTREVISION= 7 CATEGORIES= www devel graphics python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile index 60427367c7bc..2cc604d193f1 100644 --- a/www/trac-math/Makefile +++ b/www/trac-math/Makefile @@ -4,8 +4,7 @@ PORTNAME= math PORTVERSION= 0.1 PORTREVISION= 7 CATEGORIES= www math python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile index b5852dff490f..9f79b15b4f9a 100644 --- a/www/trac-navadd/Makefile +++ b/www/trac-navadd/Makefile @@ -4,8 +4,7 @@ PORTNAME= navadd PORTVERSION= 0.1 PORTREVISION= 4 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile index 37b6737a9da2..842e4ec942fa 100644 --- a/www/trac-pydotorgtheme/Makefile +++ b/www/trac-pydotorgtheme/Makefile @@ -4,8 +4,7 @@ PORTNAME= pydotorgtheme PORTVERSION= 2.0 PORTREVISION= 4 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile index b2717643a8df..e862f4d90255 100644 --- a/www/trac-tags/Makefile +++ b/www/trac-tags/Makefile @@ -5,8 +5,7 @@ PORTNAME= tags DISTVERSION= 0.7.r${SVN_REV} PORTREVISION= 2 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DIST_SUBDIR= trac diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile index 0b2cfd133971..4945535739d8 100644 --- a/www/trac-ticketimport/Makefile +++ b/www/trac-ticketimport/Makefile @@ -4,8 +4,7 @@ PORTNAME= ticketimport PORTVERSION= 0.7c PORTREVISION= 3 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile index adee47a7c49c..89f51183e055 100644 --- a/www/trac-vote/Makefile +++ b/www/trac-vote/Makefile @@ -4,8 +4,7 @@ PORTNAME= vote PORTVERSION= 0.1.2 PORTREVISION= 3 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- MAINTAINER= ports@FreeBSD.org diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile index c10c54c71b46..8c639cee9bcf 100644 --- a/www/trac-wikitopdf/Makefile +++ b/www/trac-wikitopdf/Makefile @@ -4,8 +4,7 @@ PORTNAME= wikitopdf PORTVERSION= 2.2.2 PORTREVISION= 6 CATEGORIES= www devel python -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= brooks +MASTER_SITES= LOCAL/brooks PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} diff --git a/www/twiki-BugzillaLinkPlugin/Makefile b/www/twiki-BugzillaLinkPlugin/Makefile index ffe8a85697cd..e12cbc6a1d31 100644 --- a/www/twiki-BugzillaLinkPlugin/Makefile +++ b/www/twiki-BugzillaLinkPlugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= BugzillaLinkPlugin SVNREV= 15560 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= Link to Bugzilla bugs using shorthand references diff --git a/www/twiki-GluePlugin/Makefile b/www/twiki-GluePlugin/Makefile index 1af1095b17df..a7cc58dbfe37 100644 --- a/www/twiki-GluePlugin/Makefile +++ b/www/twiki-GluePlugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= GluePlugin SVNREV= 15708 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= Allow to format tags and arguments on multiple lines diff --git a/www/twiki-LdapContrib/Makefile b/www/twiki-LdapContrib/Makefile index 3aa3f2c63828..0fbab84d3bdc 100644 --- a/www/twiki-LdapContrib/Makefile +++ b/www/twiki-LdapContrib/Makefile @@ -5,7 +5,7 @@ PORTNAME= LdapContrib SVNREV= 16840 PORTREVISION= 1 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= LDAP services for TWiki diff --git a/www/twiki-LdapNgPlugin/Makefile b/www/twiki-LdapNgPlugin/Makefile index a2d4288d4d56..5a6c1b98d03c 100644 --- a/www/twiki-LdapNgPlugin/Makefile +++ b/www/twiki-LdapNgPlugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= LdapNgPlugin SVNREV= 15577 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= Query and display data from an LDAP directory diff --git a/www/twiki-MathModePlugin/Makefile b/www/twiki-MathModePlugin/Makefile index 041bfa8415ac..5f4c9c3e5ff9 100644 --- a/www/twiki-MathModePlugin/Makefile +++ b/www/twiki-MathModePlugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= MathModePlugin SVNREV= 15934 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= Include LaTeX formatted math in your TWiki pages diff --git a/www/twiki-NewUserPlugin/Makefile b/www/twiki-NewUserPlugin/Makefile index 91402ad1dd57..27d2dbab9f18 100644 --- a/www/twiki-NewUserPlugin/Makefile +++ b/www/twiki-NewUserPlugin/Makefile @@ -4,7 +4,7 @@ PORTNAME= NewUserPlugin SVNREV= 17515 MASTER_SITES= http://protey.ru/freebsd/distfiles/ \ - ${MASTER_SITE_LOCAL:S!$!skv/!} + LOCAL/skv COMMENT= Create user's topic for externally authenticated users diff --git a/www/uwsgitop/Makefile b/www/uwsgitop/Makefile index 96ceee83961e..f382792ea702 100644 --- a/www/uwsgitop/Makefile +++ b/www/uwsgitop/Makefile @@ -4,8 +4,7 @@ PORTNAME= uwsgitop PORTVERSION= 0.8 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_CHEESESHOP} -MASTER_SITE_SUBDIR=source/u/${PORTNAME} +MASTER_SITES= CHEESESHOP MAINTAINER= demon@FreeBSD.org COMMENT= uWSGI top-like app diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile index eeea1961dc1f..d123c602c9bf 100644 --- a/www/webcopy/Makefile +++ b/www/webcopy/Makefile @@ -4,8 +4,7 @@ PORTNAME= webcopy PORTVERSION= 0.98b7 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= cy +MASTER_SITES= LOCAL/cy MAINTAINER= cy@FreeBSD.org COMMENT= Web Mirroring Program diff --git a/www/webcrawl/Makefile b/www/webcrawl/Makefile index 2c6b08af1e80..5361b5e07dd8 100644 --- a/www/webcrawl/Makefile +++ b/www/webcrawl/Makefile @@ -5,8 +5,7 @@ PORTNAME= webcrawl PORTVERSION= 1.10 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_SUNSITE} -MASTER_SITE_SUBDIR= apps/www/mirroring +MASTER_SITES= SUNSITE/apps/www/mirroring MAINTAINER= demon@FreeBSD.org COMMENT= Download web sites without user interaction by following links diff --git a/www/websh/Makefile b/www/websh/Makefile index 1d9cebd3813d..36f4b2b7fc72 100644 --- a/www/websh/Makefile +++ b/www/websh/Makefile @@ -5,8 +5,7 @@ PORTNAME= websh PORTVERSION= 3.6.0b5 PORTREVISION= 4 CATEGORIES= www tcl -MASTER_SITES= ${MASTER_SITE_APACHE} -MASTER_SITE_SUBDIR=tcl/${PORTNAME}/source +MASTER_SITES= APACHE/tcl/${PORTNAME}/source EXTRACT_SUFX= -src.tar.gz MAINTAINER= mi@aldan.algebra.com diff --git a/www/wml/Makefile b/www/wml/Makefile index 2c7934122062..6a2283be973e 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -6,8 +6,7 @@ PORTVERSION= 2.0.12 PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= www lang -MASTER_SITES= ${MASTER_SITE_BERLIOS} -MASTER_SITE_SUBDIR=thewml +MASTER_SITES= SF/thewml MAINTAINER= rodrigo@FreeBSD.org COMMENT= Website META Language, webdesign toolkit for HTML generation diff --git a/www/xpi-adblock/Makefile.xpi b/www/xpi-adblock/Makefile.xpi index 623391664664..ef813068251e 100644 --- a/www/xpi-adblock/Makefile.xpi +++ b/www/xpi-adblock/Makefile.xpi @@ -61,11 +61,11 @@ MASTER_SITE_MOZILLA_ADDONS= http://addons.cdn.mozilla.net/user-media/%SUBDIR%/ .ifndef MASTER_SITES -MASTER_SITES?= MOZILLA_ADDONS .ifdef XPI_NUM -MASTER_SITE_SUBDIR?= addons/${XPI_NUM} +MASTER_SITES?= MOZILLA_ADDONS/addons/${XPI_NUM} +.else +MASTER_SITES?= MOZILLA_ADDONS/extensions/${XPI_DISTNAME} .endif -MASTER_SITE_SUBDIR?= extensions/${XPI_DISTNAME} .endif PKGNAMEPREFIX?= xpi- EXTRACT_SUFX?= .xpi diff --git a/www/xpi-conkeror/Makefile b/www/xpi-conkeror/Makefile index a988f6d86416..6193adde17c7 100644 --- a/www/xpi-conkeror/Makefile +++ b/www/xpi-conkeror/Makefile @@ -4,9 +4,8 @@ PORTNAME= conkeror PORTVERSION= 20140911 CATEGORIES= www -MASTER_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= ashish +MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \ + LOCAL/ashish MAINTAINER= ashish@FreeBSD.org COMMENT= Keyboard-oriented, customizable web browser based on Mozilla XULRunner diff --git a/www/xpi-delicious/Makefile b/www/xpi-delicious/Makefile index 1563ad241217..19dd4f67289f 100644 --- a/www/xpi-delicious/Makefile +++ b/www/xpi-delicious/Makefile @@ -4,8 +4,7 @@ PORTNAME= delicious PORTVERSION= 1.3 CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZDEV} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= MOZDEV/${PORTNAME} MAINTAINER= lapo@lapo.it COMMENT= Extension to ease the use of del.icio.us remote bookmarks diff --git a/www/xpi-downthemall/Makefile b/www/xpi-downthemall/Makefile index b7fe754c08b1..d8ec8890f90a 100644 --- a/www/xpi-downthemall/Makefile +++ b/www/xpi-downthemall/Makefile @@ -5,8 +5,7 @@ PORTNAME= downthemall PORTVERSION= 2.0.17 DISTVERSIONSUFFIX= -fx+sm CATEGORIES= www -MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= addons/201 +MASTER_SITES= MOZILLA_EXTENDED/addons/201 MAINTAINER= gecko@FreeBSD.org COMMENT= Lets you download all the links in a webpage and much more |