- Merge the following from the English version:

1.92  -> 1.93 	index.sgml
	1.10  -> 1.11 	internal/developer.sgml
	1.2   -> 1.3  	ports/Makefile.inc0

- Fix routines around $pos_date for malformed $FreeBSD:...$:

	prehtml
This commit is contained in:
Hiroki Sato 2000-10-03 11:10:50 +00:00
parent 0cc1576559
commit ba904efd64
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/www/; revision=8084
4 changed files with 31 additions and 14 deletions

View file

@ -1,12 +1,12 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" [
<!ENTITY title "The FreeBSD Project">
<!ENTITY date "$FreeBSD: www/ja/index.sgml,v 1.25 2000/09/17 11:30:28 hrs Exp $">
<!ENTITY date "$FreeBSD: www/ja/index.sgml,v 1.26 2000/09/30 17:41:48 hrs Exp $">
<!ENTITY % rev.incl SYSTEM "index.revinc"> %rev.incl;
<!ENTITY % includes SYSTEM "includes.sgml"> %includes;
]>
<!-- $FreeBSD: www/ja/index.sgml,v 1.25 2000/09/17 11:30:28 hrs Exp $ -->
<!-- $FreeBSD: www/ja/index.sgml,v 1.26 2000/09/30 17:41:48 hrs Exp $ -->
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.92 -->
<!-- Original revision: 1.93 -->
<html>
<head>
@ -99,6 +99,7 @@
<option value="http://www.ch.FreeBSD.org/">スイス</option>
<option value="http://www.tw.FreeBSD.org/www.FreeBSD.org/data/">台湾</option>
<option value="http://www.tr.FreeBSD.org/">トルコ</option>
<option value="http://freebsd.cslab.itu.edu.tr/">¥È¥ë¥³/2</option>
<option value="http://www.ua.FreeBSD.org/">ウクライナ/1</option>
<option value="http://www2.ua.FreeBSD.org/">ウクライナ/2</option>
<option value="http://www4.ua.FreeBSD.org/">ウクライナ/クリミア</option>

View file

@ -1,13 +1,13 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN" [
<!ENTITY base CDATA "..">
<!ENTITY date "$FreeBSD: www/ja/internal/developer.sgml,v 1.11 2000/06/14 23:17:10 motoyuki Exp $">
<!ENTITY date "$FreeBSD: www/ja/internal/developer.sgml,v 1.12 2000/08/28 21:40:13 hrs Exp $">
<!ENTITY title "Resources for FreeBSD Committers">
<!ENTITY % rev.incl SYSTEM "developer.revinc"> %rev.incl;
<!ENTITY % includes SYSTEM "../includes.sgml"> %includes;
]>
<!-- The FreeBSD Japanese Documentation Project -->
<!-- Original revision: 1.10 -->
<!-- $FreeBSD: www/ja/internal/developer.sgml,v 1.11 2000/06/14 23:17:10 motoyuki Exp $ -->
<!-- Original revision: 1.11 -->
<!-- $FreeBSD: www/ja/internal/developer.sgml,v 1.12 2000/08/28 21:40:13 hrs Exp $ -->
<html>
&header;
@ -29,7 +29,7 @@ FreeBSD Web
ツールやソフトウェアを使ううちに,あなたはドキュメント化プロジェクトの
背後にある哲学に(命令と推奨の双方の意味で)従うようになるでしょう.
<h2><a href="../tutorials/committers-guide/">FreeBSD ports 作成者のためのガイド</a></h2>
<h2><a href="../porters-handbook/">FreeBSD ports 作成者のためのガイド</a></h2>
FreeBSD ports 作成者のためのガイド

View file

@ -1,12 +1,12 @@
# $FreeBSD$
# $FreeBSD: www/ja/ports/Makefile.inc0,v 1.1 1999/11/15 21:58:16 kuriyama Exp $
# The FreeBSD Japanese Documentation Project
# Original revision: 1.2
# Original revision: 1.3
.if exists(../Makefile.conf)
.if exists(${.CURDIR}/../Makefile.conf)
.include "../Makefile.conf"
.endif
.if exists(../../en/ports/Makefile.inc)
.if exists(${.CURDIR}/../../en/ports/Makefile.inc)
.include "../../en/ports/Makefile.inc"
.endif

View file

@ -7,7 +7,7 @@
# usage: prehtml [-revcheck <localtop> <relative to localtop>] <SGML filename>
# (ex. % prehtml -revcheck ../.. news/1996 index.sgml)
#
# $FreeBSD$
# $FreeBSD: www/ja/prehtml,v 1.1 2000/10/02 09:16:04 kuriyama Exp $
my $revcheck;
my $topdir;
@ -65,9 +65,16 @@ open TARGET,"<$file{target}" or die "cannot open a target file: $!\n";
my $pos_date;
### first, get date string and rev_target
while(defined($_ = <TARGET>)) {
if(/<!ENTITY\s+date\s+\"\$Free[B]SD: [^\s]+ [.0-9]+ ([\/0-9]+)[^\$]*\$\">/) {
if(/<!ENTITY\s+date/) {
$pos_date = tell(TARGET);
$date = "<!ENTITY date \"Last modified: $1\">";
if(m/\"\$Free[B]SD: [^\s]+ [.0-9]+ ([\/0-9]+)[^\$]*\$\"/) {
$date = "<!ENTITY date \"Last modified: $1\">";
} else {
$date = "<!ENTITY date \"Last modified: UNKNOWN\">";
}
}
if(/<!ENTITY\s+title/) {
$pos_title = tell(TARGET);
}
if($revcheck) {
@ -83,6 +90,15 @@ while(defined($_ = <TARGET>)) {
$rev{target} ||= "TARGET revision not found";
$rev{org} ||= "ORG revision not found";
### if offset of "date" string is not found,
### use "title"'s instead.
if(not defined $pos_date) {
if(not defined $pos_title) {
die qq/element "date" or "title" is not defined.\n/;
}
$pos_date = $pos_title;
}
### next, put lines and replace the line with
### $date + entity difinitions for revcheck
seek TARGET,0,0;