From be320ab292eb974740ce9e73aad626137a4171e4 Mon Sep 17 00:00:00 2001
From: "Simon L. B. Nielsen" <simon@FreeBSD.org>
Date: Sun, 16 Jul 2006 11:22:05 +0000
Subject: [PATCH] MFen 1.37+1.38:

- Make it possible to override the complete path to the INDEX file
  used for the ports/ part of the website, by setting the
  PINDEX_OVERRIDE variable. (Already merged in www/ja/ports/Makefile.)

- Force NO_TIDY for the ports web pages, since it takes a long time to
  run tidy on these huge HTML files, and the files are valid HTML when
  generated by portindex, even without tidy.

  Running without tidy caused the build time to go from ~8 minutes to
  ~1 minute on my test machine.  An additional bonus is that the
  generated HTML files are now significantly smaller.
---
 es/ports/Makefile | 17 +++++++++++++++--
 ja/ports/Makefile | 12 +++++++++++-
 ru/ports/Makefile | 19 ++++++++++++++++---
 3 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/es/ports/Makefile b/es/ports/Makefile
index dbca3b7e45..ec86970d73 100644
--- a/es/ports/Makefile
+++ b/es/ports/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/es/ports/Makefile,v 1.12 2004/11/13 12:23:19 ceri Exp $
+# $FreeBSD: www/es/ports/Makefile,v 1.13 2005/12/04 11:50:51 pav Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -12,7 +12,17 @@
 
 FETCH_OPT?=	-am
 
-.if defined(NOPORTSCVS)
+#
+# Force NO_TIDY for the ports web pages, since it takes a long time to
+# run tidy on these huge HTML files, and the files are valid HTML when
+# generated by portindex, even without tidy.
+#
+NO_TIDY=	YES
+
+.if defined(PINDEX_OVERRIDE)
+${INDEX}: ${PINDEX_OVERRIDE}
+	${CP} ${PINDEX_OVERRIDE} ${INDEX}
+.elif defined(NOPORTSNET)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	cp ${PORTSBASE}/${PINDEX} ${INDEX}
 .else
@@ -38,6 +48,9 @@ packages.exists:
 
 Makefile.gen: index.sgml .NOTMAIN
 	echo DOCS= *.sgml > Makefile.gen
+.if defined(NO_TIDY)
+	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
+.endif
 
 index.sgml: ${INDEX} packages.exists portindex ports.inc .NOTMAIN
 	rm -f *.sgml
diff --git a/ja/ports/Makefile b/ja/ports/Makefile
index 1c8caf9ace..cd6298d8f0 100644
--- a/ja/ports/Makefile
+++ b/ja/ports/Makefile
@@ -1,4 +1,4 @@
-# $FreeBSD: www/ja/ports/Makefile,v 1.27 2004/11/13 12:23:19 ceri Exp $
+# $FreeBSD: www/ja/ports/Makefile,v 1.28 2005/12/04 11:50:51 pav Exp $
 # The FreeBSD Japanese Documentation Project
 # Original revision: 1.37
 
@@ -14,6 +14,13 @@
 
 FETCH_OPT?=	-am
 
+#
+# Force NO_TIDY for the ports web pages, since it takes a long time to
+# run tidy on these huge HTML files, and the files are valid HTML when
+# generated by portindex, even without tidy.
+#
+NO_TIDY=	YES
+
 .if defined(PINDEX_OVERRIDE)
 ${INDEX}: ${PINDEX_OVERRIDE}
 	${CP} ${PINDEX_OVERRIDE} ${INDEX}
@@ -59,6 +66,9 @@ packages.exists:
 
 Makefile.gen: index.sgml .NOTMAIN
 	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
+.if defined(NO_TIDY)
+	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
+.endif
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml
diff --git a/ru/ports/Makefile b/ru/ports/Makefile
index 56e3a267c7..bb98855171 100644
--- a/ru/ports/Makefile
+++ b/ru/ports/Makefile
@@ -1,10 +1,10 @@
 #
 # The FreeBSD Russian Documentation Project
 #
-# $FreeBSD: www/ru/ports/Makefile,v 1.8 2004/11/13 12:23:19 ceri Exp $
+# $FreeBSD: www/ru/ports/Makefile,v 1.9 2005/12/04 11:50:51 pav Exp $
 # $FreeBSDru: frdp/www/ru/ports/Makefile,v 1.9 2004/03/23 21:09:19 phantom Exp $
 #
-# Original revision: 1.36
+# Original revision: 1.38
 #
 
 .if exists(../Makefile.conf)
@@ -19,7 +19,17 @@
 
 FETCH_OPT?=	-am
 
-.if defined(NOPORTSNET)
+#
+# Force NO_TIDY for the ports web pages, since it takes a long time to
+# run tidy on these huge HTML files, and the files are valid HTML when
+# generated by portindex, even without tidy.
+#
+NO_TIDY=	YES
+
+.if defined(PINDEX_OVERRIDE)
+${INDEX}: ${PINDEX_OVERRIDE}
+	${CP} ${PINDEX_OVERRIDE} ${INDEX}
+.elif defined(NOPORTSNET)
 ${INDEX}: $${PORTSBASE}/${PINDEX}
 	${CP} ${PORTSBASE}/${PINDEX} ${INDEX}
 .else
@@ -60,6 +70,9 @@ packages.exists:
 
 Makefile.gen: index.sgml .NOTMAIN
 	${ECHO_CMD} DOCS= *.sgml > Makefile.gen
+.if defined(NO_TIDY)
+	${ECHO_CMD} NO_TIDY=${NO_TIDY} >> Makefile.gen
+.endif
 
 index.sgml: ${INDEX} categories packages.exists portindex ports.inc .NOTMAIN
 	${RM} -f *.sgml