2 files changed, 42 insertions, 54 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index a87b6a268f0b..84ff1624b259 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	graphviz
 PORTVERSION=	2.36.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics tk
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/
 
@@ -17,15 +17,14 @@ LIB_DEPENDS+=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libexpat.so:${PORTSDIR}/textproc/expat2 \
 		libgd.so:${PORTSDIR}/${GD_PORT}
 
-USES=		bison gmake pkgconfig shebangfix
-USE_AUTOTOOLS=	libltdl libtool
-WANT_GNOME=	yes
+USES=		bison gmake libtool:keepla pathfix pkgconfig shebangfix
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
-MAKE_ENV=	EXPR_COMPAT=yes MISSING=${TRUE}
+MAKE_ENV=	EXPR_COMPAT=yes
 
 SHEBANG_LANG=	tcl
 tcl_OLD_CMD=	/usr/bin/tclsh
@@ -166,8 +165,6 @@ CONFIGURE_ARGS+=	--program-transform-name="s/x/x/" \
 		--disable-io --disable-ocaml --disable-java \
 		--disable-sharp
 
-CONFIGURE_ENV+=	MISSING=${TRUE}
-
 .if ${PORT_OPTIONS:MGUILE}
 BROKEN=	guile is too old
 .endif
@@ -273,7 +270,6 @@ SHEBANG_FILES+=	tclpkg/gv/demo/modgraph.tcl
 post-patch:
 	${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} \
-		-e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
 		-e "s|\([^:]*:.*\) install-pdfDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-htmlDATA\(.*\)|\1\2|g" \
 		-e "s|\([^:]*:.*\) install-txtDATA\(.*\)|\1\2|g" \
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index 53e1df33a516..a3c10b8a80da 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -77,163 +77,155 @@ include/graphviz/usershape.h
 include/graphviz/vis.h
 include/graphviz/vispath.h
 include/graphviz/xdot.h
+lib/graphviz/libcdt.la
 lib/graphviz/libcdt.so
 lib/graphviz/libcdt.so.5
-lib/graphviz/libcdt.la
-lib/graphviz/libcdt.a
+lib/graphviz/libcdt.so.5.0.0
+lib/graphviz/libcgraph.la
 lib/graphviz/libcgraph.so
 lib/graphviz/libcgraph.so.6
-lib/graphviz/libcgraph.la
-lib/graphviz/libcgraph.a
+lib/graphviz/libcgraph.so.6.0.0
+lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.so
 lib/graphviz/libpathplan.so.4
-lib/graphviz/libpathplan.la
-lib/graphviz/libpathplan.a
+lib/graphviz/libpathplan.so.4.0.0
+lib/graphviz/libgvc.la
 lib/graphviz/libgvc.so
 lib/graphviz/libgvc.so.6
-lib/graphviz/libgvc.la
-lib/graphviz/libgvc.a
+lib/graphviz/libgvc.so.6.0.0
+lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_core.so
 lib/graphviz/libgvplugin_core.so.6
-lib/graphviz/libgvplugin_core.la
-lib/graphviz/libgvplugin_core.a
+lib/graphviz/libgvplugin_core.so.6.0.0
+lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.so
 lib/graphviz/libgvplugin_dot_layout.so.6
-lib/graphviz/libgvplugin_dot_layout.la
-lib/graphviz/libgvplugin_dot_layout.a
+lib/graphviz/libgvplugin_dot_layout.so.6.0.0
+lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.so
 lib/graphviz/libgvplugin_gd.so.6
-lib/graphviz/libgvplugin_gd.la
-lib/graphviz/libgvplugin_gd.a
-%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.a
+lib/graphviz/libgvplugin_gd.so.6.0.0
 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.la
 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so
 %%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6
-%%GTK2%%lib/graphviz/libgvplugin_gtk.a
+%%GHOSTSCRIPT%%lib/graphviz/libgvplugin_gs.so.6.0.0
 %%GTK2%%lib/graphviz/libgvplugin_gtk.la
 %%GTK2%%lib/graphviz/libgvplugin_gtk.so
 %%GTK2%%lib/graphviz/libgvplugin_gtk.so.6
-%%MING%%lib/graphviz/libgvplugin_ming.a
+%%GTK2%%lib/graphviz/libgvplugin_gtk.so.6.0.0
 %%MING%%lib/graphviz/libgvplugin_ming.la
 %%MING%%lib/graphviz/libgvplugin_ming.so
 %%MING%%lib/graphviz/libgvplugin_ming.so.6
-%%GDK%%lib/graphviz/libgvplugin_gdk.a
+%%MING%%lib/graphviz/libgvplugin_ming.so.6.0.0
 %%GDK%%lib/graphviz/libgvplugin_gdk.la
 %%GDK%%lib/graphviz/libgvplugin_gdk.so
 %%GDK%%lib/graphviz/libgvplugin_gdk.so.6
+%%GDK%%lib/graphviz/libgvplugin_gdk.so.6.0.0
+lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.so
 lib/graphviz/libgvplugin_neato_layout.so.6
-lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_neato_layout.a
+lib/graphviz/libgvplugin_neato_layout.so.6.0.0
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
 %%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
 %%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6
-%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
-%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
-%%POPPLER%%lib/graphviz/libgvplugin_poppler.a
+%%PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.6.0.0
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.la
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so
 %%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6
-%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.a
+%%POPPLER%%lib/graphviz/libgvplugin_poppler.so.6.0.0
 %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.la
 %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so
 %%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6
-lib/graphviz/libgvpr.a
+%%PANGOCAIRO%%%%XPM%%lib/graphviz/libgvplugin_xlib.so.6.0.0
 lib/graphviz/libgvpr.la
 lib/graphviz/libgvpr.so
 lib/graphviz/libgvpr.so.2
