Really buildlink'ify by using the xml2-config buildlink wrapper instead of

the real one, and move the HTML documentation to ${PREFIX}/share/doc/html.

4 files changed, 47 insertions, 30 deletions

diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 710861cbcd0..66b6ad0f560 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
+# $NetBSD: Makefile,v 1.2 2001/12/07 04:50:42 jlam Exp $
 
 DISTNAME=	libxslt-1.0.7
 PKGNAME=	${DISTNAME}
@@ -15,7 +15,8 @@ USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+CONFIGURE_ARGS+=	--with-libxml-prefix=${BUILDLINK_DIR}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 .include "../../textproc/libxml2/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/libxslt/PLIST b/textproc/libxslt/PLIST
index 87f1eafc037..56b87a8138d 100644
--- a/textproc/libxslt/PLIST
+++ b/textproc/libxslt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/07 04:50:42 jlam Exp $
 bin/xslt-config
 bin/xsltproc
 include/breakpoint/breakpoint.h
@@ -41,28 +41,27 @@ lib/xsltConf.sh
 man/man1/xsltproc.1
 man/man4/libexslt.4
 man/man4/libxslt.4
-share/doc/libxslt/html/book1.html
-share/doc/libxslt/html/libxslt-attributes.html
-share/doc/libxslt/html/libxslt-functions.html
-share/doc/libxslt/html/libxslt-imports.html
-share/doc/libxslt/html/libxslt-keys.html
-share/doc/libxslt/html/libxslt-lib.html
-share/doc/libxslt/html/libxslt-namespaces.html
-share/doc/libxslt/html/libxslt-notes.html
-share/doc/libxslt/html/libxslt-numbersinternals.html
-share/doc/libxslt/html/libxslt-pattern.html
-share/doc/libxslt/html/libxslt-templates.html
-share/doc/libxslt/html/libxslt-transform.html
-share/doc/libxslt/html/libxslt-variables.html
-share/doc/libxslt/html/libxslt-xslt.html
-share/doc/libxslt/html/libxslt-xsltinternals.html
-share/doc/libxslt/html/libxslt-xsltutils.html
-share/doc/libxslt/html/tutorial/libxslt_tutorial.c
-share/doc/libxslt/html/tutorial/libxslttutorial.html
-share/doc/libxslt/html/tutorial/libxslttutorial.xml
-@dirrm share/doc/libxslt/html/tutorial
-@dirrm share/doc/libxslt/html
-@dirrm share/doc/libxslt
+share/doc/html/libxslt/book1.html
+share/doc/html/libxslt/libxslt-attributes.html
+share/doc/html/libxslt/libxslt-functions.html
+share/doc/html/libxslt/libxslt-imports.html
+share/doc/html/libxslt/libxslt-keys.html
+share/doc/html/libxslt/libxslt-lib.html
+share/doc/html/libxslt/libxslt-namespaces.html
+share/doc/html/libxslt/libxslt-notes.html
+share/doc/html/libxslt/libxslt-numbersinternals.html
+share/doc/html/libxslt/libxslt-pattern.html
+share/doc/html/libxslt/libxslt-templates.html
+share/doc/html/libxslt/libxslt-transform.html
+share/doc/html/libxslt/libxslt-variables.html
+share/doc/html/libxslt/libxslt-xslt.html
+share/doc/html/libxslt/libxslt-xsltinternals.html
+share/doc/html/libxslt/libxslt-xsltutils.html
+share/doc/html/libxslt/tutorial/libxslt_tutorial.c
+share/doc/html/libxslt/tutorial/libxslttutorial.html
+share/doc/html/libxslt/tutorial/libxslttutorial.xml
+@dirrm share/doc/html/libxslt/tutorial
+@dirrm share/doc/html/libxslt
 @dirrm include/libxslt
 @dirrm include/libexslt
 @dirrm include/breakpoint
diff --git a/textproc/libxslt/distinfo b/textproc/libxslt/distinfo
index c17248e04b1..3b8f690a01e 100644
--- a/textproc/libxslt/distinfo
+++ b/textproc/libxslt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
+$NetBSD: distinfo,v 1.2 2001/12/07 04:50:42 jlam Exp $
 
 SHA1 (libxslt-1.0.7.tar.gz) = 93470cf263b80cdfafb033ee1a3a45f60e4b9c30
 Size (libxslt-1.0.7.tar.gz) = 1989123 bytes
 SHA1 (patch-aa) = 46c2ff041b0476ed2efc7c93aba4e7d1aafe90b9
-SHA1 (patch-ab) = 49524b9ab94472052413cfab9ce9d2f7e99aeebc
+SHA1 (patch-ab) = 2ab94916403eca7a90b56cc1dedafe8cb2090597
diff --git a/textproc/libxslt/patches/patch-ab b/textproc/libxslt/patches/patch-ab
index 8ec364102ea..16e11ad7775 100644
--- a/textproc/libxslt/patches/patch-ab
+++ b/textproc/libxslt/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
+$NetBSD: patch-ab,v 1.2 2001/12/07 04:50:43 jlam Exp $
 
---- doc/Makefile.in.orig	Sun Nov 11 02:52:38 2001
-+++ doc/Makefile.in	Fri Nov 23 11:22:33 2001
+--- doc/Makefile.in.orig	Sat Nov 10 08:52:38 2001
++++ doc/Makefile.in
 @@ -104,7 +104,7 @@
  XSLT_LIBDIR = @XSLT_LIBDIR@
  XSLT_LIBS = @XSLT_LIBS@
@@ -11,3 +11,20 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/11/23 08:34:25 martti Exp $
  
  # The top-level SGML file.
  DOC_MAIN_SGML_FILE = libxslt.sgml
+@@ -114,7 +114,7 @@
+ 
+ HTML_DIR = @HTML_DIR@
+ 
+-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)/html
++TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ PAGES = API.html bugs.html contribs.html docs.html downloads.html \
+        help.html index.html intro.html news.html xsltproc2.html
+ 
+@@ -305,7 +305,6 @@
+ 	-@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+ 	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)/tutorial
+ 	-@INSTALL@ -m 0644 $(srcdir)/tutorial/* $(DESTDIR)$(TARGET_DIR)/tutorial
+-	-(cd $(DESTDIR); gtkdoc-fixxref --module=libxslt --html-dir=$(HTML_DIR))
+ 
+ dist-hook:
+ 	(cd $(srcdir) ; tar cvf - *.1 *.html site.xsl *.gif html/*.html html/*.sgml tutorial/libxslt*) | (cd $(distdir); tar xf -)