- update to 2.14

shared lib version bump
internal include files ar no longer installed
- fix build with WITH_LUA

4 files changed, 25 insertions, 74 deletions

diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index a7e7ca835e3..2ea71113961 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	graphviz
-PORTVERSION=	2.12
-PORTREVISION=	2
+PORTVERSION=	2.14
 CATEGORIES=	graphics tk84
 MASTER_SITES=	http://www.graphviz.org/pub/graphviz/ARCHIVE/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -35,6 +34,7 @@ MAN1=		acyclic.1 bcomps.1 ccomps.1 dijkstra.1 dot.1 \
 		dotty.1 gc.1 gvcolor.1 gvpack.1 gvpr.1 gxl2dot.1 \
 		lneato.1 nop.1 prune.1 sccmap.1 tred.1 unflatten.1
 MAN3=		agraph.3 cdt.3 expr.3 graph.3 gvc.3 pathplan.3
+MAN7=		graphviz.7
 MLINKS=		dot.1 circo.1 \
 		gxl2dot.1 dot2gxl.1 \
 		dot.1 fdp.1 \
@@ -185,8 +185,8 @@ CONFIGURE_ARGS+=	--enable-lua
 PLIST_SUB+=		WITH_LUA=""
 USE_LUA=		yes
 .include "${PORTSDIR}/Mk/bsd.lua.mk"
-CPPFLAGS+=		-I${LUA_INCDIR}
-LDFLAGS+=		-L${LUA_LIBDIR}
+CFLAGS+=		-I${LUA_INCDIR}
+LDFLAGS+=		-L${LUA_LIBDIR} -lm
 CONFIGURE_ENV+=		LUA="${LUA_BINDIR}/lua"
 . endif
 
diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo
index 164b463a95c..f3eba1bd0bc 100644
--- a/graphics/graphviz/distinfo
+++ b/graphics/graphviz/distinfo
@@ -1,3 +1,3 @@
-MD5 (graphviz-2.12.tar.gz) = e5547bc0ec47943c72f5c3e2b5dff58f
-SHA256 (graphviz-2.12.tar.gz) = 5191892d7950c28754659f703234f7888f132440a049f0d396f287b202f9e37f
-SIZE (graphviz-2.12.tar.gz) = 4607023
+MD5 (graphviz-2.14.tar.gz) = 5b44fb4b1a5b4dd51b7f2352e2063dcc
+SHA256 (graphviz-2.14.tar.gz) = b0a9b62d8464344a3b17e4c48d0088ac96952c09bf4c236ea11ef70662c43eca
+SIZE (graphviz-2.14.tar.gz) = 4576817
diff --git a/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in b/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in
deleted file mode 100644
index 424082843f4..00000000000
--- a/graphics/graphviz/files/patch-contrib-diffimg-Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- contrib/diffimg/Makefile.in.orig	Mon Feb 26 16:39:29 2007
-+++ contrib/diffimg/Makefile.in	Mon Feb 26 16:41:47 2007
-@@ -54,8 +54,8 @@
- PROGRAMS = $(noinst_PROGRAMS)
- am_diffimg_OBJECTS = diffimg.$(OBJEXT)
- diffimg_OBJECTS = $(am_diffimg_OBJECTS)
--@WITH_LIBGD_TRUE@diffimg_DEPENDENCIES =  \
--@WITH_LIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
-+@WITH_MYLIBGD_TRUE@diffimg_DEPENDENCIES =  \
-+@WITH_MYLIBGD_TRUE@	$(top_builddir)/lib/gd/libgvgd_C.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
- am__depfiles_maybe = depfiles
-@@ -367,9 +367,9 @@
- target_alias = @target_alias@
- AM_CPPFLAGS = @GD_INCLUDES@
- diffimg_SOURCES = diffimg.c
--@WITH_LIBGD_FALSE@diffimg_LDADD = @GD_LIBS@
--@WITH_LIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
--@WITH_LIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
-+@WITH_LIBGD_TRUE@diffimg_LDADD = @GD_LIBS@
-+@WITH_MYLIBGD_TRUE@diffimg_LDADD = $(top_builddir)/lib/gd/libgvgd_C.la \
-+@WITH_MYLIBGD_TRUE@	@FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@
- 
- GRAPH = "digraph G { hello -> world }"
- CLEANFILES = *.png
diff --git a/graphics/graphviz/pkg-plist b/graphics/graphviz/pkg-plist
index c0676f305e4..b5034ac7db3 100644
--- a/graphics/graphviz/pkg-plist
+++ b/graphics/graphviz/pkg-plist
@@ -21,111 +21,88 @@ bin/gvpr
 bin/lneato
 bin/dotty
 bin/prune
-include/graphviz/ast_common.h
+include/graphviz/agraph.h
 include/graphviz/cdt.h
 include/graphviz/demand_loading.c
 include/graphviz/dot_builtins.c
-include/graphviz/dthdr.h
 include/graphviz/graph.h
