Author: jbeich
Date: Wed Apr 17 14:31:00 2013
New Revision: 1240

Log:
flatten MASTER_SITES path

Modified:
   trunk/devel/nspr/Makefile
   trunk/mail/linux-thunderbird/Makefile
   trunk/mail/thunderbird-i18n/Makefile
   trunk/mail/thunderbird/Makefile
   trunk/security/ca_root_nss/Makefile
   trunk/security/nss/Makefile
   trunk/www/firefox-esr-i18n/Makefile
   trunk/www/firefox-esr/Makefile
   trunk/www/firefox-i18n/Makefile
   trunk/www/firefox/Makefile
   trunk/www/libxul/Makefile
   trunk/www/libxul19/Makefile
   trunk/www/linux-firefox/Makefile
   trunk/www/linux-seamonkey/Makefile
   trunk/www/linux-seamonkey/Makefile.common
   trunk/www/seamonkey-i18n/Makefile
   trunk/www/seamonkey/Makefile

Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile   Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/devel/nspr/Makefile   Wed Apr 17 14:31:00 2013        (r1240)
@@ -8,8 +8,7 @@
 PORTNAME=      nspr
 DISTVERSION=   4.9.6
 CATEGORIES=    devel
-MASTER_SITES=  MOZILLA
-MASTER_SITE_SUBDIR=    nspr/releases/v${PORTVERSION}/src
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/v${PORTVERSION}/src
 
 MAINTAINER=    [email protected]
 COMMENT=       A platform-neutral API for system level and libc like functions

Modified: trunk/mail/linux-thunderbird/Makefile
==============================================================================
--- trunk/mail/linux-thunderbird/Makefile       Tue Apr 16 12:55:15 2013        
(r1239)
+++ trunk/mail/linux-thunderbird/Makefile       Wed Apr 17 14:31:00 2013        
(r1240)
@@ -4,7 +4,6 @@
 PORTNAME=      thunderbird
 PORTVERSION=   17.0.5
 CATEGORIES=    mail
