From 45f9a6661d1a01a784ffff5340da7241e67f47f0 Mon Sep 17 00:00:00 2001
From: Wolfram Schneider <wosch@FreeBSD.org>
Date: Wed, 9 May 2001 18:26:23 +0000
Subject: [PATCH] ftp5.freebsd.org does not support tar on the fly use short
 arguments for url.cgi

---
 en/ports/portindex | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/en/ports/portindex b/en/ports/portindex
index 58dc5a591d..65dc558b57 100755
--- a/en/ports/portindex
+++ b/en/ports/portindex
@@ -20,13 +20,15 @@ if ($ENV{'MASTER_FTP_SERVER'}) {
 } else {
     $ftpserver = 'ftp://ftp5.freebsd.org' if !$ftpserver;
 }
-$base = "$ftpserver/pub/FreeBSD/branches/-current" if !$base;
+$base = "" if !$base;
 $baseHTTP = $base if !$baseHTTP;
+$baseFTP = "$ftpserver/pub/FreeBSD/branches/-current/";
 $urlcgi = 'http://www.freebsd.org/cgi/url.cgi' if !$urlcgi;
 $packagesURL = "$ftpserver/pub/FreeBSD/ports/i386/packages-stable/All/"
     if !$packagesURL;
 # support tar on the fly or gzip'ed tar on the fly
-$ftparchive = 'tar' if !$ftparchive;
+$ftparchive = '';
+$ftparchive = 'tar' if !defined $ftparchive;
 
 
 # ports download sources script
@@ -141,11 +143,11 @@ sub main {
 	    $stats{$i}++;
 
     	    # figure out the FTP url
-	    $loc =~ s/\/usr/$base/;
-	    $ldesc =~ s/\/usr/$baseHTTP/;
+	    $loc =~ s/\/usr\//$baseFTP/;
+	    $ldesc =~ s/\/usr\//$baseHTTP/;
 
     	    # The name description and maintainer
-	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc.$ftparchive\">$name</A></B> ";
+	    $data{$i} .= "<DT><B><A NAME=\"$name\"></A><A HREF=\"$loc$ftparchive\">$name</A></B> ";
      
 
 	    $data{$i} .= "<DD>$desc<BR><A HREF=\"$ldesc\">Long description</A>";