-include/graphviz/libgraph.h
-include/graphviz/triefa.h
-include/graphviz/parser.h
-include/graphviz/agxbuf.h
-include/graphviz/aghdr.h
-include/graphviz/agraph.h
-include/graphviz/malloc.h
 include/graphviz/no_demand_loading.c
-include/graphviz/vmstub.h
-include/graphviz/grammar.h
-include/graphviz/tri.h
 include/graphviz/pathgeom.h
-include/graphviz/pathplan.h
-include/graphviz/pathutil.h
-include/graphviz/solvers.h
 include/graphviz/textpara.h
 include/graphviz/usershape.h
-include/graphviz/vis.h
-include/graphviz/vispath.h
-include/graphviz/logic.h
-include/graphviz/arith.h
 include/graphviz/geom.h
 include/graphviz/color.h
 include/graphviz/types.h
-include/graphviz/globals.h
 include/graphviz/gvc.h
 include/graphviz/gvcext.h
 include/graphviz/gvcommon.h
 include/graphviz/gvplugin.h
 include/graphviz/gvcjob.h
-include/graphviz/gvcint.h
 include/graphviz/gvplugin_render.h
 include/graphviz/gvplugin_layout.h
 include/graphviz/gvplugin_loadimage.h
 include/graphviz/gvplugin_textlayout.h
 include/graphviz/gvplugin_device.h
 include/graphviz/pack.h
-include/graphviz/exlib.h
-include/graphviz/exgram.h
-include/graphviz/expr.h
 include/graphviz/gv.i
 include/graphviz/gv.cpp
 lib/graphviz/config
 lib/graphviz/libcdt.so
-lib/graphviz/libcdt.so.3
+lib/graphviz/libcdt.so.4
 lib/graphviz/libcdt.la
 lib/graphviz/libcdt.a
 lib/graphviz/libgraph.so
-lib/graphviz/libgraph.so.3
+lib/graphviz/libgraph.so.4
 lib/graphviz/libgraph.la
 lib/graphviz/libgraph.a
 lib/graphviz/libagraph.so
-lib/graphviz/libagraph.so.3
+lib/graphviz/libagraph.so.4
 lib/graphviz/libagraph.la
 lib/graphviz/libagraph.a
 lib/graphviz/libpathplan.so
-lib/graphviz/libpathplan.so.3
+lib/graphviz/libpathplan.so.4
 lib/graphviz/libpathplan.la
 lib/graphviz/libpathplan.a
 lib/graphviz/libgvc.so
-lib/graphviz/libgvc.so.3
+lib/graphviz/libgvc.so.4
 lib/graphviz/libgvc.la
 lib/graphviz/libgvc.a
 lib/graphviz/libgvc_builtins.so
-lib/graphviz/libgvc_builtins.so.3
+lib/graphviz/libgvc_builtins.so.4
 lib/graphviz/libgvc_builtins.la
 lib/graphviz/libgvc_builtins.a
 lib/graphviz/libexpr.so
-lib/graphviz/libexpr.so.3
+lib/graphviz/libexpr.so.4
 lib/graphviz/libexpr.la
 lib/graphviz/libexpr.a
 lib/graphviz/libgvplugin_core.so
-lib/graphviz/libgvplugin_core.so.3
+lib/graphviz/libgvplugin_core.so.4
 lib/graphviz/libgvplugin_core.la
 lib/graphviz/libgvplugin_core.a
 lib/graphviz/libgvplugin_dot_layout.so
-lib/graphviz/libgvplugin_dot_layout.so.3
+lib/graphviz/libgvplugin_dot_layout.so.4
 lib/graphviz/libgvplugin_dot_layout.la
 lib/graphviz/libgvplugin_dot_layout.a
 lib/graphviz/libgvplugin_gd.so
-lib/graphviz/libgvplugin_gd.so.3
+lib/graphviz/libgvplugin_gd.so.4
 lib/graphviz/libgvplugin_gd.la
 lib/graphviz/libgvplugin_gd.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.la
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so.3
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_gtk.so.4
 lib/graphviz/libgvplugin_neato_layout.so
-lib/graphviz/libgvplugin_neato_layout.so.3
+lib/graphviz/libgvplugin_neato_layout.so.4
 lib/graphviz/libgvplugin_neato_layout.la
 lib/graphviz/libgvplugin_neato_layout.a
-lib/graphviz/libgvplugin_pango.so
-lib/graphviz/libgvplugin_pango.so.3
-lib/graphviz/libgvplugin_pango.la
-lib/graphviz/libgvplugin_pango.a
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.so.4
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.la
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_pango.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.a
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.la
 %%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so
-%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.3
+%%WITH_PANGOCAIRO%%lib/graphviz/libgvplugin_xlib.so.4
 %%WITH_GUILE%%lib/graphviz/guile/gv_guile.man
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.a
 %%WITH_GUILE%%lib/graphviz/guile/libgv_guile.la