From f91e2de675c6dedfbe253221ac3b1901be96c0b1 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Fri, 15 Jul 2005 06:08:02 +0000
Subject: [PATCH] Add 7.0/7-CURRENT to the list of supported versions.

---
 en/gnome/gnome_upgrade.sh | 41 ++++++++++++++++++++++++---------------
 en/gnome/index.xsl        |  7 ++++---
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/en/gnome/gnome_upgrade.sh b/en/gnome/gnome_upgrade.sh
index bf5c6cebab..097fc9c930 100644
--- a/en/gnome/gnome_upgrade.sh
+++ b/en/gnome/gnome_upgrade.sh
@@ -34,7 +34,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $Id: gnome_upgrade.sh,v 1.21 2005-04-28 21:48:17 adamw Exp $
+# $Id: gnome_upgrade.sh,v 1.22 2005-07-15 06:08:02 marcus Exp $
 # $FreeBSD$
 #
 
@@ -53,7 +53,7 @@ X11BASE=${X11BASE:=/usr/X11R6}
 PROJECT_URL="http://www.FreeBSD.org/gnome/"
 SUPPORT_EMAIL="freebsd-gnome@FreeBSD.org"
 
-SUPPORTED_FREEBSD_VERSIONS="4.10 4.11 5.3 5.4 6.0"
+SUPPORTED_FREEBSD_VERSIONS="4.10 4.11 5.3 5.4 6.0 7.0"
 	# The Big Update updates UPGRADE_TARGET and everything that depends on it
 UPGRADE_TARGET="glib-2*"
 	# Variables to be set across every portupgrade run
@@ -61,24 +61,33 @@ PORTUPGRADE_MAKE_ENV="GNOME_UPGRADE_SH_VER=${GNOME_UPGRADE_SH_VER} DISABLE_VULNE
 
 ## END global variable declarations.
 
+get_tmpdir()
+{
+	if [ -n "${MC_TMPDIR}" -a -d "${MC_TMPDIR}" ]; then
+		tmpdir="${MC_TMPDIR}"
+	elif [ -n "${TMPDIR}" -a -d "${TMPDIR}" ]; then
+		tmpdir="${TMPDIR}"
+	elif [ -d "/var/tmp" ]; then
+		tmpdir="/var/tmp"
+	elif [ -d "/tmp" ]; then
+		tmpdir="/tmp"
+	elif [ -d "/usr/tmp" ]; then
+		tmpdir="/usr/tmp"
+	else
+		return 1
+	fi
+
+	echo ${tmpdir}
+
+	return 0
+}
+
 get_tmpfile()
 {
     template=$1
     tmpfile=""
 
-    if [ -n "${MC_TMPDIR}" -a -d "${MC_TMPDIR}" ]; then
-	tmpfile="${MC_TMPDIR}/${template}.XXXXXX"
-    elif [ -n "${TMPDIR}" -a -d "${TMPDIR}" ]; then
-	tmpfile="${TMPDIR}/${template}.XXXXXX"
-    elif [ -d "/var/tmp" ]; then
-	tmpfile="/var/tmp/${template}.XXXXXX"
-    elif [ -d "/tmp" ]; then
-	tmpfile="/tmp/${template}.XXXXXX"
-    elif [ -d "/usr/tmp" ]; then
-	tmpfile="/usr/tmp/${template}.XXXXXX"
-    else
-	return 1
-    fi
+    tmpfile="`get_tmpdir`/${template}.XXXXXX"
 
     tmpfile=`mktemp -q ${tmpfile}`
 
@@ -171,7 +180,7 @@ if [ "$1" = "-v" ]; then
     echo "FreeBSD GNOME Upgrade tool: gnome_upgrade.sh"
     echo "--"
     echo "Script version: ${GNOME_UPGRADE_SH_VER}"
-    echo 'MarcusCom revision: $Id: gnome_upgrade.sh,v 1.21 2005-04-28 21:48:17 adamw Exp $'
+    echo 'MarcusCom revision: $Id: gnome_upgrade.sh,v 1.22 2005-07-15 06:08:02 marcus Exp $'
     echo 'FreeBSD revision: $FreeBSD$'
     echo "--"
     echo "Visit http://www.freebsd.org/gnome for more information"
diff --git a/en/gnome/index.xsl b/en/gnome/index.xsl
index d58dbc1f6a..6f3378a335 100644
--- a/en/gnome/index.xsl
+++ b/en/gnome/index.xsl
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.66 2005/03/29 22:12:33 adamw Exp $ -->
+<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.67 2005/05/17 18:28:34 marcus Exp $ -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -9,7 +9,7 @@
   <xsl:import href="includes.xsl"/>
 
   <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD: www/en/gnome/index.xsl,v 1.66 2005/03/29 22:12:33 adamw Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/gnome/index.xsl,v 1.67 2005/05/17 18:28:34 marcus Exp $'"/>
   <xsl:variable name="title" select="'FreeBSD GNOME Project'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -138,7 +138,8 @@
               <h2><font color="#990000">State of the port</font></h2>
 
 	      <p>GNOME for FreeBSD is currently supported on
-		4.10, 4.11, 5.3, 5.4, 4-STABLE, 5-STABLE and 6-CURRENT.
+		4.10, 4.11, 5.3, 5.4, 4-STABLE, 5-STABLE, 6.0-RELEASE,
+		and 7-CURRENT.
 		Most of GNOME has been ported to FreeBSD, but there is still
 		<a href="docs/volunteer.html">plenty left to be done</a>!</p>