Fix a lot of problems caused by th recent update:

1.) Add missing RCS Ids.
2.) Add missing ".pdf" files to the package list.
3.) Remove all entries for ".so*" and ".a" files and let "pkgsrc"
    derive them automatically from the ".la" files.
4.) Fix interpreter path in two example scripts.

Bump package revision after all these fixes.

4 files changed, 28 insertions, 51 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index e87cab1f0eb..431eec1554a 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2009/02/26 19:45:14 sno Exp $
+# $NetBSD: Makefile,v 1.68 2009/03/01 21:58:53 tron Exp $
 
 DISTNAME=	graphviz-2.20.3
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/stable/SOURCES/
 
@@ -29,7 +30,7 @@ CONFIGURE_ARGS+=	--disable-sharp
 CONFIGURE_ENV+=		ac_cv_prog_PHP=
 CONFIGURE_ENV+=		ac_cv_prog_RUBY=
 CPPFLAGS+=		-DNO_POSTSCRIPT_ALIAS=1
-PKGCONFIG_OVERRIDE=		lib/agraph/libagraph.pc.in
+PKGCONFIG_OVERRIDE=	lib/agraph/libagraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/cdt/libcdt.pc.in
 PKGCONFIG_OVERRIDE+=	lib/cgraph/libcgraph.pc.in
 PKGCONFIG_OVERRIDE+=	lib/expr/libexpr.pc.in
@@ -39,6 +40,16 @@ PKGCONFIG_OVERRIDE+=	lib/gvc/libgvc_builtins.pc.in
 PKGCONFIG_OVERRIDE+=	lib/pathplan/libpathplan.pc.in
 XAW_TYPE=		standard
 
+REPLACE_INTERPRETER+=	lua
+REPLACE.lua.old=	.*lua
+REPLACE.lua.new=	${PREFIX}/bin/lua
+REPLACE_FILES.lua=	tclpkg/gv/demo/modgraph.lua
+
+REPLACE_INTERPRETER+=	tclsh
+REPLACE.tclsh.old=	.*tclsh
+REPLACE.tclsh.new=	${PREFIX}/bin/tclsh
+REPLACE_FILES.tclsh=	tclpkg/gv/demo/modgraph.tcl
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../mk/compiler.mk"
@@ -46,10 +57,14 @@ XAW_TYPE=		standard
 BUILDLINK_TRANSFORM+=	rm:-Wno-unused-parameter
 .endif
 
-# prevent another config.status run
+# Prevent another config.status run.
 pre-build:
 	touch ${WRKSRC}/Makefile
 
+# Remove file created by re-linking "libgv_lua.la".
+post-install:
+	${RM} -f ${PREFIX}/lib/graphviz/lua/gv.so
+
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST
index fa5b8e71f37..de2d6d2c580 100644
--- a/graphics/graphviz/PLIST
+++ b/graphics/graphviz/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.27 2009/03/01 21:58:53 tron Exp $
 bin/acyclic
 bin/bcomps
 bin/ccomps
@@ -44,37 +45,16 @@ include/graphviz/pathplan.h
 include/graphviz/textpara.h
 include/graphviz/types.h
 include/graphviz/usershape.h
-lib/graphviz/config
-lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_core.la
-lib/graphviz/libgvplugin_core.so.5
-lib/graphviz/libgvplugin_dot_layout.a
 lib/graphviz/libgvplugin_dot_layout.la
-lib/graphviz/libgvplugin_dot_layout.so.5
-lib/graphviz/libgvplugin_gd.a
 lib/graphviz/libgvplugin_gd.la
-lib/graphviz/libgvplugin_gd.so.5
-lib/graphviz/libgvplugin_neato_layout.a
 lib/graphviz/libgvplugin_neato_layout.la
-lib/graphviz/libgvplugin_neato_layout.so.5
-lib/libagraph.a
 lib/libagraph.la
-lib/libagraph.so.4
-lib/libcdt.a
 lib/libcdt.la
-lib/libcdt.so.4
-lib/libcgraph.a
 lib/libcgraph.la
-lib/libcgraph.so.4
-lib/libgraph.a
 lib/libgraph.la
-lib/libgraph.so.4
-lib/libgvc.a
 lib/libgvc.la
-lib/libgvc.so.4
-lib/libpathplan.a
 lib/libpathplan.la
-lib/libpathplan.so.4
 lib/pkgconfig/libagraph.pc
 lib/pkgconfig/libcdt.pc
 lib/pkgconfig/libcgraph.pc
@@ -237,11 +217,14 @@ share/graphviz/doc/pdf/bcomps.pdf
 share/graphviz/doc/pdf/ccomps.pdf
 share/graphviz/doc/pdf/cdt.pdf
 share/graphviz/doc/pdf/cgraph.pdf
+share/graphviz/doc/pdf/circo.pdf
 share/graphviz/doc/pdf/dijkstra.pdf
 share/graphviz/doc/pdf/dot.pdf
+share/graphviz/doc/pdf/dot2gxl.pdf
 share/graphviz/doc/pdf/dotguide.pdf
 share/graphviz/doc/pdf/dotty.pdf
 share/graphviz/doc/pdf/dottyguide.pdf
+share/graphviz/doc/pdf/fdp.pdf
 share/graphviz/doc/pdf/gc.pdf
 share/graphviz/doc/pdf/graph.pdf
 share/graphviz/doc/pdf/gvc.pdf
@@ -251,6 +234,7 @@ share/graphviz/doc/pdf/gvpr.pdf
 share/graphviz/doc/pdf/gxl2dot.pdf
 share/graphviz/doc/pdf/leftyguide.pdf
 share/graphviz/doc/pdf/lneato.pdf