-%%GUILE%%lib/graphviz/guile/libgv_guile.a
+lib/graphviz/libgvpr.so.2.0.0
 %%GUILE%%lib/graphviz/guile/libgv_guile.la
 %%GUILE%%lib/graphviz/guile/libgv_guile.so
 %%PHP%%lib/graphviz/php/gv.php
 %%PHP%%lib/graphviz/php/gv.so
-%%PHP%%lib/graphviz/php/libgv_php.a
 %%PHP%%lib/graphviz/php/libgv_php.la
 %%PHP%%lib/graphviz/php/libgv_php.so
 %%PHP%%lib/php/%%PHP_EXT_DIR%%/gv.so
-%%TCL%%lib/graphviz/tcl/libgdtclft.a
 %%TCL%%lib/graphviz/tcl/libgdtclft.la
 %%TCL%%lib/graphviz/tcl/libgdtclft.so
 %%TCL%%lib/graphviz/tcl/libgdtclft.so.0
-%%TCL%%lib/graphviz/tcl/libgv_tcl.a
+%%TCL%%lib/graphviz/tcl/libgdtclft.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libgv_tcl.la
 %%TCL%%lib/graphviz/tcl/libgv_tcl.so
-%%TCL%%lib/graphviz/tcl/libtcldot.a
 %%TCL%%lib/graphviz/tcl/libtcldot.la
 %%TCL%%lib/graphviz/tcl/libtcldot.so
 %%TCL%%lib/graphviz/tcl/libtcldot.so.0
-%%TCL%%lib/graphviz/tcl/libtcldot_builtin.a
+%%TCL%%lib/graphviz/tcl/libtcldot.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libtcldot_builtin.la
 %%TCL%%lib/graphviz/tcl/libtcldot_builtin.so
 %%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0
-%%TCL%%lib/graphviz/tcl/libtclplan.a
+%%TCL%%lib/graphviz/tcl/libtcldot_builtin.so.0.0.0
 %%TCL%%lib/graphviz/tcl/libtclplan.la
 %%TCL%%lib/graphviz/tcl/libtclplan.so
 %%TCL%%lib/graphviz/tcl/libtclplan.so.0
+%%TCL%%lib/graphviz/tcl/libtclplan.so.0.0.0
 %%TCL%%lib/graphviz/tcl/pkgIndex.tcl
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.a
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.a
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgdtclft.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libgv_tcl.so
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.a
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.a
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.a
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtcldot_builtin.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0
-%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.a
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtclplan.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.la
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0
+%%TCL%%lib/tcl%%TCL_VER%%/graphviz/libtkspline.so.0.0.0
 %%TCL%%lib/tcl%%TCL_VER%%/graphviz/pkgIndex.tcl
-%%TK%%lib/graphviz/tcl/libtkspline.a
 %%TK%%lib/graphviz/tcl/libtkspline.la
 %%TK%%lib/graphviz/tcl/libtkspline.so
 %%TK%%lib/graphviz/tcl/libtkspline.so.0
+%%TK%%lib/graphviz/tcl/libtkspline.so.0.0.0
 %%LUA%%lib/graphviz/lua/gv.so
-%%LUA%%lib/graphviz/lua/libgv_lua.a
 %%LUA%%lib/graphviz/lua/libgv_lua.la
 %%LUA%%lib/graphviz/lua/libgv_lua.so
 %%LUA%%lib/lua/%%LUA_VER%%/gv.so
 %%PERL%%lib/graphviz/perl/gv.so
 %%PERL%%lib/graphviz/perl/gv.pm
-%%PERL%%lib/graphviz/perl/libgv_perl.a
 %%PERL%%lib/graphviz/perl/libgv_perl.la
 %%PERL%%lib/graphviz/perl/libgv_perl.so
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.pm
 %%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/gv.so
 %%PYTHON%%lib/graphviz/python/_gv.so
 %%PYTHON%%lib/graphviz/python/gv.py
-%%PYTHON%%lib/graphviz/python/libgv_python.a
 %%PYTHON%%lib/graphviz/python/libgv_python.la
 %%PYTHON%%lib/graphviz/python/libgv_python.so
 %%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/_gv.so
 %%PYTHON%%%%PYTHON_LIBDIR%%/site-packages/gv.py
 %%RUBY%%lib/graphviz/ruby/gv.so
-%%RUBY%%lib/graphviz/ruby/libgv_ruby.a
 %%RUBY%%lib/graphviz/ruby/libgv_ruby.la
 %%RUBY%%lib/graphviz/ruby/libgv_ruby.so
 %%RUBY%%%%RUBY_SITEARCHLIBDIR%%/gv.so
-%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.a
 %%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.la
 %%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so
 %%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so.6
-%%DEVIL%%lib/graphviz/libgvplugin_devil.a
+%%LIBRSVG2%%lib/graphviz/libgvplugin_rsvg.so.6.0.0
 %%DEVIL%%lib/graphviz/libgvplugin_devil.la
 %%DEVIL%%lib/graphviz/libgvplugin_devil.so
 %%DEVIL%%lib/graphviz/libgvplugin_devil.so.6
-lib/graphviz/libxdot.a
+%%DEVIL%%lib/graphviz/libgvplugin_devil.so.6.0.0
 lib/graphviz/libxdot.la
 lib/graphviz/libxdot.so
 lib/graphviz/libxdot.so.4
+lib/graphviz/libxdot.so.4.0.0
 @exec %D/bin/dot -c
 @unexec rm -f %D/lib/graphviz/config6
 libdata/pkgconfig/libcdt.pc