From e156e01a74b140f0546dd7be9519c1e736be272d Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Sun, 22 Jun 2008 07:17:53 +0000
Subject: [PATCH] Fix build and update obsolete lines which may break the
 build.

---
 ru/Makefile     | 43 +++++++++----------------------------------
 ru/index.xsl    |  5 ++---
 ru/send-pr.sgml |  5 ++---
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/ru/Makefile b/ru/Makefile
index 8f640e1ee1..cfa565d371 100644
--- a/ru/Makefile
+++ b/ru/Makefile
@@ -1,7 +1,7 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/Makefile,v 1.51 2006/08/19 21:58:14 hrs Exp $
+# $FreeBSD: www/ru/Makefile,v 1.52 2007/08/15 21:13:14 marck Exp $
 # $FreeBSDru: frdp/www/ru/Makefile,v 1.53 2006/02/18 18:46:43 gad Exp $
 #
 # Original revision: 1.122
@@ -33,6 +33,14 @@ DOCS+= support.sgml
 DOCS+= where.sgml
 DOCS+= y2kbug.sgml
 
+XMLDOCS=	index:xsl:${XML_NEWS_NEWS}:
+DEPENDSET.index=transtable mirrors news press events \
+		advisories notices
+
+XMLDOCS+=	usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
+DEPENDSET.usergroups=	transtable usergroups
+PARAMS.usergroups=	--param pagename "'FreeBSD User Groups'"
+
 # These will be directly installed.
 
 #DATA=	favicon.ico
@@ -84,39 +92,6 @@ SUBDIR+= ports
 #SUBDIR+= cgi
 #SUBDIR+= gifs
 
-XMLDOCS=       usergroups:${XSL_USERGROUPS}:${XML_USERGROUPS}:
-DEPENDSET.usergroups=transtable usergroups
-PARAMS.usergroups=      --param pagename "'FreeBSD User Groups'"
-
 WEBDIR?=	data/ru
 
-# index.html is special, and generated from index.xsl and news/news.xml
-DATA+=		index.html
-CLEANFILES+=	index.html
-
 .include "${WEB_PREFIX}/share/mk/web.site.mk"
-
-index.html: index.xsl ${XML_INCLUDES}\
-		${XML_NEWS_INCLUDES} \
-		${XML_NEWS_NEWS} ${XML_NEWS_NEWS_MASTER} \
-		${XML_NEWS_PRESS} ${XML_NEWS_PRESS_MASTER} \
-		${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_CURDATE} \
-		${XML_MIRRORS} ${XML_TRANSTABLE} \
-		${XML_ADVISORIES} ${XML_NOTICES} \
-		${XML_NAVIGATION}
-	${XSLTPROC} ${XSLTPROCOPTS} \
-		-o $@ \
-		--param advisories.xml "'${XML_ADVISORIES}'" \
-		--param mirrors.xml "'${XML_MIRRORS}'" \
-		--param news.press.xml-master "'${XML_NEWS_PRESS_MASTER}'" \
-		--param news.press.xml "'${XML_NEWS_PRESS}'" \
-		--param news.project.xml-master "'${XML_NEWS_NEWS_MASTER}'" \
-		--param news.project.xml "'${XML_NEWS_NEWS}'" \
-		--param events.xml-master "'${XML_EVENTS_EVENTS_MASTER}'" \
-		--param curdate.xml "'${XML_EVENTS_CURDATE}'" \
-		--param notices.xml "'${XML_NOTICES}'" \
-		--param transtable.xml "'${XML_TRANSTABLE}'" \
-		${.CURDIR}/index.xsl ${XML_NEWS_NEWS} ${XML_EVENTS_EVENTS_MASTER} ${XML_EVENTS_CURDATE}
-.if !defined(NO_TIDY)
-	-${TIDY} ${TIDYOPTS} ${.TARGET}
-.endif
diff --git a/ru/index.xsl b/ru/index.xsl
index e4618e40bf..b07b2c2ec0 100644
--- a/ru/index.xsl
+++ b/ru/index.xsl
@@ -7,7 +7,7 @@
 <!--
      The FreeBSD Russian Documentation Project
 
-     $FreeBSD: www/ru/index.xsl,v 1.31 2006/08/19 21:25:46 hrs Exp $
+     $FreeBSD: www/ru/index.xsl,v 1.32 2007/02/03 11:49:49 marck Exp $
      $FreeBSDru: frdp/www/ru/index.xsl,v 1.47 2006/01/16 21:27:51 gad Exp $
 
      Original revision: 1.127
@@ -16,7 +16,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
   <xsl:import href="http://www.FreeBSD.org/XML/www/lang/share/sgml/libcommon.xsl"/>
 
-  <xsl:variable name="date" select="'$FreeBSD: www/ru/index.xsl,v 1.31 2006/08/19 21:25:46 hrs Exp $'"/>
+  <xsl:variable name="date" select="'$FreeBSD: www/ru/index.xsl,v 1.32 2007/02/03 11:49:49 marck Exp $'"/>
 
   <!-- these params should be externally bound. The values
        here are not used actually -->
@@ -231,7 +231,6 @@
 			<xsl:call-template name="html-index-events-items">
 				<xsl:with-param name="events.xml-master" select="$events.xml-master" />
 				<xsl:with-param name="events.xml" select="$events.xml" />
-				<xsl:with-param name="curdate.xml" select="$curdate.xml" />
 			</xsl:call-template>
 
 			  <div>
diff --git a/ru/send-pr.sgml b/ru/send-pr.sgml
index b5d217e470..238b328885 100644
--- a/ru/send-pr.sgml
+++ b/ru/send-pr.sgml
@@ -7,7 +7,7 @@
 -->
 
 <!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
-<!ENTITY date "$FreeBSD: www/ru/send-pr.sgml,v 1.14 2006/08/19 21:25:46 hrs Exp $">
+<!ENTITY date "$FreeBSD: www/ru/send-pr.sgml,v 1.15 2008/06/21 19:32:44 marck Exp $">
 <!ENTITY title "Отправка сообщения о проблеме во FreeBSD">
 <!ENTITY copyright "This gnats pr-submission mechanism Copyright &copy; 1996
  The NetBSD Foundation, Inc.  ALL RIGHTS RESERVED.">
@@ -97,7 +97,6 @@
     <input type="text" name="synopsis" id="synopsis" size="60" >
 
     <br><br><label for="category">Категория</label>: <select name="category" id="category">
-    <select name="category">
       <option>advocacy</option>
       <option>alpha</option>
       <option>amd64</option>
@@ -120,7 +119,7 @@
       <option>www</option>
     </select>
 
-    <br><br><label for="severity">Важность</label>: <select name="severity" id="severity">:
+    <br><br><label for="severity">Важность</label>: <select name="severity" id="severity">
       <option>non-critical</option>
       <option>serious</option>
       <option>critical</option>