diff options
author | joerg <joerg> | 2007-03-03 16:51:36 +0000 |
---|---|---|
committer | joerg <joerg> | 2007-03-03 16:51:36 +0000 |
commit | b24083ac7aef4558541494fa1aacf75a6e3a6744 (patch) | |
tree | e4932b15b08f2689ac755efb27e194d5d9336c1c /graphics | |
parent | 4dc14722a5771be7c014038a1747d81d02b8a9fe (diff) | |
download | pkgsrc-b24083ac7aef4558541494fa1aacf75a6e3a6744.tar.gz |
Fix almost all shared library issues (with the exception of libgvc_builtin,
where I have no idea what it is supposed to be). Force pthread linkage
for dot and gvchackm as some of the plugins can pull in pthread and that
avoids the abort on NetBSD. Fixes PR 35679 and 35865. Bump revision.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/graphviz/Makefile | 9 | ||||
-rw-r--r-- | graphics/graphviz/PLIST | 3 | ||||
-rw-r--r-- | graphics/graphviz/distinfo | 12 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ag | 12 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ah | 13 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ai | 13 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-aj | 13 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ak | 15 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-al | 15 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-am | 16 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-an | 31 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ao | 13 | ||||
-rw-r--r-- | graphics/graphviz/patches/patch-ap | 14 |
13 files changed, 172 insertions, 7 deletions
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 148311ede61..d0a73e1e487 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.56 2007/02/22 14:45:47 joerg Exp $ +# $NetBSD: Makefile,v 1.57 2007/03/03 16:51:36 joerg Exp $ DISTNAME= graphviz-2.12 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ @@ -13,14 +13,12 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts -CONFIGURE_ARGS+= --without-pangocairo - USE_LANGUAGES= c c++ USE_LIBTOOL= yes USE_TOOLS+= pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-gtk -CONFIGURE_ARGS+= --disable-sharp +CONFIGURE_ARGS+= --disable-sharp --disable-python --disable-perl --disable-ruby CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} CONFIGURE_ENV+= X11PREFIX=${X11PREFIX:Q} X11BASE=${X11BASE:Q} @@ -61,4 +59,5 @@ pre-build: .include "../../x11/libXp/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../mk/xaw.buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index d8b240cdaad..9246f886f08 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2007/02/22 14:45:47 joerg Exp $ +@comment $NetBSD: PLIST,v 1.16 2007/03/03 16:51:36 joerg Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -76,6 +76,7 @@ lib/graphviz/libgvplugin_dot_layout.la lib/graphviz/libgvplugin_gd.la lib/graphviz/libgvplugin_neato_layout.la lib/graphviz/libgvplugin_pango.la +lib/graphviz/libgvplugin_xlib.la lib/graphviz/lua/gv.so lib/graphviz/lua/gv_lua.man lib/graphviz/lua/libgv_lua.la diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 854865446ed..785022a1410 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.24 2007/02/22 14:45:47 joerg Exp $ +$NetBSD: distinfo,v 1.25 2007/03/03 16:51:36 joerg Exp $ SHA1 (graphviz-2.12.tar.gz) = aa48a926395a57c6c7e1e755b9432a29461538e3 RMD160 (graphviz-2.12.tar.gz) = 68d55176cd5ce0e6a25c90b443529747e738d5c6 @@ -9,3 +9,13 @@ SHA1 (patch-ac) = e0877aef8259172549e6b69f1478d1ccdef2bb6d SHA1 (patch-ad) = d14bfef61caec543812b9d5ea8d2c331bf350af8 SHA1 (patch-ae) = df8ec6959bf1b8212f8bfcaf48586aa52537a457 SHA1 (patch-af) = 3da8cd02537275fb75b92d0fc60db0daf22445f8 +SHA1 (patch-ag) = 69aa5b209a56bff0e70eef7be32fe2b137d2e944 +SHA1 (patch-ah) = 1ad530507a6e68468e3157a92abfe469ce6cb5ae +SHA1 (patch-ai) = bab9b2692e566792f2f3acb5ef6af253faa237b7 +SHA1 (patch-aj) = fe47943c76c348af1cf9b302f6f4d1dd3ed45644 +SHA1 (patch-ak) = c107b665f328e61b7020ffaf75371ac8bd037a1b +SHA1 (patch-al) = a54f2ef3bba3ff0395697d26a7b176b6dc1359ef +SHA1 (patch-am) = 533b4021a56f961f2deaa3bb925365b41b01d6fd +SHA1 (patch-an) = 61c567ce326247667d4be352426e927ab85f15fe +SHA1 (patch-ao) = f8bc34fb7d5b6c90e903b9ddf2afcc037a3f18af +SHA1 (patch-ap) = a23318138a5dbcc3f5085c099c1b6076a5ef5a60 diff --git a/graphics/graphviz/patches/patch-ag b/graphics/graphviz/patches/patch-ag new file mode 100644 index 00000000000..978c98745ce --- /dev/null +++ b/graphics/graphviz/patches/patch-ag @@ -0,0 +1,12 @@ +$NetBSD: patch-ag,v 1.9 2007/03/03 16:51:36 joerg Exp $ + +--- lib/expr/Makefile.in.orig 2007-02-26 23:50:50.000000000 +0000 ++++ lib/expr/Makefile.in +@@ -428,6 +428,7 @@ libexpr_C_la_SOURCES = excc.c excontext. + + libexpr_C_la_LIBADD = \ + $(top_builddir)/lib/ast/libast_C.la \ ++ $(top_builddir)/lib/cdt/libcdt_C.la \ + $(top_builddir)/lib/vmalloc/libvmalloc_C.la \ + $(top_builddir)/lib/sfio/libsfio_C.la + diff --git a/graphics/graphviz/patches/patch-ah b/graphics/graphviz/patches/patch-ah new file mode 100644 index 00000000000..d1bab0961e1 --- /dev/null +++ b/graphics/graphviz/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.8 2007/03/03 16:51:37 joerg Exp $ + +--- lib/gvc/Makefile.in.orig 2007-02-26 23:34:57.000000000 +0000 ++++ lib/gvc/Makefile.in +@@ -447,7 +447,7 @@ libgvc_la_LIBADD = $(libgvc_C_la_LIBADD) + $(top_builddir)/lib/cdt/libcdt.la \ + $(top_builddir)/lib/graph/libgraph.la \ + $(top_builddir)/lib/pathplan/libpathplan.la \ +- @EXPAT_LIBS@ @Z_LIBS@ ++ @EXPAT_LIBS@ @Z_LIBS@ -lm + + + #For use without plugins. diff --git a/graphics/graphviz/patches/patch-ai b/graphics/graphviz/patches/patch-ai new file mode 100644 index 00000000000..4909befb663 --- /dev/null +++ b/graphics/graphviz/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.10 2007/03/03 16:51:37 joerg Exp $ + +--- plugin/core/Makefile.in.orig 2007-02-26 23:57:55.000000000 +0000 ++++ plugin/core/Makefile.in +@@ -404,7 +404,7 @@ libgvplugin_core_C_la_SOURCES = \ + + libgvplugin_core_la_LDFLAGS = -version-info @VERSION_INFO@ --no-undefined + libgvplugin_core_la_SOURCES = $(libgvplugin_core_C_la_SOURCES) +-libgvplugin_core_la_LIBADD = ++libgvplugin_core_la_LIBADD = ../../lib/graph/libgraph.la ../../lib/gvc/libgvc.la -lz + EXTRA_DIST = Makefile.old + all: all-am + diff --git a/graphics/graphviz/patches/patch-aj b/graphics/graphviz/patches/patch-aj new file mode 100644 index 00000000000..eae0e8f3c2b --- /dev/null +++ b/graphics/graphviz/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.7 2007/03/03 16:51:37 joerg Exp $ + +--- plugin/gd/Makefile.in.orig 2007-02-27 00:15:53.000000000 +0000 ++++ plugin/gd/Makefile.in +@@ -403,6 +403,8 @@ libgvplugin_gd_la_SOURCES = $(libgvplugi + @WITH_MYLIBGD_TRUE@libgvplugin_gd_la_LIBADD = \ + @WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la \ + @WITH_MYLIBGD_TRUE@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@ ++libgvplugin_gd_la_LIBADD += ../../lib/gvc/libgvc.la ../../lib/graph/libgraph.la \ ++ ../../lib/pathplan/libpathplan.la + + EXTRA_DIST = Makefile.old + all: all-am diff --git a/graphics/graphviz/patches/patch-ak b/graphics/graphviz/patches/patch-ak new file mode 100644 index 00000000000..415467b49fe --- /dev/null +++ b/graphics/graphviz/patches/patch-ak @@ -0,0 +1,15 @@ +$NetBSD: patch-ak,v 1.9 2007/03/03 16:51:37 joerg Exp $ + +--- plugin/dot_layout/Makefile.in.orig 2007-02-27 00:27:18.000000000 +0000 ++++ plugin/dot_layout/Makefile.in +@@ -406,7 +406,9 @@ libgvplugin_dot_layout_la_LDFLAGS = -ver + libgvplugin_dot_layout_la_SOURCES = $(libgvplugin_dot_layout_C_la_SOURCES) + libgvplugin_dot_layout_la_LIBADD = $(libgvplugin_dot_layout_C_la_LIBADD) \ + $(top_builddir)/lib/gvc/libgvc.la \ +- $(top_builddir)/lib/pathplan/libpathplan.la ++ $(top_builddir)/lib/agraph/libagraph.la \ ++ $(top_builddir)/lib/graph/libgraph.la \ ++ $(top_builddir)/lib/pathplan/libpathplan.la -lm + + EXTRA_DIST = Makefile.old + all: all-am diff --git a/graphics/graphviz/patches/patch-al b/graphics/graphviz/patches/patch-al new file mode 100644 index 00000000000..81de024aba7 --- /dev/null +++ b/graphics/graphviz/patches/patch-al @@ -0,0 +1,15 @@ +$NetBSD: patch-al,v 1.8 2007/03/03 16:51:37 joerg Exp $ + +--- plugin/neato_layout/Makefile.in.orig 2007-02-27 00:29:02.000000000 +0000 ++++ plugin/neato_layout/Makefile.in +@@ -415,7 +415,9 @@ libgvplugin_neato_layout_la_LDFLAGS = -v + libgvplugin_neato_layout_la_SOURCES = $(libgvplugin_neato_layout_C_la_SOURCES) + libgvplugin_neato_layout_la_LIBADD = $(libgvplugin_neato_layout_C_la_LIBADD) \ + $(top_builddir)/lib/gvc/libgvc.la \ +- $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ ++ $(top_builddir)/lib/graph/libgraph.la \ ++ $(top_builddir)/lib/expr/libexpr.la \ ++ $(top_builddir)/lib/pathplan/libpathplan.la @IPSEPCOLA_LIBS@ -lm + + EXTRA_DIST = Makefile.old + all: all-am diff --git a/graphics/graphviz/patches/patch-am b/graphics/graphviz/patches/patch-am new file mode 100644 index 00000000000..c919a432b10 --- /dev/null +++ b/graphics/graphviz/patches/patch-am @@ -0,0 +1,16 @@ +$NetBSD: patch-am,v 1.10 2007/03/03 16:51:37 joerg Exp $ + +--- tclpkg/tcldot/Makefile.in.orig 2007-02-27 00:33:47.000000000 +0000 ++++ tclpkg/tcldot/Makefile.in +@@ -490,6 +490,11 @@ libtcldot_la_LDFLAGS = -no-undefined + @WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@ $(top_builddir)/lib/gd/libgvgd_C.la \ + @WITH_LIBGD_TRUE@@WITH_MYLIBGD_TRUE@ @PANGOCAIRO_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @ICONV_LIBS@ @FC_LIBS@ @FT_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @Z_LIBS@ @MATH_LIBS@ + ++libtcldot_la_LIBADD += \ ++ $(top_builddir)/lib/agraph/libagraph.la \ ++ $(top_builddir)/lib/expr/libexpr.la \ ++ $(top_builddir)/lib/graph/libgraph.la \ ++ + libtcldot_builtin_la_SOURCES = \ + tcldot.c $(CODEGENS) $(GDTCLFT) \ + $(top_srcdir)/lib/gvc/dot_builtins.c \ diff --git a/graphics/graphviz/patches/patch-an b/graphics/graphviz/patches/patch-an new file mode 100644 index 00000000000..26fc20bb805 --- /dev/null +++ b/graphics/graphviz/patches/patch-an @@ -0,0 +1,31 @@ +$NetBSD: patch-an,v 1.7 2007/03/03 16:51:37 joerg Exp $ + +--- tclpkg/gv/Makefile.in.orig 2007-02-27 00:41:02.000000000 +0000 ++++ tclpkg/gv/Makefile.in +@@ -537,7 +537,7 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/lib/pathplan $(PERL_INCLUDES) $(OCAML_INCLUDES) $(PHP_INCLUDES) $(PYTHON_INCLUDES) $(RUBY_INCLUDES) $(TCL_INCLUDES) + + BASESOURCES = gv.cpp gv.i +-BASELIBS = $(top_builddir)/lib/gvc/libgvc.la ++BASELIBS = $(top_builddir)/lib/gvc/libgvc.la ../../lib/expr/libexpr.la ../../lib/graph/libgraph.la + pkgsharpdir = $(pkglibdir)/sharp + SHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs SWIGTYPE_p_p_void.cs + nodist_libgv_sharp_la_SOURCES = gv_sharp.cpp $(SHARP_hdr) +@@ -566,7 +566,7 @@ pkgluadir = $(pkglibdir)/lua + LUA_hdr = + nodist_libgv_lua_la_SOURCES = gv_lua.cpp $(LUA_hdr) + libgv_lua_la_SOURCES = $(BASESOURCES) +-libgv_lua_la_LIBADD = $(BASELIBS) @LUA_LIBS@ ++libgv_lua_la_LIBADD = $(BASELIBS) -llua + libgv_lua_la_LDFLAGS = + pkgocamldir = $(pkglibdir)/ocaml + OCAML_hdr = gv.ml gv.mli +@@ -602,7 +602,7 @@ pkgtcldir = $(pkglibdir)/tcl + TCL_hdr = + nodist_libgv_tcl_la_SOURCES = gv_tcl.cpp $(TCL_hdr) + libgv_tcl_la_SOURCES = $(BASESOURCES) +-libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) @TCL_LIBS@ ++libgv_tcl_la_LIBADD = $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la $(BASELIBS) -ltcl84 + libgv_tcl_la_LDFLAGS = + pkginclude_DATA = gv.i gv.cpp + pkglib_LTLIBRARIES = diff --git a/graphics/graphviz/patches/patch-ao b/graphics/graphviz/patches/patch-ao new file mode 100644 index 00000000000..c53a41a6f94 --- /dev/null +++ b/graphics/graphviz/patches/patch-ao @@ -0,0 +1,13 @@ +$NetBSD: patch-ao,v 1.9 2007/03/03 16:51:37 joerg Exp $ + +--- cmd/dot/Makefile.in.orig 2007-03-03 16:07:40.000000000 +0100 ++++ cmd/dot/Makefile.in +@@ -418,7 +418,7 @@ AM_CPPFLAGS = \ + man_MANS = dot.1 + pdf_DATA = dot.pdf + dot_SOURCES = dot.c +-dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la ++dot_LDADD = $(top_builddir)/lib/gvc/libgvc.la ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} + + # This automagic technique for building the list of builtins requires that the + # symbols be in the binary image, but libtool makes it difficult diff --git a/graphics/graphviz/patches/patch-ap b/graphics/graphviz/patches/patch-ap new file mode 100644 index 00000000000..073eacc7689 --- /dev/null +++ b/graphics/graphviz/patches/patch-ap @@ -0,0 +1,14 @@ +$NetBSD: patch-ap,v 1.8 2007/03/03 16:51:38 joerg Exp $ + +--- cmd/tools/Makefile.in.orig 2007-03-03 16:31:25.000000000 +0100 ++++ cmd/tools/Makefile.in +@@ -515,7 +515,8 @@ gvpack_SOURCES = gvpack.c gvpack_builtin + gvpack_LDADD = \ + $(top_builddir)/lib/gvc/libgvc.la \ + $(top_builddir)/lib/ingraphs/libingraphs_C.la \ +- $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la ++ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \ ++ ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} + + dijkstra_SOURCES = dijkstra.c + dijkstra_LDADD = \ |