SHARED_LIBS and USE_LIBTOOL

libtool reminder and ok sturm@

textproc/libxml/Makefile

@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.91 2005/09/04 23:38:18 espie Exp $
+# $OpenBSD: Makefile,v 1.92 2005/12/25 16:33:47 steven Exp $
 
 COMMENT=		"XML parsing library"
 
 VERSION=		2.6.16
 DISTNAME=		libxml2-${VERSION}
-PKGNAME=		libxml-${VERSION}p6
+PKGNAME=		libxml-${VERSION}p7
+SHARED_LIBS=		xml2	9.0
+MODGNU_SHARED_LIBS=	xml2	''
 CATEGORIES=		textproc
 MASTER_SITES=		ftp://xmlsoft.org/ \
 			${MASTER_SITE_GNOME:=sources/libxml2/2.6/}
@@ -21,6 +23,7 @@ WANTLIB=		c m z
 
 MODULES=		converters/libiconv
 
+USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--enable-static
@@ -30,8 +33,6 @@ CONFIGURE_ARGS+=	--with-iconv="${DEPBASE}"
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-threads
 
-MAKE_FLAGS=	libxml2_la_LDFLAGS='-version-info 9:0:0'
-
 post-configure:
 	sed -e 's,@PREFIX@,${PREFIX},' <${FILESDIR}/rebuild >${WRKBUILD}/rebuild
 

textproc/libxml/patches/patch-ltmain_sh

@@ -1,44 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.2 2003/12/13 12:55:45 kevlo Exp $
---- ltmain.sh.orig	2003-12-10 11:56:51.000000000 +0000
-+++ ltmain.sh	2003-12-13 20:45:22.000000000 +0000
-@@ -5705,40 +5705,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
- 
--    $echo "----------------------------------------------------------------------"
--    $echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      $echo "   $libdir"
--    done
--    $echo
--    $echo "If you ever happen to want to link against installed libraries"
--    $echo "in a given directory, LIBDIR, you must either use libtool, and"
--    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    $echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      $echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      $echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      $echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      $echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    $echo
--    $echo "See any operating system documentation about shared libraries for"
--    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    $echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 

textproc/libxml/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.57 2004/11/11 20:55:28 espie Exp $
-@lib lib/libxml2.so.9.0
+@comment $OpenBSD: PFRAG.shared,v 1.58 2005/12/25 16:33:47 steven Exp $
+@lib lib/libxml2.so.${LIBxml2_VERSION}

textproc/libxml/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.37 2005/09/04 23:38:18 espie Exp $
+@comment $OpenBSD: PLIST,v 1.38 2005/12/25 16:33:47 steven Exp $
 %%SHARED%%
 bin/xml2-config
 bin/xmlcatalog
@@ -62,8 +62,6 @@ share/aclocal/libxml.m4
 @man man/man1/xmlcatalog.1
 @man man/man1/xmllint.1
 @man man/man3/libxml.3
-share/libxml2/
-share/libxml2/rebuild
 share/doc/libxml2/
 share/doc/libxml2/Copyright
 share/doc/libxml2/examples/
@@ -190,4 +188,6 @@ share/doc/libxml2/html/tutorial/xmltutorial.pdf
 share/doc/libxml2/html/w3c.png
 share/doc/libxml2/html/xml.html
 @exec %D/share/libxml2/rebuild
+share/libxml2/
+share/libxml2/rebuild
 @extra /var/db/xmlcatalog