+share/graphviz/doc/pdf/neato.pdf
 share/graphviz/doc/pdf/neatoguide.pdf
 share/graphviz/doc/pdf/nop.pdf
 share/graphviz/doc/pdf/pathplan.pdf
@@ -258,6 +242,7 @@ share/graphviz/doc/pdf/prune.pdf
 share/graphviz/doc/pdf/sccmap.pdf
 share/graphviz/doc/pdf/tred.pdf
 share/graphviz/doc/pdf/unflatten.pdf
+share/graphviz/doc/pdf/twopi.pdf
 share/graphviz/graphs/directed/KW91.dot
 share/graphviz/graphs/directed/Latin1.dot
 share/graphviz/graphs/directed/NaN.dot
@@ -327,36 +312,18 @@ share/graphviz/lefty/lefty.psp
 share/graphviz/lefty/slides.lefty
 share/graphviz/lefty/tree.lefty
 ${PLIST.x11}share/graphviz/doc/pdf/lefty.pdf
-${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.a
 ${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la
-${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.so.5
-${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.a
 ${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.la
-${PLIST.pangocairo}lib/graphviz/libgvplugin_xlib.so.5
-${PLIST.guile}lib/graphviz/guile/libgv_guile.a
 ${PLIST.guile}lib/graphviz/guile/libgv_guile.la
-${PLIST.guile}lib/graphviz/guile/libgv_guile.so
-${PLIST.lua}lib/graphviz/lua/libgv_lua.a
 ${PLIST.lua}lib/graphviz/lua/libgv_lua.la
-${PLIST.lua}lib/graphviz/lua/libgv_lua.so
 ${PLIST.guile}man/mann/gv_guile.n
 ${PLIST.lua}man/mann/gv_lua.n
 ${PLIST.lua}share/graphviz/demo/modgraph.lua
-${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.a
 ${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.la
-${PLIST.tcl}lib/graphviz/tcl/libgv_tcl.so
-${PLIST.tcl}lib/graphviz/tcl/libtcldot.a
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot.la
-${PLIST.tcl}lib/graphviz/tcl/libtcldot.so.0
-${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.a
 ${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.la
-${PLIST.tcl}lib/graphviz/tcl/libtcldot_builtin.so.0
-${PLIST.tcl}lib/graphviz/tcl/libtclplan.a
 ${PLIST.tcl}lib/graphviz/tcl/libtclplan.la
-${PLIST.tcl}lib/graphviz/tcl/libtclplan.so.0
-${PLIST.tcl}lib/graphviz/tcl/libtkspline.a
 ${PLIST.tcl}lib/graphviz/tcl/libtkspline.la
-${PLIST.tcl}lib/graphviz/tcl/libtkspline.so.0
 ${PLIST.tcl}lib/graphviz/tcl/pkgIndex.tcl
 ${PLIST.tcl}man/mann/gv_tcl.n
 ${PLIST.tcl}man/mann/tcldot.n
@@ -388,16 +355,10 @@ ${PLIST.tcl}share/graphviz/demo/spline.tcl.README
 ${PLIST.tcl}share/graphviz/doc/html/tcldot.html
 ${PLIST.tcl}share/graphviz/doc/pdf/tcldot.pdf
 ${PLIST.tcl}share/graphviz/doc/pdf/tkspline.pdf
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.a
 ${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.so.5
-${PLIST.gtk}lib/graphviz/libgvplugin_gtk.a
 ${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la
-${PLIST.gtk}lib/graphviz/libgvplugin_gtk.so.5
 ${PLIST.gd}bin/diffimg
-${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.a
 ${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.la
-${PLIST.gd}${PLIST.tcl}lib/graphviz/tcl/libgdtclft.so.0
 ${PLIST.gd}${PLIST.tcl}man/mann/gdtclft.n
 ${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 @exec ${MKDIR} %D/share/graphviz/smyrna
@@ -444,4 +405,3 @@ ${PLIST.gd}${PLIST.tcl}share/graphviz/doc/pdf/gdtclft.pdf
 @dirrm lib/graphviz/R
 @dirrm lib/graphviz
 @dirrm include/graphviz
-
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index d70fc0bc769..8e19c9df382 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.31 2009/02/28 13:19:46 drochner Exp $
+$NetBSD: distinfo,v 1.32 2009/03/01 21:58:53 tron Exp $
 
 SHA1 (graphviz-2.20.3.tar.gz) = 63ae6bdb6b410387477d339225cc4f61c2bc7322
 RMD160 (graphviz-2.20.3.tar.gz) = 64c80f3af55668e487f911132407c332c3c38e87
 Size (graphviz-2.20.3.tar.gz) = 13381532 bytes
-SHA1 (patch-aa) = 6670dcf2d00ee81012b1acbc3bc141f9405c0b30
+SHA1 (patch-aa) = fa1bf1e617a0a5fe061cfea71cfbe64a33168d86
 SHA1 (patch-ab) = 44dfdec30508583afaa1d44d4bda54341290356b
 SHA1 (patch-ag) = 4b89f087ba96d29b92a1b8c46e3ac041039df459
 SHA1 (patch-aj) = 0adc177fb7c3e654cf46560a8c91e2712bc7d16a
diff --git a/graphics/graphviz/patches/patch-aa b/graphics/graphviz/patches/patch-aa
index a5dbf252716..b6ae57bdc77 100644
--- a/graphics/graphviz/patches/patch-aa
+++ b/graphics/graphviz/patches/patch-aa
@@ -1,3 +1,5 @@
+$NetBSD: patch-aa,v 1.9 2009/03/01 21:58:54 tron Exp $
+
 --- configure.ac.orig	2008-10-07 18:40:07.000000000 +0000
 +++ configure.ac	2009-02-26 19:14:19.000000000 +0000
 @@ -23,17 +23,30 @@