Fix generation of some documents that were only built if xsltproc was

previously installed in the system.  Bump PKGREVISION to 1.

4 files changed, 128 insertions, 5 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 3f912fcb778..da135fed2b0 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2004/02/17 16:47:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2004/02/18 13:42:00 jmmv Exp $
 
 DISTNAME=	libxslt-1.1.3
 PKGNAME=	${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libxslt/1.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 41fe1ed5415..2a7a66a88f5 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2004/02/18 09:52:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2004/02/18 13:42:00 jmmv Exp $
 bin/xslt-config
 bin/xsltproc
 include/libexslt/exslt.h
@@ -56,7 +56,13 @@ share/doc/html/libxslt/APIconstructors.html
 share/doc/html/libxslt/APIfiles.html
 share/doc/html/libxslt/APIfunctions.html
 share/doc/html/libxslt/APIsymbols.html
+share/doc/html/libxslt/EXSLT/bugs.html
+share/doc/html/libxslt/EXSLT/docs.html
+share/doc/html/libxslt/EXSLT/downloads.html
 share/doc/html/libxslt/EXSLT/exslt.html
+share/doc/html/libxslt/EXSLT/help.html
+share/doc/html/libxslt/EXSLT/index.html
+share/doc/html/libxslt/EXSLT/intro.html
 share/doc/html/libxslt/FAQ.html
 share/doc/html/libxslt/Libxslt-Logo-180x168.gif
 share/doc/html/libxslt/Libxslt-Logo-90x34.gif
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index 7545509f821..2a6a8d79b04 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.21 2004/02/17 16:47:23 jmmv Exp $
+$NetBSD: distinfo,v 1.22 2004/02/18 13:42:00 jmmv Exp $
 
 SHA1 (libxslt-1.1.3.tar.bz2) = 391ca3f8263eb0050a1cd536035d1f267b7b5688
 Size (libxslt-1.1.3.tar.bz2) = 1717022 bytes
-SHA1 (patch-aa) = a974a301a984703295a455272df8cca87fa3c4c7
+SHA1 (patch-aa) = faf71aa86a064a70ab396322e64ab94f259ccd11
diff --git a/textproc/libxslt/patches/patch-aa b/textproc/libxslt/patches/patch-aa
index c2d48feea4e..c10a8f84114 100644
--- a/textproc/libxslt/patches/patch-aa
+++ b/textproc/libxslt/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.11 2004/02/17 16:47:23 jmmv Exp $
+$NetBSD: patch-aa,v 1.12 2004/02/18 13:42:00 jmmv Exp $
 
 --- doc/Makefile.in.orig	2004-02-16 16:00:13.000000000 +0100
 +++ doc/Makefile.in
@@ -29,3 +29,119 @@ $NetBSD: patch-aa,v 1.11 2004/02/17 16:47:23 jmmv Exp $
  PAGES = API.html bugs.html contribs.html FAQ.html docs.html \
           downloads.html help.html index.html intro.html news.html \
  	 xsltproc2.html
+@@ -384,9 +384,9 @@ eapi:	EXSLT/libexslt-api.xml EXSLT/libex
+ web: $(PAGES) $(EPAGES)
+ 
+ $(PAGES): xslt.html $(srcdir)/site.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML Web pages from xslt.html" ; \
+-	  $(bindir)/xsltproc --nonet --html $(srcdir)/site.xsl \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet --html $(srcdir)/site.xsl \
+ 	    xslt.html > index.html ; fi )
+ 	-@(if [ -x $(bindir)/xmllint ] ; then \
+ 	  echo "Validating the HTML Web pages" ; \
+@@ -395,9 +395,9 @@ $(PAGES): xslt.html $(srcdir)/site.xsl
+ $(EPAGES): EXSLT/exslt.html $(srcdir)/site.xsl
+ 	 -@(if [ ! -d EXSLT/html ] ; then \
+ 	   mkdir -p EXSLT/html ; fi )
+-	 -@(if [ -x $(bindir)/xsltproc ] ; then \
++	 -@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	   echo "Rebuilding the HTML Web pages from exslt.html" ; \
+-	   $(bindir)/xsltproc --nonet --html \
++	   $(top_srcdir)/xsltproc/xsltproc --nonet --html \
+ 	   	--stringparam dirname EXSLT/ \
+ 		--stringparam libname libexslt \
+ 		--stringparam logo_base ../ \
+@@ -408,20 +408,20 @@ $(EPAGES): EXSLT/exslt.html $(srcdir)/si
+ 	   $(bindir)/xmllint --nonet --valid --noout $(EPAGES) ; fi );
+ 
+ ../NEWS: $(srcdir)/news.xsl news.html
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+-	  $(bindir)/xsltproc --nonet $(srcdir)/news.xsl \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/news.xsl \
+ 	    news.html > ../NEWS ; fi );
+ 
+ libxslt.xsa: $(srcdir)/xsa.xsl news.html
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+-	  $(bindir)/xsltproc --nonet $(srcdir)/xsa.xsl \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet $(srcdir)/xsa.xsl \
+ 	    news.html > libxslt.xsa ; fi );
+ 
+ $(APIPAGES): libxslt-refs.xml site.xsl api.xsl $(srcdir)/site.xsl \
+ 	     $(srcdir)/api.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML API pages from libxslt-refs.xml" ; \
+-	  $(bindir)/xsltproc --nonet --html \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet --html \
+ 			     $(srcdir)/api.xsl \
+ 			     xslt.html ; fi );
+ 	-@(if [ -x $(bindir)/xmllint ] ; then \
+@@ -429,9 +429,9 @@ $(APIPAGES): libxslt-refs.xml site.xsl a
+ 	  $(bindir)/xmllint --nonet --valid --noout API*.html; fi );
+ 
+ $(EAPIPAGES): EXSLT/libexslt-refs.xml site.xsl api.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML API pages from libexslt-refs.xml" ; \
+-	  $(bindir)/xsltproc --nonet --html --output EXSLT/ \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet --html --output EXSLT/ \
+ 			     --stringparam libname libexslt \
+ 			     --stringparam dirname EXSLT/ \
+ 			     --stringparam logo_base ../ \
+@@ -439,9 +439,9 @@ $(EAPIPAGES): EXSLT/libexslt-refs.xml si
+ 			     EXSLT/exslt.html ; fi );
+ 
+ html/index.html: libxslt-api.xml $(srcdir)/newapi.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML pages from the XSLT API" ; \
+-	  $(bindir)/xsltproc --nonet \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet \
+ 			     $(srcdir)/newapi.xsl libxslt-api.xml ; fi ); 
+ 	-@(if [ -x $(bindir)/xmllint ] ; then \
+ 	  echo "Validating the resulting XHTML pages" ; \
+@@ -449,9 +449,9 @@ html/index.html: libxslt-api.xml $(srcdi
+ 
+ EXSLT/html/index.html: EXSLT/libexslt-api.xml \
+ 	$(srcdir)/newapi.xsl
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
+ 	  echo "Rebuilding the HTML pages from the EXSLT API" ; \
+-	  $(bindir)/xsltproc --nonet --output EXSLT/ \
++	  $(top_srcdir)/xsltproc/xsltproc --nonet --output EXSLT/ \
+ 	  		     --stringparam libname libexslt \
+ 			     --stringparam dirname EXSLT/ \
+ 			     --stringparam logo_base ../../ \
+@@ -473,22 +473,22 @@ xsltproc.1: xsltproc.xml
+ # Note that in the following, xmllint output is piped to xsltproc
+ search.php: $(srcdir)/api.xsl $(srcdir)/site.xsl $(srcdir)/search.templ \
+             $(srcdir)/search.xml $(srcdir)/search.php.inc
+-	-@(if test -x $(bindir)/xmllint -a -x $(bindir)/xsltproc; then \
++	-@(if test -x $(bindir)/xmllint -a -x $(top_srcdir)/xsltproc/xsltproc; then \
+ 	   echo "Rebuilding search.php" ; \
+ 	   $(bindir)/xmllint --xinclude --nonet \
+ 	                      $(srcdir)/search.xml | \
+-	   $(bindir)/xsltproc --nonet - search.templ \
++	   $(top_srcdir)/xsltproc/xsltproc --nonet - search.templ \
+ 			      > search.php ; else \
+ 	   echo "Unable to find xmllint or xsltproc in $(bindir)" ; fi)
+ 
+ $(WIN32_DIR)/libxslt.def.src: libxslt-api.xml
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libxslt.def.src \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
++	  $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libxslt.def.src \
+ 	  --nonet $(WIN32_DIR)/defgen.xsl libxslt-api.xml ; fi )
+ 
+ $(WIN32_DIR)/libexslt.def.src: EXSLT/libexslt-api.xml
+-	-@(if [ -x $(bindir)/xsltproc ] ; then \
+-	  $(bindir)/xsltproc -o $(WIN32_DIR)/libexslt.def.src \
++	-@(if [ -x $(top_srcdir)/xsltproc/xsltproc ] ; then \
++	  $(top_srcdir)/xsltproc/xsltproc -o $(WIN32_DIR)/libexslt.def.src \
+ 	  --nonet $(WIN32_DIR)/defgen.xsl EXSLT/libexslt-api.xml ; fi )
+ 
+ clean-local: