- Hack for better hier(7) conformance - install documentation into

  ${PREFIX}/share/doc;
- use USE_LIBTOOL.

5 files changed, 54 insertions, 56 deletions

diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 3ae827ad1226..09f42dab1e16 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libxml
 PORTVERSION=	1.8.17
+PORTREVISION=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	stable/sources/libxml
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 pre-patch:
diff --git a/textproc/libxml/files/patch-configure b/textproc/libxml/files/patch-configure
new file mode 100644
index 000000000000..d52557d43684
--- /dev/null
+++ b/textproc/libxml/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/30 21:56:31	1.1
++++ configure	2002/04/30 21:56:55
+@@ -5263,6 +5263,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/textproc/libxml/files/patch-doc::Makefile.in b/textproc/libxml/files/patch-doc::Makefile.in
new file mode 100644
index 000000000000..6c9ba1eada7a
--- /dev/null
+++ b/textproc/libxml/files/patch-doc::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- doc/Makefile.in	2002/04/30 21:49:33	1.1
++++ doc/Makefile.in	2002/04/30 21:51:26
+@@ -106,7 +106,7 @@
+ # The directory containing the source code (if it contains documentation).
+ DOC_SOURCE_DIR = ..
+ 
+-HTML_DIR = $(datadir)/gnome-xml/html
++HTML_DIR = $(prefix)/share/doc
+ 
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/textproc/libxml/files/patch-ltmain.sh b/textproc/libxml/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/textproc/libxml/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh	2001/08/27 09:51:26	1.1
-+++ ltmain.sh	2001/08/27 09:51:42
-@@ -2408,6 +2408,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4175,10 +4178,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/textproc/libxml/pkg-plist b/textproc/libxml/pkg-plist
index abc0c1ada369..d8e47c349db3 100644
--- a/textproc/libxml/pkg-plist
+++ b/textproc/libxml/pkg-plist
@@ -22,33 +22,31 @@ lib/libxml.a
 lib/libxml.so
 lib/libxml.so.5
 libdata/pkgconfig/libxml.pc
-share/gnome-xml/html/gnome-xml/DOM.gif
-share/gnome-xml/html/gnome-xml/book1.html
-share/gnome-xml/html/gnome-xml/gnome-xml-debugxml.html
-share/gnome-xml/html/gnome-xml/gnome-xml-encoding.html
-share/gnome-xml/html/gnome-xml/gnome-xml-entities.html
-share/gnome-xml/html/gnome-xml/gnome-xml-error.html
-share/gnome-xml/html/gnome-xml/gnome-xml-htmlparser.html
-share/gnome-xml/html/gnome-xml/gnome-xml-htmltree.html
-share/gnome-xml/html/gnome-xml/gnome-xml-nanoftp.html
-share/gnome-xml/html/gnome-xml/gnome-xml-nanohttp.html
-share/gnome-xml/html/gnome-xml/gnome-xml-parser.html
-share/gnome-xml/html/gnome-xml/gnome-xml-parserinternals.html
-share/gnome-xml/html/gnome-xml/gnome-xml-sax.html
-share/gnome-xml/html/gnome-xml/gnome-xml-tree.html
-share/gnome-xml/html/gnome-xml/gnome-xml-valid.html
-share/gnome-xml/html/gnome-xml/gnome-xml-xml-error.html
-share/gnome-xml/html/gnome-xml/gnome-xml-xmlio.html
-share/gnome-xml/html/gnome-xml/gnome-xml-xmlmemory.html
-share/gnome-xml/html/gnome-xml/gnome-xml-xpath.html
-share/gnome-xml/html/gnome-xml/index.sgml
-share/gnome-xml/html/gnome-xml/libxml-lib.html
-share/gnome-xml/html/gnome-xml/libxml-notes.html
-share/gnome-xml/html/gnome-xml/structure.gif
-share/gnome-xml/html/gnome-xml/xml.html
+share/doc/gnome-xml/DOM.gif
+share/doc/gnome-xml/book1.html
+share/doc/gnome-xml/gnome-xml-debugxml.html
+share/doc/gnome-xml/gnome-xml-encoding.html
+share/doc/gnome-xml/gnome-xml-entities.html
+share/doc/gnome-xml/gnome-xml-error.html
+share/doc/gnome-xml/gnome-xml-htmlparser.html
+share/doc/gnome-xml/gnome-xml-htmltree.html
+share/doc/gnome-xml/gnome-xml-nanoftp.html
+share/doc/gnome-xml/gnome-xml-nanohttp.html
+share/doc/gnome-xml/gnome-xml-parser.html
+share/doc/gnome-xml/gnome-xml-parserinternals.html
+share/doc/gnome-xml/gnome-xml-sax.html
+share/doc/gnome-xml/gnome-xml-tree.html
+share/doc/gnome-xml/gnome-xml-valid.html
+share/doc/gnome-xml/gnome-xml-xml-error.html
+share/doc/gnome-xml/gnome-xml-xmlio.html
+share/doc/gnome-xml/gnome-xml-xmlmemory.html
+share/doc/gnome-xml/gnome-xml-xpath.html
+share/doc/gnome-xml/index.sgml
+share/doc/gnome-xml/libxml-lib.html
+share/doc/gnome-xml/libxml-notes.html
+share/doc/gnome-xml/structure.gif
+share/doc/gnome-xml/xml.html
 @exec ln -sf . %D/include/gnome-xml/libxml
 @unexec rm -f %D/include/gnome-xml/libxml
-@dirrm share/gnome-xml/html/gnome-xml
-@dirrm share/gnome-xml/html
-@dirrm share/gnome-xml
+@dirrm share/doc/gnome-xml
 @dirrm include/gnome-xml