diff options
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/tulip/Makefile | 48 | ||||
| -rw-r--r-- | graphics/tulip/distinfo | 2 | ||||
| -rw-r--r-- | graphics/tulip/files/patch-FileSystem.cpp | 9 | ||||
| -rw-r--r-- | graphics/tulip/files/patch-GlGraph.cpp | 10 | ||||
| -rw-r--r-- | graphics/tulip/files/patch-TemplateFactory.cxx | 6 | ||||
| -rw-r--r-- | graphics/tulip/files/patch-ltmain.sh | 49 | ||||
| -rw-r--r-- | graphics/tulip/pkg-plist | 97 |
7 files changed, 166 insertions, 55 deletions
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile index 7a5cae75904f..e7b76fed66c0 100644 --- a/graphics/tulip/Makefile +++ b/graphics/tulip/Makefile @@ -7,40 +7,40 @@ # PORTNAME= tulip -PORTVERSION= 1.2.2 +PORTVERSION= 1.2.3 CATEGORIES= graphics -MASTER_SITES= http://dept-info.labri.fr/~auber/projects/tulip/x345/tulip-${PORTVERSION}/ +MASTER_SITES= http://dept-info.labri.fr/~auber/projects/tulip/x345/ MAINTAINER= ports@FreeBSD.org COMMENT= A system dedicated to the visualization of huge graphs -BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png:${PORTSDIR}/graphics/png \ - gnugetopt:${PORTSDIR}/devel/libgnugetopt - -USE_REINPLACE= yes -USE_MESA= yes USE_QT_VER= 3 -CFLAGS+= -DHAVE_DECL_GETOPT -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt -lcompat" +QT_NONSTANDARD= yes +USE_REINPLACE= yes +USE_GETOPT_LONG= yes USE_GMAKE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= MOC="${MOC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" +CONFIGURE_ARGS= --with-qt-includes=${QT_PREFIX}/include \ + --with-qt-libraries=${QT_PREFIX}/lib \ + --with-extra-libs=${LOCALBASE}/lib INSTALLS_SHLIB= yes -post-patch: - @${REINPLACE_CMD} -e "s|-lqt|-lqt-mt|" ${WRKSRC}/configure - @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ - -e "s|malloc\.h|stdlib.h|" - @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \ - -e "s|-ldl||" -e "s|-lpthread|${PTHREAD_LIBS}|" +CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include \ + -I${QT_PREFIX}/include -DHAVE_DECL_GETOPT +LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib \ + -ljpeg -L${QT_PREFIX}/lib -lcompat -post-configure: - @${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} \ - -e "s|-D_GETOPT_H||" +post-extract: + @${FIND} ${WRKSRC} -name "moc_*" -delete -pre-build: - @(cd ${WRKSRC} && ${GMAKE} clean) +post-patch: + @${REINPLACE_CMD} -e 's| -O2 -pipe||g' ${WRKSRC}/configure + @${GREP} -lR "malloc\.h" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ + 's|malloc\.h|stdlib.h|g' + @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ + 's|-ldl||g ; \ + s|-lpthread|${PTHREAD_LIBS}|g' .include <bsd.port.mk> diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo index 1687a16f7868..fa3907fb2360 100644 --- a/graphics/tulip/distinfo +++ b/graphics/tulip/distinfo @@ -1 +1 @@ -MD5 (tulip-1.2.2.tar.gz) = e8273b535aeb4434d8f8c71aa56c06fb +MD5 (tulip-1.2.3.tar.gz) = 8dc54e902488b23d10cfa905d73dfa6f diff --git a/graphics/tulip/files/patch-FileSystem.cpp b/graphics/tulip/files/patch-FileSystem.cpp index 55a5e2019e74..c64324f43660 100644 --- a/graphics/tulip/files/patch-FileSystem.cpp +++ b/graphics/tulip/files/patch-FileSystem.cpp @@ -1,10 +1,11 @@ ---- plugins/import/FileSystem.cpp.orig Fri Jan 10 12:54:43 2003 -+++ plugins/import/FileSystem.cpp Fri Jan 10 12:56:18 2003 +--- plugins/import/FileSystem.cpp.orig Fri Nov 1 00:55:42 2002 ++++ plugins/import/FileSystem.cpp Sun Apr 20 01:10:32 2003 @@ -1,8 +1,8 @@ +#include <sys/types.h> #include <sys/timeb.h> - #include<qfiledialog.h> - #include "TulipPlugin.h" +-#include<qfiledialog.h> ++#include <qfiledialog.h> + #include <tulip/TulipPlugin.h> #include <sys/stat.h> -#include <sys/types.h> #include <dirent.h> diff --git a/graphics/tulip/files/patch-GlGraph.cpp b/graphics/tulip/files/patch-GlGraph.cpp new file mode 100644 index 000000000000..248b100f1caa --- /dev/null +++ b/graphics/tulip/files/patch-GlGraph.cpp @@ -0,0 +1,10 @@ +--- library/tulip-ogl/src/GlGraph.cpp.orig Wed Nov 13 22:36:00 2002 ++++ library/tulip-ogl/src/GlGraph.cpp Sat Apr 19 23:45:11 2003 +@@ -39,6 +39,7 @@ + + + //test ++#include <sys/types.h> + #include <sys/timeb.h> + + TemplateFactory<GlyphFactory,Glyph,GlyphContext *> GlGraph::glyphFactory; diff --git a/graphics/tulip/files/patch-TemplateFactory.cxx b/graphics/tulip/files/patch-TemplateFactory.cxx index 7853c5568108..e727c2624816 100644 --- a/graphics/tulip/files/patch-TemplateFactory.cxx +++ b/graphics/tulip/files/patch-TemplateFactory.cxx @@ -1,6 +1,6 @@ ---- library/include/cxx/TemplateFactory.cxx.orig Fri Jan 10 12:29:37 2003 -+++ library/include/cxx/TemplateFactory.cxx Fri Jan 10 12:30:17 2003 -@@ -41,7 +41,7 @@ +--- library/tulip/include/tulip/cxx/TemplateFactory.cxx.orig Sat Nov 9 02:52:54 2002 ++++ library/tulip/include/tulip/cxx/TemplateFactory.cxx Sat Apr 19 23:03:33 2003 +@@ -39,7 +39,7 @@ else { createObj =(func) dlsym(handle, "_creator"); diff --git a/graphics/tulip/files/patch-ltmain.sh b/graphics/tulip/files/patch-ltmain.sh new file mode 100644 index 000000000000..9713eedba652 --- /dev/null +++ b/graphics/tulip/files/patch-ltmain.sh @@ -0,0 +1,49 @@ +--- ltmain.sh.orig Wed Nov 20 19:45:17 2002 ++++ ltmain.sh Sat Apr 19 23:26:26 2003 +@@ -964,6 +964,7 @@ + ;; + + -avoid-version) ++ build_old_libs=no + avoid_version=yes + continue + ;; +@@ -1056,14 +1057,14 @@ + # These systems don't actually have a C library (as such) + test "X$arg" = "X-lc" && continue + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + test "X$arg" = "X-lc" && continue + ;; + esac + elif test "X$arg" = "X-lc_r"; then + case $host in +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc_r directly, use -pthread flag. + continue + ;; +@@ -2499,7 +2500,7 @@ + *-*-netbsd*) + # Don't link with libc until the a.out ld.so is fixed. + ;; +- *-*-openbsd*) ++ *-*-openbsd* | *-*-freebsd*) + # Do not include libc due to us having libc/libc_r. + ;; + *) +@@ -4286,10 +4287,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist index 0481dc5c03fa..fe29d6533c68 100644 --- a/graphics/tulip/pkg-plist +++ b/graphics/tulip/pkg-plist @@ -1,9 +1,73 @@ bin/Tulip bin/tlprender -lib/libtlp.a -lib/libtlp.la -lib/libtlp.so -lib/libtlp.so.0 +bin/tulip-config +include/tulip/Bezier.h +include/tulip/Cluster.h +include/tulip/Clustering.h +include/tulip/Color.h +include/tulip/Colors.h +include/tulip/ColorsProxy.h +include/tulip/Coord.h +include/tulip/EpsFunction.h +include/tulip/ExportModule.h +include/tulip/FanError.h +include/tulip/GlFonts.h +include/tulip/GlGraph.h +include/tulip/GlGraphStrategy.h +include/tulip/GlLines.h +include/tulip/Glyph.h +include/tulip/GraphIterator.h +include/tulip/IdManager.h +include/tulip/ImportModule.h +include/tulip/Int.h +include/tulip/IntProxy.h +include/tulip/Iterator.h +include/tulip/Layout.h +include/tulip/LayoutProxy.h +include/tulip/MetaGraph.h +include/tulip/MetaGraphProxy.h +include/tulip/MethodFactory.h +include/tulip/Metric.h +include/tulip/MetricProxy.h +include/tulip/Observable.h +include/tulip/Plugin.h +include/tulip/PluginContext.h +include/tulip/PluginLoader.h +include/tulip/PluginLoaderTxt.h +include/tulip/PluginProgress.h +include/tulip/Property.h +include/tulip/PropertyProxy.h +include/tulip/PropertyProxyContainer.h +include/tulip/Reflect.h +include/tulip/Selection.h +include/tulip/SelectionProxy.h +include/tulip/Size.h +include/tulip/Sizes.h +include/tulip/SizesProxy.h +include/tulip/StlIterator.h +include/tulip/String.h +include/tulip/StringProxy.h +include/tulip/SubGraph.h +include/tulip/SuperGraph.h +include/tulip/SuperGraphAbstract.h +include/tulip/SuperGraphImpl.h +include/tulip/SuperGraphView.h +include/tulip/TemplateFactory.h +include/tulip/TlpTools.h +include/tulip/TulipPlugin.h +include/tulip/TypeConverter.h +include/tulip/Types.h +include/tulip/WithParameter.h +include/tulip/cxx/PropertyProxy.cxx +include/tulip/cxx/PropertyProxyContainer.cxx +include/tulip/cxx/Reflect.cxx +include/tulip/cxx/TemplateFactory.cxx +lib/libtulip-ogl.a +lib/libtulip-ogl.so +lib/libtulip-ogl.so.0 +lib/libtulip.a +lib/libtulip.so +lib/libtulip.so.0 lib/tlp/bitmaps/Fonts.bmp lib/tlp/bitmaps/but1.xpm lib/tlp/bitmaps/but2.xpm @@ -42,6 +106,7 @@ lib/tlp/plugins/import/smallworld.so lib/tlp/plugins/import/tlp.so lib/tlp/plugins/layout/circular.so lib/tlp/plugins/layout/conetree.so +lib/tlp/plugins/layout/conetreeextended.so lib/tlp/plugins/layout/gem.so lib/tlp/plugins/layout/generalgraph.so lib/tlp/plugins/layout/generalgraph3d.so @@ -49,12 +114,11 @@ lib/tlp/plugins/layout/generalgraphbox.so lib/tlp/plugins/layout/random.so lib/tlp/plugins/layout/springelectrical.so lib/tlp/plugins/layout/sugiyama.so -lib/tlp/plugins/layout/tree3d.so lib/tlp/plugins/layout/treeleaf.so lib/tlp/plugins/layout/treemap.so lib/tlp/plugins/layout/treeradial.so -lib/tlp/plugins/layout/treewalker.so -lib/tlp/plugins/layout/treewalkerbox.so +lib/tlp/plugins/layout/treereingold.so +lib/tlp/plugins/layout/treereingoldextended.so lib/tlp/plugins/layout/tutte.so lib/tlp/plugins/metric/arity.so lib/tlp/plugins/metric/barycenter.so @@ -82,22 +146,6 @@ lib/tlp/plugins/selection/spanningdag.so lib/tlp/plugins/selection/spanningtree.so lib/tlp/plugins/sizes/AutoSize.so lib/tlp/plugins/sizes/fittolabels.so -lib/tlp/samples/gml/GeneralPlanarGraph.gml -lib/tlp/samples/gml/dag50nodes.gml -lib/tlp/samples/gml/pussar.gml -lib/tlp/samples/matrix/ex1.mat -lib/tlp/samples/posets/posTest.pst -lib/tlp/samples/tlp/CrossReduc.Demo.tlp -lib/tlp/samples/tlp/MetaGraph.tlp -lib/tlp/samples/tlp/SimpleCurve.Demo.tlp -lib/tlp/samples/tlp/Tree_11259_Nodes.demo.tlp -lib/tlp/samples/tlp/Web.labri.Demo.tlp -lib/tlp/samples/tlp/graphSimple.144.245.tlp -@dirrm lib/tlp/samples/tlp -@dirrm lib/tlp/samples/posets -@dirrm lib/tlp/samples/matrix -@dirrm lib/tlp/samples/gml -@dirrm lib/tlp/samples @dirrm lib/tlp/plugins/sizes @dirrm lib/tlp/plugins/selection @dirrm lib/tlp/plugins/metric @@ -109,3 +157,6 @@ lib/tlp/samples/tlp/graphSimple.144.245.tlp @dirrm lib/tlp/plugins/clustering @dirrm lib/tlp/plugins @dirrm lib/tlp/bitmaps +@dirrm lib/tlp +@dirrm include/tulip/cxx +@dirrm include/tulip |