Index: doc/de_DE.ISO8859-1/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/de_DE.ISO8859-1/books/handbook/Makefile,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 Makefile
--- doc/de_DE.ISO8859-1/books/handbook/Makefile 23 Dec 2003 01:21:02 -0000 1.23
+++ doc/de_DE.ISO8859-1/books/handbook/Makefile 24 Dec 2003 20:35:41 -0000
@@ -121,7 +121,6 @@
mirrors.sgml.${p}.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
${XSLTPROC} ${XSLTPROCOPTS} \
-o $@.tmp \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
--param 'type' "'$p'" \
--param 'proto' "'$p'" \
--param 'target' "'handbook/mirrors/chapter.sgml'" \
@@ -134,7 +133,6 @@
eresources.sgml.www.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
${XSLTPROC} ${XSLTPROCOPTS} \
-o $@.tmp \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
--param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.sgml'" \
Index: doc/en_US.ISO8859-1/books/handbook/Makefile
===================================================================
RCS file: /home/ncvs/doc/en_US.ISO8859-1/books/handbook/Makefile,v
retrieving revision 1.74
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.74 Makefile
--- doc/en_US.ISO8859-1/books/handbook/Makefile 6 Dec 2003 07:39:32 -0000 1.74
+++ doc/en_US.ISO8859-1/books/handbook/Makefile 24 Dec 2003 20:35:22 -0000
@@ -222,7 +222,6 @@
mirrors.sgml.${p}.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
${XSLTPROC} ${XSLTPROCOPTS} \
-o $@.tmp \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
--param 'type' "'$p'" \
--param 'proto' "'$p'" \
--param 'target' "'handbook/mirrors/chapter.sgml'" \
@@ -235,7 +234,6 @@
eresources.sgml.www.inc: ${XML_MIRRORS} ${XSL_MIRRORS}
${XSLTPROC} ${XSLTPROCOPTS} \
-o $@.tmp \
- --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
--param 'type' "'www'" \
--param 'proto' "'http'" \
--param 'target' "'handbook/eresources/chapter.sgml'" \
Index: doc/share/mk/doc.common.mk
===================================================================
RCS file: /home/ncvs/doc/share/mk/doc.common.mk,v
retrieving revision 1.3
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.3 doc.common.mk
--- doc/share/mk/doc.common.mk 26 Nov 2003 01:47:00 -0000 1.3
+++ doc/share/mk/doc.common.mk 24 Dec 2003 21:01:21 -0000
@@ -5,6 +5,9 @@
# documents commonly used in doc/ and www/ tree.
#
+AWK?= /usr/bin/awk
+GREP?= /usr/bin/grep
+
.if defined(DOC_PREFIX) && !empty(DOC_PREFIX)
WEB_PREFIX?= ${DOC_PREFIX}/../www
.elif defined(WEB_PREFIX) && !empty(WEB_PREFIX)
@@ -114,9 +117,23 @@
${XML_MIRRORS}: ${XML_MIRRORS_MASTER} ${XSL_TRANSTABLE} ${XSL_TRANSTABLE_MASTER}
${MKDIR} -p ${@:H}
+ ${XSLTPROC} ${XSLTPROCOPTS} \
+ --param 'transtable.xml' "'${XML_TRANSTABLE}'" \
+ --param 'transtable-conv-element' "'country'" \
+ --param 'transtable-mode' "'sortkey'" \
+ ${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER} \
+ | env -i LANG="${LANGCODE}" ${SORT} > $@.sort.tmp
+ env -i ${GREP} "^ $@.sort
+ ${ECHO} "" >> $@.sort
+ env -i ${AWK} '/^ / {sub(/@sortkey@/, ++line); print;}' < $@.sort.tmp >> $@.sort
+ ${ECHO} '' >> $@.sort
${XSLTPROC} ${XSLTPROCOPTS} -o $@ \
--param 'transtable.xml' "'${XML_TRANSTABLE}'" \
--param 'transtable-conv-element' "'country'" \
+ --param 'transtable-sortkey.xml' "'$@.sort'" \
${XSL_TRANSTABLE} ${XML_MIRRORS_MASTER}
+ ${RM} -f $@.sort $@.sort.tmp
CLEANFILES+= ${XML_MIRRORS}
+CLEANFILES+= ${XML_MIRRORS}.sort
+CLEANFILES+= ${XML_MIRRORS}.sort.tmp
Index: doc/share/sgml/mirrors-local.xsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/mirrors-local.xsl,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 mirrors-local.xsl
--- doc/share/sgml/mirrors-local.xsl 24 Nov 2003 20:00:20 -0000 1.2
+++ doc/share/sgml/mirrors-local.xsl 24 Dec 2003 21:03:58 -0000
@@ -12,6 +12,7 @@
+
Index: doc/share/sgml/mirrors-master.xsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/mirrors-master.xsl,v
retrieving revision 1.4
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.4 mirrors-master.xsl
--- doc/share/sgml/mirrors-master.xsl 6 Dec 2003 07:39:32 -0000 1.4
+++ doc/share/sgml/mirrors-master.xsl 24 Dec 2003 20:41:13 -0000
@@ -68,15 +68,16 @@
-
+
-
+
@@ -109,8 +110,9 @@
-
+
@@ -194,9 +196,10 @@
-
-
+
+
Index: doc/share/sgml/transtable-local.xsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/transtable-local.xsl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 transtable-local.xsl
--- doc/share/sgml/transtable-local.xsl 24 Nov 2003 18:26:35 -0000 1.1
+++ doc/share/sgml/transtable-local.xsl 24 Dec 2003 20:52:04 -0000
@@ -12,5 +12,7 @@
+
+
Index: doc/share/sgml/transtable-master.xsl
===================================================================
RCS file: /home/ncvs/doc/share/sgml/transtable-master.xsl,v
retrieving revision 1.1
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.1 transtable-master.xsl
--- doc/share/sgml/transtable-master.xsl 24 Nov 2003 18:26:35 -0000 1.1
+++ doc/share/sgml/transtable-master.xsl 24 Dec 2003 21:07:55 -0000
@@ -9,9 +9,12 @@
+
+
+
@@ -30,6 +33,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -41,9 +67,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: www/share/sgml/includes.misc.xsl
===================================================================
RCS file: /home/ncvs/www/share/sgml/includes.misc.xsl,v
retrieving revision 1.2
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.2 includes.misc.xsl
--- www/share/sgml/includes.misc.xsl 6 Dec 2003 07:39:32 -0000 1.2
+++ www/share/sgml/includes.misc.xsl 24 Dec 2003 21:10:39 -0000
@@ -105,8 +105,10 @@
-
+
@@ -123,8 +125,10 @@
-
+