From 937622576c565dd40b477f3e656fb1c59e1ad689 Mon Sep 17 00:00:00 2001
From: Christian Brueffer <brueffer@FreeBSD.org>
Date: Sun, 25 Jan 2004 04:00:15 +0000
Subject: [PATCH] MFbed:

security/Makefile	1.9 -> 1.11
security/mkindex.xsl	1.2 -> 1.4

This fixes the german web build.

Obtained from:		The FreeBSD German Documentation Project
---
 de/security/Makefile    | 12 +++++++-----
 de/security/mkindex.xsl | 43 ++++++++++++-----------------------------
 2 files changed, 19 insertions(+), 36 deletions(-)

diff --git a/de/security/Makefile b/de/security/Makefile
index 49c76d175e..b288d015a5 100644
--- a/de/security/Makefile
+++ b/de/security/Makefile
@@ -1,6 +1,6 @@
-# $FreeBSD$
-# $FreeBSDde: de-www/security/Makefile,v 1.2 2004/01/05 11:08:12 mheinen Exp $
-# basiert auf: 1.9
+# $FreeBSD: www/de/security/Makefile,v 1.2 2004/01/11 00:32:03 mheinen Exp $
+# $FreeBSDde: de-www/security/Makefile,v 1.3 2004/01/25 03:50:13 brueffer Exp $
+# basiert auf: 1.11
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -9,7 +9,8 @@
 .include "../Makefile.inc"
 .endif
 
-DOCS=	security.sgml
+DOCS=
+DOCS+=	security.sgml
 
 INDEXLINK= security.html
 
@@ -19,6 +20,7 @@ CLEANFILES+= advisories.html.inc
 
 security.html: advisories.html.inc
 
-advisories.html.inc: mkindex.xsl ${XML_ADVISORIES}
+advisories.html.inc: mkindex.xsl ${XML_ADVISORIES} ${XML_INCLUDES}
 	${XSLTPROC} ${XSLTPROCOPTS} -o ${.TARGET} \
+		--param "advisories.xml" "'${XML_ADVISORIES}'" \
 		${.CURDIR}/mkindex.xsl ${XML_ADVISORIES}
diff --git a/de/security/mkindex.xsl b/de/security/mkindex.xsl
index e3742a129b..7c8a5df9d5 100644
--- a/de/security/mkindex.xsl
+++ b/de/security/mkindex.xsl
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 
 <!--
-	$FreeBSD$
-	$FreeBSDde: de-www/security/mkindex.xsl,v 1.1 2004/01/05 11:08:12 mheinen Exp $
-	basiert auf: 1.2
+	$FreeBSD: www/de/security/mkindex.xsl,v 1.1 2004/01/11 00:32:03 mheinen Exp $
+	$FreeBSDde: de-www/security/mkindex.xsl,v 1.2 2004/01/25 03:50:13 brueffer Exp $
+	basiert auf: 1.4
 -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
@@ -11,40 +11,21 @@
   <xsl:import href="../includes.xsl"/>
 
   <xsl:variable name="base" select="'.'"/>
-  <xsl:variable name="date" select="'$FreeBSD$'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/de/security/mkindex.xsl,v 1.1 2004/01/11 00:32:03 mheinen Exp $'"/>
   <xsl:variable name="title" select="'untitled'"/>
 
-  <xsl:variable name="ftpbase" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/'" />
-  <xsl:variable name="ftpbaseold" select="'ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/advisories/old/'" />
-  <xsl:variable name="ulopen" select="'&lt;ul&gt;'" />
-  <xsl:variable name="ulclose" select="'&lt;/ul&gt;'" />
-
   <xsl:output type="xml" encoding="iso-8859-1"
               omit-xml-declaration="yes" />
 
   <xsl:template match="/">
-    <xsl:value-of select="$ulopen" disable-output-escaping="yes" />
-      <xsl:for-each select="descendant::advisory|descendant::release">
-        <xsl:choose>
-          <xsl:when test="self::release">
-            <xsl:value-of select="$ulclose" disable-output-escaping="yes" />
-            <p><xsl:value-of select="name"/> ver&#246;ffentlicht.</p>
-            <xsl:value-of select="$ulopen" disable-output-escaping="yes" />
-          </xsl:when>
+    <xsl:call-template name="html-list-advisories">
+      <xsl:with-param name="advisories.xml" select="$advisories.xml" />
+    </xsl:call-template>
+  </xsl:template>
 
-          <xsl:when test="self::advisory">
-            <li>
-            <xsl:choose>
-              <xsl:when test="./name/@role='old'">
-                <a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbaseold, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a>
-              </xsl:when>
-              <xsl:otherwise>
-                 <a><xsl:attribute name="href"><xsl:value-of select="concat($ftpbase, name, '.asc')" /></xsl:attribute><xsl:value-of select="concat(name, '.asc')" /></a>             </xsl:otherwise>
-            </xsl:choose>
-            </li>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    <xsl:value-of select="$ulclose" disable-output-escaping="yes" />
+  <xsl:template name="html-list-advisories-release-label">
+    <xsl:param name="relname" select="'none'" />
+
+    <p><xsl:value-of select="$relname" /> released.</p>
   </xsl:template>
 </xsl:stylesheet>