From cee76eee4d159699ab8deb77472c9627de518e6b Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 19 Sep 2012 10:37:04 +0200 Subject: [PATCH] graphviz: add -libs and -devel subpkgs. --- common/shlibs | 12 ++++++++ srcpkgs/graphviz-devel | 1 + srcpkgs/graphviz-libs | 1 + srcpkgs/graphviz/graphviz-devel.template | 14 ++++++++++ srcpkgs/graphviz/graphviz-libs.rshlibs | 26 ++++++++++++++++++ srcpkgs/graphviz/graphviz-libs.template | 13 +++++++++ srcpkgs/graphviz/graphviz.rshlibs | 35 ++++++++---------------- srcpkgs/graphviz/template | 5 ++-- 8 files changed, 81 insertions(+), 26 deletions(-) create mode 120000 srcpkgs/graphviz-devel create mode 120000 srcpkgs/graphviz-libs create mode 100644 srcpkgs/graphviz/graphviz-devel.template create mode 100644 srcpkgs/graphviz/graphviz-libs.rshlibs create mode 100644 srcpkgs/graphviz/graphviz-libs.template diff --git a/common/shlibs b/common/shlibs index 5713da0e839..255e0598401 100644 --- a/common/shlibs +++ b/common/shlibs @@ -986,3 +986,15 @@ libmikmod.so.2 libmikmod-3.1.12_1 libSDL_sound-1.0.so.1 SDL_sound-1.0.3_1 libgtksourceview-2.0.so.0 gtksourceview2-2.10.5_1 libraul.so.10 raul-0.8.0_1 +libxdot.so.4 graphviz-libs-2.28.0_6 +libgvpr.so.2 graphviz-libs-2.28.0_6 +libcgraph.so.6 graphviz-libs-2.28.0_6 +libgraph.so.5 graphviz-libs-2.28.0_6 +libgvc.so.6 graphviz-libs-2.28.0_6 +libcdt.so.5 graphviz-libs-2.28.0_6 +libpathplan.so.4 graphviz-libs-2.28.0_6 +libgvplugin_dot_layout.so.6 graphviz-libs-2.28.0_6 +libgvplugin_gd.so.6 graphviz-libs-2.28.0_6 +libgvplugin_neato_layout.so.6 graphviz-libs-2.28.0_6 +libgvplugin_pango.so.6 graphviz-libs-2.28.0_6 +libgvplugin_core.so.6 graphviz-libs-2.28.0_6 diff --git a/srcpkgs/graphviz-devel b/srcpkgs/graphviz-devel new file mode 120000 index 00000000000..abecf5d9457 --- /dev/null +++ b/srcpkgs/graphviz-devel @@ -0,0 +1 @@ +graphviz \ No newline at end of file diff --git a/srcpkgs/graphviz-libs b/srcpkgs/graphviz-libs new file mode 120000 index 00000000000..abecf5d9457 --- /dev/null +++ b/srcpkgs/graphviz-libs @@ -0,0 +1 @@ +graphviz \ No newline at end of file diff --git a/srcpkgs/graphviz/graphviz-devel.template b/srcpkgs/graphviz/graphviz-devel.template new file mode 100644 index 00000000000..5c4b66e290c --- /dev/null +++ b/srcpkgs/graphviz/graphviz-devel.template @@ -0,0 +1,14 @@ +# Template file for 'graphviz-devel'. +# +noarch=yes +depends="graphviz-libs>=${version}" +short_desc="${short_desc} -- development files" +long_desc="${long_desc} + + This package contains files for development, headers, static libs, etc." + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib + vmove usr/share/man/man3 usr/share/man +} diff --git a/srcpkgs/graphviz/graphviz-libs.rshlibs b/srcpkgs/graphviz/graphviz-libs.rshlibs new file mode 100644 index 00000000000..16c3ced29b0 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-libs.rshlibs @@ -0,0 +1,26 @@ +libltdl.so.7 +libdl.so.2 +libc.so.6 +libexpat.so.1 +libz.so.1 +libm.so.6 +libpangocairo-1.0.so.0 +libpango-1.0.so.0 +libcairo.so.2 +libgobject-2.0.so.0 +libglib-2.0.so.0 +libgd.so.2 +libXpm.so.4 +libX11.so.6 +libjpeg.so.8 +libfontconfig.so.1 +libfreetype.so.6 +libpng15.so.15 +libgdk_pixbuf-2.0.so.0 +libgtk-x11-2.0.so.0 +libgdk-x11-2.0.so.0 +libatk-1.0.so.0 +libgio-2.0.so.0 +libpangoft2-1.0.so.0 +librsvg-2.so.2 +libXrender.so.1 diff --git a/srcpkgs/graphviz/graphviz-libs.template b/srcpkgs/graphviz/graphviz-libs.template new file mode 100644 index 00000000000..ed6f1410ec4 --- /dev/null +++ b/srcpkgs/graphviz/graphviz-libs.template @@ -0,0 +1,13 @@ +# Template file for 'graphviz-libs'. +# +short_desc="${short_desc} -- runtime libraries" +long_desc="${long_desc} + + This package contains the runtime libraries." + +replaces="graphviz<2.28.0_6" + +do_install() { + vmove "usr/lib/*.so*" usr/lib + vmove usr/lib/graphviz usr/lib +} diff --git a/srcpkgs/graphviz/graphviz.rshlibs b/srcpkgs/graphviz/graphviz.rshlibs index aa0c651ebf0..256e962d565 100644 --- a/srcpkgs/graphviz/graphviz.rshlibs +++ b/srcpkgs/graphviz/graphviz.rshlibs @@ -1,29 +1,18 @@ -libltdl.so.7 -libdl.so.2 +libgvc.so.6 +libgraph.so.5 libc.so.6 -libm.so.6 +libgvplugin_dot_layout.so.6 +libgvplugin_neato_layout.so.6 +libgvplugin_core.so.6 +libgvplugin_gd.so.6 +libgvplugin_pango.so.6 +libcgraph.so.6 +libcdt.so.5 libexpat.so.1 -libz.so.1 -libpangocairo-1.0.so.0 -libpango-1.0.so.0 -libcairo.so.2 -libgobject-2.0.so.0 -libglib-2.0.so.0 -libfontconfig.so.1 -libfreetype.so.6 -libjpeg.so.8 -libgdk_pixbuf-2.0.so.0 -libgtk-x11-2.0.so.0 -libgdk-x11-2.0.so.0 -libatk-1.0.so.0 -libgio-2.0.so.0 -libpangoft2-1.0.so.0 -librsvg-2.so.2 -libXrender.so.1 -libX11.so.6 +libm.so.6 +libgvpr.so.2 libXaw.so.7 libXt.so.6 libXmu.so.6 +libX11.so.6 libgd.so.2 -libXpm.so.4 -libpng15.so.15 diff --git a/srcpkgs/graphviz/template b/srcpkgs/graphviz/template index 96c9675ec67..f90a6357edb 100644 --- a/srcpkgs/graphviz/template +++ b/srcpkgs/graphviz/template @@ -1,8 +1,9 @@ # Template file for 'graphviz' pkgname=graphviz version=2.28.0 -revision=5 +revision=6 build_style=gnu-configure +subpackages="${pkgname}-libs ${pkgname}-devel" makedepends="flex pkg-config libpng-devel>=1.5.10 gd-devel expat-devel jpeg-devel fontconfig-devel gtk+-devel librsvg-devel libXaw-devel libXt-devel libXmu-devel libXpm-devel libltdl-devel libXrender-devel" @@ -24,8 +25,6 @@ long_desc=" design, networking, and in visual interfaces for many other domains." post_install() { - # Remove unused stuff (for now). - rm -rf ${DESTDIR}/usr/include ${DESTDIR}/usr/lib/pkgconfig # intall license. vinstall ${FILESDIR}/LICENSE 644 usr/share/licenses/$pkgname }