update default rsync paths

git-svn-id: https://svn.macports.org/repository/macports/trunk/base@151037 d073be05-634f-4543-b044-5fe20cf6d1d6

config/README.TXT

@@ -1,6 +1,6 @@
 The file RELEASE_URL in this directory is used by the rsync infrastructure
 at the MacPorts server to control the tag from which "released" code is provided,
-ultimately at rsync://rsync.macports.org/release/base/.
+ultimately at rsync://rsync.macports.org/macports/release/base/.
 
 The script handling that operation checks out from svn the code tagged by the
 contents of the RELEASE_URL file and makes that code available via rsync.

doc/macports.conf.5

@@ -444,7 +444,7 @@ lt lt.
 T{
 \fBDefault:\fR
 T}:T{
-release/base/ (which pulls sources for the currently shipping MacPorts release)
+macports/release/base/ (which pulls sources for the currently shipping MacPorts release)
 T}
 .TE
 .sp 1

doc/macports.conf.5.txt

@@ -155,7 +155,7 @@ rsync_server::
 
 rsync_dir::
     Rsync directory from which to pull MacPorts sources from the rsync server.
-    *Default:*;; release/base/ (which pulls sources for the currently shipping
+    *Default:*;; macports/release/base/ (which pulls sources for the currently shipping
     MacPorts release)
 
 rsync_options::

doc/macports.conf.in

@@ -116,7 +116,7 @@ universal_archs     	@UNIVERSAL_ARCHS@
 # and will be used to verify its integrity. See
 # https://trac.macports.org/wiki/Mirrors#MacPortsSource to find the
 # correct rsync_dir for a particular rsync_server.
-#rsync_dir           	release/tarballs/base.tar
+#rsync_dir           	macports/release/tarballs/base.tar
 
 # Options to pass to rsync when fetching MacPorts base and the ports tree.
 #rsync_options       	-rtzv --delete-after

doc/sources.conf

@@ -29,4 +29,4 @@
 # sites, etc.), the primary MacPorts source must always be tagged
 # "[default]", even if switched from the default "rsync://" URL.
 
-rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]

doc/sources.conf.5

@@ -46,12 +46,12 @@ Followed by a server name and a path on this server, this URI instructs MacPorts
 .PP
 \fBExample\fR
 .RS 4
-rsync://rsync\&.macports\&.org/release/tarballs/ports\&.tar
+rsync://rsync\&.macports\&.org/macports/release/tarballs/ports\&.tar
 .RE
 .PP
 \fBDefault\fR
 .RS 4
-rsync://rsync\&.macports\&.org/release/tarballs/ports\&.tar [default]
+rsync://rsync\&.macports\&.org/macports/release/tarballs/ports\&.tar [default]
 .RE
 .RE
 .PP

doc/sources.conf.5.txt

@@ -38,9 +38,9 @@ MacPorts supports a number of different protocols as source descriptions.
     a pre-generated PortIndex (including the PortIndex.quick file) from there.
     +
     *Example*;;
-        rsync://rsync.macports.org/release/tarballs/ports.tar
+        rsync://rsync.macports.org/macports/release/tarballs/ports.tar
     *Default*;;
-        rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+        rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]
 
 'file://'::
     Followed by an absolute path (which will result in *three* slashes at the

src/macports1.0/macports.tcl

@@ -915,7 +915,7 @@ proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
     }
     if {![info exists rsync_dir]} {
         global macports::rsync_dir
-        set macports::rsync_dir release/tarballs/base.tar
+        set macports::rsync_dir macports/release/tarballs/base.tar
     }
     if {![info exists rsync_options]} {
         global macports::rsync_options

src/macports1.0/tests/macports.test

@@ -617,7 +617,7 @@ test getportresourcepath {
 } -body {
     set macports::portdbpath $pwd/portdbpath
     set url "http://packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2"
-    set default_path $pwd/portdbpath/sources/rsync.macports.org/release/tarballs/ports/_resources
+    set default_path $pwd/portdbpath/sources/rsync.macports.org/macports/release/tarballs/ports/_resources
     set fallback_path $pwd/portdbpath/sources/packages.macports.org/db_select/db_select-0.1_3.darwin_14.noarch.tbz2/_resources
 
     if {[macports::getportresourcepath $url "" yes] ne $default_path} {

src/macports1.0/tests/sources.conf

@@ -25,4 +25,4 @@
 # For proper functionality of various resources (port groups, mirror
 # sites, etc.), the primary MacPorts source must always be tagged
 # "[default]", even if switched from the default "rsync://" URL.
-rsync://rsync.macports.org/release/tarballs/ports.tar [default]
+rsync://rsync.macports.org/macports/release/tarballs/ports.tar [default]

tests/test-macports.conf

@@ -34,7 +34,7 @@ portautoclean		yes
 rsync_server		rsync.macports.org
 
 # Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
-rsync_dir			release/base/
+rsync_dir			macports/release/base/
 
 # Rsync options
 rsync_options		-rtzv --delete-after