- Unbreak after last USE_LIBTOOL changes;

- don't install .la files;
- don't use black magick to create/delete .so symlinks to shared libraries -
  our pkg_* tools already work correctly with symlinks.

3 files changed, 26 insertions, 21 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 5d1c06bd0149..923d0e9fe655 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -50,7 +50,6 @@ CONFIGURE_ARGS=	--with-iconvlibdir=${LOCALBASE}/lib
 .endif
 
 post-patch:
-	@${INSTALL_SCRIPT} ${LOCALBASE}/bin/libtool ${WRKSRC}
 .if ${OSVERSION} >= 500032
 	@${PERL} -pi.orig -e 's|expr |expr -- |' ${WRKSRC}/libtool
 .endif
diff --git a/graphics/graphviz/files/patch-aclocal.m4 b/graphics/graphviz/files/patch-aclocal.m4
index 175f3d4d321a..d90b04c106c7 100644
--- a/graphics/graphviz/files/patch-aclocal.m4
+++ b/graphics/graphviz/files/patch-aclocal.m4
@@ -1,5 +1,8 @@
---- aclocal.m4.tmp	Wed Apr 17 11:05:05 2002
-+++ aclocal.m4	Wed Apr 17 11:11:43 2002
+
+$FreeBSD$
+
+--- aclocal.m4.orig	Fri Apr 12 01:09:26 2002
++++ aclocal.m4	Thu Apr 25 13:37:28 2002
 @@ -59,10 +59,10 @@
  AC_REQUIRE([AC_ARG_PROGRAM])
  dnl FIXME This is truly gross.
@@ -15,3 +18,18 @@
  AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
  AC_REQUIRE([AC_PROG_MAKE_SET])])
  
+@@ -129,10 +129,13 @@
+ 
+ # serial 46 AC_PROG_LIBTOOL
+ AC_DEFUN([AC_PROG_LIBTOOL],
+-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++[
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
+ 
+ # 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/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index af458ad57171..69dbe8a3280b 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -110,35 +110,23 @@ lib/graphviz/lefty/lefty.psp
 lib/graphviz/lefty/slides.lefty
 lib/graphviz/lefty/tree.lefty
 lib/graphviz/libgdtclft.a
-lib/graphviz/libgdtclft.la
+lib/graphviz/libgdtclft.so
 lib/graphviz/libgdtclft.so.0
-@unexec rm -f %D/lib/graphviz/libgdtclft.so
-@exec ln -fs libgdtclft.so.0 %D/lib/graphviz/libgdtclft.so
 lib/graphviz/libtcldgl.a
-lib/graphviz/libtcldgl.la
+lib/graphviz/libtcldgl.so
 lib/graphviz/libtcldgl.so.0
-@unexec rm -f %D/lib/graphviz/libtcldgl.so
-@exec ln -fs libtcldgl.so.0 %D/lib/graphviz/libtcldgl.so
 lib/graphviz/libtcldgr.a
-lib/graphviz/libtcldgr.la
+lib/graphviz/libtcldgr.so
 lib/graphviz/libtcldgr.so.0
-@unexec rm -f %D/lib/graphviz/libtcldgr.so
-@exec ln -fs libtcldgr.so.0 %D/lib/graphviz/libtcldgr.so
 lib/graphviz/libtcldot.a
-lib/graphviz/libtcldot.la
+lib/graphviz/libtcldot.so
 lib/graphviz/libtcldot.so.0
-@unexec rm -f %D/lib/graphviz/libtcldot.so
-@exec ln -fs libtcldot.so.0 %D/lib/graphviz/libtcldot.so
 lib/graphviz/libtclplan.a
-lib/graphviz/libtclplan.la
+lib/graphviz/libtclplan.so
 lib/graphviz/libtclplan.so.0
-@unexec rm -f %D/lib/graphviz/libtclplan.so
-@exec ln -fs libtclplan.so.0 %D/lib/graphviz/libtclplan.so
 lib/graphviz/libtkspline.a
-lib/graphviz/libtkspline.la
+lib/graphviz/libtkspline.so
 lib/graphviz/libtkspline.so.0
-@unexec rm -f %D/lib/graphviz/libtkspline.so
-@exec ln -fs libtkspline.so.0 %D/lib/graphviz/libtkspline.so
 lib/graphviz/pkgIndex.tcl
 %%PORTDOCS%%share/doc/graphviz/Dot.ref
 %%PORTDOCS%%share/doc/graphviz/FAQ.html