From a72d0992f36dc0f69cca21ddcb856a03b8cc1097 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Tue, 9 Nov 2004 15:15:01 +0000
Subject: [PATCH] - Update to match the 5.3-RELEASE/5-STABLE/6-CURRENT world. -
 Handle that 6.0 also uses .tbz packages. - Simply refer to the
 -STABLE/-CURRENT branches by their major number   so we don't have to update
 that part of the script for each release. - 5-STABLE currently points to
 packages-5-current since there is no   packages-5-stable yet. - Change the
 default version to 5-STABLE/i386.

---
 en/cgi/ports.cgi | 46 ++++++++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/en/cgi/ports.cgi b/en/cgi/ports.cgi
index 4cdd7c67ad..b5f1aff76d 100755
--- a/en/cgi/ports.cgi
+++ b/en/cgi/ports.cgi
@@ -24,7 +24,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: www/en/cgi/ports.cgi,v 1.78 2004/08/30 19:11:31 ceri Exp $
+# $FreeBSD: www/en/cgi/ports.cgi,v 1.79 2004/09/11 08:31:02 dd Exp $
 #
 # ports.cgi - search engine for FreeBSD ports
 #             	o search for a port by name or description
@@ -67,40 +67,42 @@ sub init_variables {
     local($pia64) = 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/ia64';
     local($psparc64) = 'ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/sparc64';
 
-    $remotePrefixFtpPackagesDefault = '4.10-STABLE/i386';
+    $remotePrefixFtpPackagesDefault = '5-STABLE/i386';
     %remotePrefixFtpPackages =
 	(
-	 '5.2-CURRENT/i386', "$p/packages-current/All",
-	 '4.10-STABLE/i386', " $p/packages-4-stable/All",
+	 '6-CURRENT/i386', "$p/packages-6-current/All",
+	 '5-STABLE/i386', " $p/packages-5-current/All",
+	 '4-STABLE/i386', " $p/packages-4-stable/All",
 
+	 '5.3-RELEASE/i386', "$p/packages-5.3-release/All",
 	 '5.2.1-RELEASE/i386', "$p/packages-5.2.1-release/All",
-	 '5.1-RELEASE/i386', "$p/packages-5.1-release/All",
 	 '4.10-RELEASE/i386',"$p/packages-4.10-release/All",
-	 '4.9-RELEASE/i386', "$p/packages-4.9-release/All",
-	 '4.8-RELEASE/i386', "$p/packages-4.8-release/All",
 
-	 '5.2-CURRENT/alpha', "$palpha/packages-current/All",
-	 '4.10-STABLE/alpha', "$palpha/packages-4-stable/All",
+	 '6-CURRENT/alpha', "$palpha/packages-6-current/All",
+	 '5-STABLE/alpha', "$palpha/packages-5-current/All",
+	 '4-STABLE/alpha', "$palpha/packages-4-stable/All",
 
+	 '5.3-RELEASE/alpha', "$palpha/packages-5.3-release/All",
  	 '5.2.1-RELEASE/alpha', "$palpha/packages-5.2.1-release/All",
-	 '5.1-RELEASE/alpha', "$palpha/packages-5.1-release/All",
 	 '4.10-RELEASE/alpha',"$palpha/packages-4.10-release/All",
-	 '4.9-RELEASE/alpha', "$palpha/packages-4.9-release/All",
-	 '4.8-RELEASE/alpha', "$palpha/packages-4.8-release/All",
 
-	 '5.2-CURRENT/amd64', "$pamd64/packages-current/All",
+	 '6-CURRENT/amd64', "$pamd64/packages-6-current/All",
+	 '5-STABLE/amd64', "$pamd64/packages-5-current/All",
 
+ 	 '5.3-RELEASE/amd64', "$pamd64/packages-5.3-release/All",
  	 '5.2.1-RELEASE/amd64', "$pamd64/packages-5.2.1-release/All",
 
-	 '5.2-CURRENT/ia64', "$pia64/packages-current/All",
+	 '6-CURRENT/ia64', "$pia64/packages-6-current/All",
+	 '5-STABLE/ia64', "$pia64/packages-5-current/All",
 
+	 '5.3-RELEASE/ia64', "$pia64/packages-5.3-release/All",
 	 '5.2.1-RELEASE/ia64', "$pia64/packages-5.2.1-release/All",
-	 '5.1-RELEASE/ia64', "$pia64/packages-5.1-release/All",
 
-	 '5.2-CURRENT/sparc64', "$psparc64/packages-current/All",
+	 '6-CURRENT/sparc64', "$psparc64/packages-6-current/All",
+	 '5-STABLE/sparc64', "$psparc64/packages-5-current/All",
 
+	 '5.3-RELEASE/sparc64', "$psparc64/packages-5.3-release/All",
 	 '5.2.1-RELEASE/sparc64', "$psparc64/packages-5.2.1-release/All",
-	 '5.1-RELEASE/sparc64', "$psparc64/packages-5.1-release/All",
 	);
 
     $remotePrefixHtml =
@@ -147,7 +149,11 @@ sub init_variables {
 
 # Parse selected version string and set version dependend settings
 sub parse_release {
-    if($release =~ /^(\d+)\.(\d+)(\.(\d+))?-(CURRENT|STABLE|RELEASE)\/(i386|alpha|ia64|sparc64|amd64)$/) {
+    if($release =~ /^(\d+)-(CURRENT|STABLE)\/(i386|alpha|ia64|sparc64|amd64)$/) {
+	$release_major = $1;
+	$release_type = $2;
+	$release_arch = $3;
+    } elsif($release =~ /^(\d+)\.(\d+)(\.(\d+))?-(CURRENT|STABLE|RELEASE)\/(i386|alpha|ia64|sparc64|amd64)$/) {
 	$release_major = $1;
 	$release_minor = $2;
 	$release_patch = $4;
@@ -166,7 +172,7 @@ sub parse_release {
 	&footer; &footer2; &exit(0);
     }
 
-    if($release_major == 5) {
+    if($release_major > 4) {
 	$packageExt = 'tbz';
 	$ports_database = 'INDEX-5';
     }
@@ -662,7 +668,7 @@ sub footer {
 <img ALIGN="RIGHT" src="/gifs/powerlogo.gif" alt="Powered by FreeBSD">
 &copy; 1996-2002 by Wolfram Schneider. All rights reserved.<br>
 };
-    #print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.78 2004/08/30 19:11:31 ceri Exp $} . "<br>\n";
+    #print q{$FreeBSD: www/en/cgi/ports.cgi,v 1.79 2004/09/11 08:31:02 dd Exp $} . "<br>\n";
     print qq{Please direct questions about this service to
 <I><A HREF="$mailtoURL">$mailto</A></I><br>\n};
     print qq{General questions about FreeBSD ports should be sent to } .