From 80885f0df1aca1eed7b7e5351b2557cefc8bbca1 Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Tue, 21 May 2002 09:15:41 +0000
Subject: [PATCH] Load GNOME rdf file directly into xsltproc, without saving it
 to the temporary file and pre-processing with sed(1) first.

---
 en/gnome/Makefile  | 13 +++----------
 en/gnome/index.xsl | 23 ++++++++++++++---------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/en/gnome/Makefile b/en/gnome/Makefile
index b2895ac591..6133a0f3fd 100644
--- a/en/gnome/Makefile
+++ b/en/gnome/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/gnome/Makefile,v 1.8 2002/01/28 17:05:24 sobomax Exp $
+# $FreeBSD: www/en/gnome/Makefile,v 1.9 2002/02/11 16:54:52 sobomax Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -18,12 +18,9 @@ DATA=	index.html newsflash.html
 
 CLEANFILES=	index.html
 CLEANFILES+=	newsflash.html
-CLEANFILES+=	gnotices.rdf
 
-GNOTICES_RDF_URL=	http://news.gnome.org/gnome-news/rdf
-
-index.html: index.xsl news.xml includes.xsl ../includes.xsl gnotices.rdf
-	${XSLTPROC} ${XSLTPROCOPTS} -o index.html \
+index.html! index.xsl news.xml includes.xsl ../includes.xsl
+	${XSLTPROC} ${XSLTPROCOPTS:N-nonet} -o index.html \
 		${.CURDIR}/index.xsl ${.CURDIR}/news.xml
 .if !defined(NO_TIDY)
 	-${TIDY} ${TIDYOPTS} index.html
@@ -36,8 +33,4 @@ newsflash.html: newsflash.xsl news.xml includes.xsl ../includes.xsl
 	-${TIDY} ${TIDYOPTS} ${.TARGET}
 .endif
 
-gnotices.rdf::
-	/usr/bin/fetch -qo - ${GNOTICES_RDF_URL} | ${SED} 's|rdf:RDF|rdf| ; \
-		s|xmlns.*[^>]||' > ${.TARGET}
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
diff --git a/en/gnome/index.xsl b/en/gnome/index.xsl
index 373d259d2a..c11b01221c 100644
--- a/en/gnome/index.xsl
+++ b/en/gnome/index.xsl
@@ -1,12 +1,15 @@
-<!-- $FreeBSD$ -->
+<!-- $FreeBSD: www/en/gnome/index.xsl,v 1.23 2002/02/08 20:37:57 sobomax Exp $ -->
 
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+		xmlns:rdf1="http://my.netscape.com/rdf/simple/0.9/"
+		version="1.0">
   
   <xsl:import href="../includes.xsl"/>
   <xsl:import href="includes.xsl"/>
 
   <xsl:variable name="base" select="'..'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/en/gnome/index.xsl,v 1.23 2002/02/08 20:37:57 sobomax Exp $'"/>
   <xsl:variable name="title" select="'FreeBSD GNOME Project'"/>
 
   <xsl:output type="html" encoding="iso-8859-1"
@@ -174,18 +177,20 @@
                           
                           <p><font size="+1" color="#990000"><b>GNOME Project News</b></font><br/>
                             <font size="-1">
-                              <xsl:for-each select="document('gnotices.rdf')/descendant::item[position() &lt; 10]">
+                              <xsl:for-each select="document('http://news.gnome.org/gnome-news/rdf')/rdf:RDF/*[name() = 'item'][position() &lt; 10]">
                                 &#183; <a>
                                   <xsl:attribute name="href">
-                                    <xsl:value-of select="link"/>
+                                    <xsl:value-of select="rdf1:link"/>
                                   </xsl:attribute>
-                                  <xsl:value-of select="title"/><br/>
+                                  <xsl:value-of select="rdf1:title"/><br/>
                                 </a>
                               </xsl:for-each>
                             <a>
-                              <xsl:attribute name="href">
-                                <xsl:value-of select="document('gnotices.rdf')/descendant::channel/link"/>
-                              </xsl:attribute>More...
+                              <xsl:for-each select="document('http://news.gnome.org/gnome-news/rdf')/rdf:RDF/*[name() = 'channel'][position() = 1]">
+                                <xsl:attribute name="href">
+                                  <xsl:value-of select="rdf1:link"/>
+                                </xsl:attribute>More...
+                              </xsl:for-each>
                             </a>
                           </font></p>