-MASTER_SITE_SUBDIR?=   ${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 DISTNAME=      ${PORTNAME}-${DISTVERSION}esr
 
 MAINTAINER=    [email protected]

Modified: trunk/mail/thunderbird-i18n/Makefile
==============================================================================
--- trunk/mail/thunderbird-i18n/Makefile        Tue Apr 16 12:55:15 2013        
(r1239)
+++ trunk/mail/thunderbird-i18n/Makefile        Wed Apr 17 14:31:00 2013        
(r1240)
@@ -4,7 +4,7 @@
 PORTNAME=      thunderbird-i18n
 PORTVERSION=   17.0.5
 CATEGORIES=    mail
-MASTER_SITE_SUBDIR=    thunderbird/releases/${PORTVERSION}esr/linux-i686/xpi
+MASTER_SITES=  
MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=     ${THUNDERBIRD_I18N_:S/$/.xpi/}
 DIST_SUBDIR=   xpi/${DISTNAME}

Modified: trunk/mail/thunderbird/Makefile
==============================================================================
--- trunk/mail/thunderbird/Makefile     Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/mail/thunderbird/Makefile     Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,8 +4,7 @@
 PORTNAME=      thunderbird
 DISTVERSION=   17.0.5
 CATEGORIES=    mail ipv6
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    ${PORTNAME}/releases/${DISTVERSION}esr/source
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
 DISTFILES=     ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
 EXTRACT_ONLY=  ${PORTNAME}-${DISTVERSION}esr.source${EXTRACT_SUFX}
 

Modified: trunk/security/ca_root_nss/Makefile
==============================================================================
--- trunk/security/ca_root_nss/Makefile Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/security/ca_root_nss/Makefile Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,8 +4,7 @@
 PORTNAME=      ca_root_nss
 PORTVERSION=   ${VERSION_NSS}
 CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
+MASTER_SITES=  MOZILLA/security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
 DISTNAME=      nss-${VERSION_NSS}${NSS_SUFFIX}
 
 MAINTAINER=    [email protected]

Modified: trunk/security/nss/Makefile
==============================================================================
--- trunk/security/nss/Makefile Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/security/nss/Makefile Wed Apr 17 14:31:00 2013        (r1240)
@@ -5,8 +5,7 @@
 PORTVERSION=   3.14.3
 #DISTVERSIONSUFFIX=    .with.ckbi.1.93
 CATEGORIES=    security
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    security/nss/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
+MASTER_SITES=  
MOZILLA/security/${PORTNAME}/releases/${DISTNAME:U:C/[-.]/_/g}_RTM/src
 
 MAINTAINER=    [email protected]
 COMMENT=       Libraries to support development of security-enabled 
applications

Modified: trunk/www/firefox-esr-i18n/Makefile
==============================================================================
--- trunk/www/firefox-esr-i18n/Makefile Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/firefox-esr-i18n/Makefile Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,7 +4,7 @@
 PORTNAME=      firefox-i18n
 PORTVERSION=   17.0.5
 CATEGORIES=    www
-MASTER_SITE_SUBDIR=    firefox/releases/${PORTVERSION}esr/linux-i686/xpi
+MASTER_SITES=  
MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}esr/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=     ${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=   xpi/${DISTNAME}

Modified: trunk/www/firefox-esr/Makefile
==============================================================================
--- trunk/www/firefox-esr/Makefile      Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/firefox-esr/Makefile      Wed Apr 17 14:31:00 2013        (r1240)
@@ -5,8 +5,7 @@
 DISTVERSION=   17.0.5
 PORTEPOCH=     1
 CATEGORIES=    www ipv6
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    ${PORTNAME}/releases/${DISTVERSION}esr/source
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
 DISTNAME=      ${PORTNAME}-${DISTVERSION}esr.source
 
 MAINTAINER=    [email protected]

Modified: trunk/www/firefox-i18n/Makefile
==============================================================================
--- trunk/www/firefox-i18n/Makefile     Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/firefox-i18n/Makefile     Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,7 +4,7 @@
 PORTNAME=      firefox-i18n
 PORTVERSION=   20.0
 CATEGORIES=    www
-MASTER_SITE_SUBDIR=    firefox/releases/${PORTVERSION}/linux-i686/xpi
+MASTER_SITES=  
MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/linux-i686/xpi
 PKGNAMEPREFIX=
 DISTFILES=     ${FIREFOX_I18N_:S/$/.xpi/}
 DIST_SUBDIR=   xpi/${DISTNAME}

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile  Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/firefox/Makefile  Wed Apr 17 14:31:00 2013        (r1240)
@@ -5,8 +5,7 @@
 DISTVERSION=   21.0b1
 PORTEPOCH=     1
 CATEGORIES=    www ipv6
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    ${PORTNAME}/releases/${DISTVERSION}/source
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
 DISTNAME=      ${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=    [email protected]

Modified: trunk/www/libxul/Makefile
==============================================================================
--- trunk/www/libxul/Makefile   Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/libxul/Makefile   Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,8 +4,7 @@
 PORTNAME=      libxul
 DISTVERSION=   17.0.5
 CATEGORIES?=   www devel
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    firefox/releases/${DISTVERSION}esr/source
+MASTER_SITES=  MOZILLA/firefox/releases/${DISTVERSION}esr/source
 DISTNAME=      firefox-${DISTVERSION}esr.source
 
 MAINTAINER?=   [email protected]

Modified: trunk/www/libxul19/Makefile
==============================================================================
--- trunk/www/libxul19/Makefile Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/libxul19/Makefile Wed Apr 17 14:31:00 2013        (r1240)
@@ -9,8 +9,7 @@
 DISTVERSION=   1.9.2.28
 PORTREVISION=  1
 CATEGORIES?=   www devel
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    firefox/releases/3.6.28/source
+MASTER_SITES=  MOZILLA/firefox/releases/3.6.28/source
 DISTNAME=      firefox-3.6.28.source
 
 MAINTAINER?=   [email protected]

Modified: trunk/www/linux-firefox/Makefile
==============================================================================
--- trunk/www/linux-firefox/Makefile    Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/linux-firefox/Makefile    Wed Apr 17 14:31:00 2013        (r1240)
@@ -5,7 +5,6 @@
 PORTVERSION=   17.0.5
 PORTEPOCH=     1
 CATEGORIES=    www
-MASTER_SITE_SUBDIR?=   firefox/releases/${PORTVERSION}esr/linux-i686/en-US
 DISTNAME=      ${PORTNAME}-${DISTVERSION}esr
 
 MAINTAINER=    [email protected]

Modified: trunk/www/linux-seamonkey/Makefile
==============================================================================
--- trunk/www/linux-seamonkey/Makefile  Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/linux-seamonkey/Makefile  Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,7 +4,7 @@
 PORTNAME=      seamonkey
 PORTVERSION=   2.17
 CATEGORIES=    www
-MASTER_SITE_SUBDIR=    ${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/${PORTVERSION}/linux-i686/en-US
 
 MAINTAINER=    [email protected]
 COMMENT=       The open source, standards compliant web browser

Modified: trunk/www/linux-seamonkey/Makefile.common
==============================================================================
--- trunk/www/linux-seamonkey/Makefile.common   Tue Apr 16 12:55:15 2013        
(r1239)
+++ trunk/www/linux-seamonkey/Makefile.common   Wed Apr 17 14:31:00 2013        
(r1240)
@@ -6,10 +6,7 @@
 #
 
 CATEGORIES+=   linux
-.ifndef        MASTER_SITES
-MASTER_SITES=  MOZILLA
-MASTER_SITE_SUBDIR?=   ${PORTNAME}/releases/${DISTVERSION}
-.endif
+MASTER_SITES?= MOZILLA/${PORTNAME}/releases/${PORTVERSION}esr/linux-i686/en-US
 PKGNAMEPREFIX?=                linux-
 
 NO_BUILD=      yes

Modified: trunk/www/seamonkey-i18n/Makefile
==============================================================================
--- trunk/www/seamonkey-i18n/Makefile   Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/seamonkey-i18n/Makefile   Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,7 +4,7 @@
 PORTNAME=      seamonkey-i18n
 PORTVERSION=   2.17
 CATEGORIES=    www
-MASTER_SITE_SUBDIR=    seamonkey/releases/${PORTVERSION}/langpack
+MASTER_SITES=  MOZILLA/${PORTNAME:S|-i18n||}/releases/${PORTVERSION}/langpack
 PKGNAMEPREFIX=
 DISTFILES=     
${SEAMONKEY_I18N_:S/$/.langpack.xpi/:S/^/seamonkey-${PORTVERSION}./}
 DIST_SUBDIR=   xpi/${DISTNAME}

Modified: trunk/www/seamonkey/Makefile
==============================================================================
--- trunk/www/seamonkey/Makefile        Tue Apr 16 12:55:15 2013        (r1239)
+++ trunk/www/seamonkey/Makefile        Wed Apr 17 14:31:00 2013        (r1240)
@@ -4,8 +4,7 @@
 PORTNAME=      seamonkey
 DISTVERSION=   2.18b1
 CATEGORIES?=   www ipv6
-MASTER_SITES=  ${MASTER_SITE_MOZILLA}
-MASTER_SITE_SUBDIR=    ${PORTNAME}/releases/${DISTVERSION}/source
+MASTER_SITES=  MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source
 DISTFILES=     ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 EXTRACT_ONLY=  ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX}
 
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-gecko
To unsubscribe, send any mail to "[email protected]"

Reply via email to