ports/52697: Update port: graphics/tulip to 1.2.4
KATO Tsuguru
tkato at prontomail.com
Mon May 26 15:00:33 UTC 2003
>Number: 52697
>Category: ports
>Synopsis: Update port: graphics/tulip to 1.2.4
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 26 08:00:25 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.4
New file:
files/patch-CirculantGraph.cpp
files/patch-IdLabels.cpp
files/patch-TlpTools.cpp
files/patch-tlprender.cpp
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/tulip/Makefile graphics/tulip/Makefile
--- /usr/ports/graphics/tulip/Makefile Sat May 17 13:27:13 2003
+++ graphics/tulip/Makefile Mon May 26 17:07:10 2003
@@ -7,13 +7,15 @@
#
PORTNAME= tulip
-PORTVERSION= 1.2.3
+PORTVERSION= 1.2.4
CATEGORIES= graphics
-MASTER_SITES= http://dept-info.labri.fr/~auber/projects/tulip/x345/
+MASTER_SITES= http://dept-info.labri.fr/~auber/projects/tulip/x345/%SUBDIR%/
+MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports at FreeBSD.org
COMMENT= A system dedicated to the visualization of huge graphs
+USE_BZIP2= yes
USE_QT_VER= 3
QT_NONSTANDARD= yes
USE_REINPLACE= yes
@@ -28,9 +30,9 @@
INSTALLS_SHLIB= yes
CPPFLAGS= -I${LOCALBASE}/include -I${PREFIX}/include \
- -I${QT_PREFIX}/include -DHAVE_DECL_GETOPT
+ -I${QT_PREFIX}/include -DHAVE_DECL_GETOPT ${PTHREAD_CFLAGS}
LDFLAGS= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib \
- -ljpeg -L${QT_PREFIX}/lib -lcompat
+ -ljpeg -L${QT_PREFIX}/lib -lcompat ${PTHREAD_LIBS}
post-extract:
@${FIND} ${WRKSRC} -name "moc_*" -delete
@@ -41,6 +43,8 @@
's|malloc\.h|stdlib.h|g'
@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
's|-ldl||g ; \
- s|-lpthread|${PTHREAD_LIBS}|g'
+ s|-lpthread||g ; \
+ s|-release @VERSION@|| ; \
+ s|LDFLAGS = -module|LDFLAGS = @LDFLAGS@ -module|g'
.include <bsd.port.mk>
diff -urN /usr/ports/graphics/tulip/distinfo graphics/tulip/distinfo
--- /usr/ports/graphics/tulip/distinfo Sat May 17 13:27:13 2003
+++ graphics/tulip/distinfo Mon May 26 14:30:04 2003
@@ -1 +1 @@
-MD5 (tulip-1.2.3.tar.gz) = 8dc54e902488b23d10cfa905d73dfa6f
+MD5 (tulip-1.2.4.tar.bz2) = 84805b9c1230d5dc771ba056624faa47
diff -urN /usr/ports/graphics/tulip/files/patch-CirculantGraph.cpp graphics/tulip/files/patch-CirculantGraph.cpp
--- /usr/ports/graphics/tulip/files/patch-CirculantGraph.cpp Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-CirculantGraph.cpp Mon May 26 14:30:04 2003
@@ -0,0 +1,10 @@
+--- plugins/import/CirculantGraph.cpp.orig Thu Apr 3 04:49:37 2003
++++ plugins/import/CirculantGraph.cpp Mon May 26 08:01:03 2003
+@@ -1,5 +1,6 @@
++#include <sys/types.h>
+ #include <sys/timeb.h>
+-#include<qinputdialog.h>
++#include <qinputdialog.h>
+ #include <tulip/TulipPlugin.h>
+
+ using namespace std;
diff -urN /usr/ports/graphics/tulip/files/patch-FileSystem.cpp graphics/tulip/files/patch-FileSystem.cpp
--- /usr/ports/graphics/tulip/files/patch-FileSystem.cpp Sat May 17 13:27:13 2003
+++ graphics/tulip/files/patch-FileSystem.cpp Mon May 26 14:30:03 2003
@@ -1,13 +1,12 @@
---- plugins/import/FileSystem.cpp.orig Fri Nov 1 00:55:42 2002
-+++ plugins/import/FileSystem.cpp Sun Apr 20 01:10:32 2003
+--- plugins/import/FileSystem.cpp.orig Sat Dec 7 00:39:53 2002
++++ plugins/import/FileSystem.cpp Mon May 26 01:24:45 2003
@@ -1,8 +1,8 @@
+#include <sys/types.h>
#include <sys/timeb.h>
--#include<qfiledialog.h>
-+#include <qfiledialog.h>
+ #include <qfiledialog.h>
#include <tulip/TulipPlugin.h>
#include <sys/stat.h>
-#include <sys/types.h>
#include <dirent.h>
- struct FileSystem:public ImportModule
+ using namespace std;
diff -urN /usr/ports/graphics/tulip/files/patch-IdLabels.cpp graphics/tulip/files/patch-IdLabels.cpp
--- /usr/ports/graphics/tulip/files/patch-IdLabels.cpp Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-IdLabels.cpp Mon May 26 14:30:03 2003
@@ -0,0 +1,9 @@
+--- plugins/string/IdLabels.cpp.orig Thu Apr 10 21:57:47 2003
++++ plugins/string/IdLabels.cpp Mon May 26 10:27:11 2003
+@@ -1,5 +1,6 @@
+ //-*-c++-*-
+ #include <tulip/TulipPlugin.h>
++#include <cstdio>
+ #include <string>
+ using namespace std;
+
diff -urN /usr/ports/graphics/tulip/files/patch-TemplateFactory.cxx graphics/tulip/files/patch-TemplateFactory.cxx
--- /usr/ports/graphics/tulip/files/patch-TemplateFactory.cxx Sat May 17 13:27:14 2003
+++ graphics/tulip/files/patch-TemplateFactory.cxx Mon May 26 14:31:45 2003
@@ -1,11 +1,20 @@
---- 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");
-- if ((error=dlerror())!=0)
-+ if ((error=(char*)dlerror())!=0)
- {
- dlclose(handle);
- if (loader!=0) loader->aborted(std::string(namelist[n]->d_name),std::string(error));
+--- library/tulip/include/tulip/cxx/TemplateFactory.cxx.orig Wed Apr 2 23:46:09 2003
++++ library/tulip/include/tulip/cxx/TemplateFactory.cxx Mon May 26 14:31:29 2003
+@@ -13,7 +13,7 @@
+ #include <dirent.h>
+
+ //implemented in TlpTools.cpp
+-int __tulip_selectSO(const struct dirent *ent);
++int __tulip_selectSO(struct dirent *ent);
+
+ template<class ObjectFactory, class ObjectType, class Parameter>
+ bool TemplateFactory<ObjectFactory, ObjectType, Parameter>::exists(const std::string &pluginName) {
+@@ -43,7 +43,7 @@
+ }
+ else {
+ createObj =(func) dlsym(handle, "_creator");
+- if ((error=dlerror())!=0) {
++ if ((error=(char*)dlerror())!=0) {
+ dlclose(handle);
+ if (loader!=0) loader->aborted(std::string(namelist[n]->d_name),std::string(error));
+ }
diff -urN /usr/ports/graphics/tulip/files/patch-TlpTools.cpp graphics/tulip/files/patch-TlpTools.cpp
--- /usr/ports/graphics/tulip/files/patch-TlpTools.cpp Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-TlpTools.cpp Mon May 26 14:32:38 2003
@@ -0,0 +1,11 @@
+--- library/tulip/src/TlpTools.cpp.orig Wed Apr 2 23:46:09 2003
++++ library/tulip/src/TlpTools.cpp Mon May 26 14:32:25 2003
+@@ -36,7 +36,7 @@
+ }
+ //=========================================================
+ // accepts only file names ending with ".so"
+-int __tulip_selectSO(const struct dirent *ent) {
++int __tulip_selectSO(struct dirent *ent) {
+ const char *SO = ".so";
+ int idx = strlen(ent->d_name) - 3;
+ if (idx < 0) return 0;
diff -urN /usr/ports/graphics/tulip/files/patch-tlprender.cpp graphics/tulip/files/patch-tlprender.cpp
--- /usr/ports/graphics/tulip/files/patch-tlprender.cpp Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-tlprender.cpp Mon May 26 14:30:04 2003
@@ -0,0 +1,44 @@
+--- software/tlprender/src/tlprender.cpp.orig Tue Apr 8 18:34:14 2003
++++ software/tlprender/src/tlprender.cpp Mon May 26 10:46:44 2003
+@@ -8,6 +8,9 @@
+ #include <queue>
+
+ #include <stdio.h>
++#ifdef __FreeBSD__
++#include <libgen.h>
++#endif
+ #include <getopt.h>
+ /* from man 3 basename, #include <libgen.h>. However we want to use GNU's basename.
+ * see: info libc, libgen.h and string.h for more information. libgen.h is required for dirname,
+@@ -54,7 +57,9 @@
+ static const int BUFFERSIZE(64 * 1024 * 1024);
+ static GLfloat *buffer;
+
++#ifdef HAVE_ON_EXIT
+ static void exitManager(int, void *);
++#endif
+ static void parseCommandLine(int, char **);
+ static void help() __attribute__ ((noreturn));
+
+@@ -318,7 +323,9 @@
+ /***************************************************************************************************/
+ int main (int argc, char **argv)
+ {
++#ifdef HAVE_ON_EXIT
+ on_exit(exitManager, NULL);
++#endif
+
+ parseCommandLine(argc, argv);
+
+@@ -401,9 +408,11 @@
+ /*
+ *
+ */
++#ifdef HAVE_ON_EXIT
+ void exitManager(int exitStatus, void *arg)
+ {
+ }
++#endif
+
+ /*
+ * command line parser and help() functions below this line, nothing else should be added after
diff -urN /usr/ports/graphics/tulip/pkg-plist graphics/tulip/pkg-plist
--- /usr/ports/graphics/tulip/pkg-plist Sat May 17 13:27:14 2003
+++ graphics/tulip/pkg-plist Mon May 26 14:30:04 2003
@@ -1,7 +1,10 @@
bin/Tulip
bin/tlprender
bin/tulip-config
+include/tulip/Array.h
include/tulip/Bezier.h
+include/tulip/Camera.h
+include/tulip/Circle.h
include/tulip/Cluster.h
include/tulip/Clustering.h
include/tulip/Color.h
@@ -14,9 +17,11 @@
include/tulip/GlFonts.h
include/tulip/GlGraph.h
include/tulip/GlGraphStrategy.h
+include/tulip/GlGraphWidget.h
include/tulip/GlLines.h
include/tulip/Glyph.h
include/tulip/GraphIterator.h
+include/tulip/GraphMeasure.h
include/tulip/IdManager.h
include/tulip/ImportModule.h
include/tulip/Int.h
@@ -24,11 +29,15 @@
include/tulip/Iterator.h
include/tulip/Layout.h
include/tulip/LayoutProxy.h
+include/tulip/MapIterator.h
+include/tulip/Matrix.h
include/tulip/MetaGraph.h
include/tulip/MetaGraphProxy.h
include/tulip/MethodFactory.h
include/tulip/Metric.h
include/tulip/MetricProxy.h
+include/tulip/MouseInterface.h
+include/tulip/MouseObject.h
include/tulip/Observable.h
include/tulip/Plugin.h
include/tulip/PluginContext.h
@@ -38,12 +47,18 @@
include/tulip/Property.h
include/tulip/PropertyProxy.h
include/tulip/PropertyProxyContainer.h
+include/tulip/PropertyWidgets.h
+include/tulip/Rectangle.h
include/tulip/Reflect.h
include/tulip/Selection.h
include/tulip/SelectionProxy.h
+include/tulip/SimpleVector.h
include/tulip/Size.h
include/tulip/Sizes.h
include/tulip/SizesProxy.h
+include/tulip/Spline.h
+include/tulip/StableIterator.h
+include/tulip/StlFunctions.h
include/tulip/StlIterator.h
include/tulip/String.h
include/tulip/StringProxy.h
@@ -54,17 +69,28 @@
include/tulip/SuperGraphView.h
include/tulip/TemplateFactory.h
include/tulip/TlpTools.h
+include/tulip/TulipElementProperties.h
+include/tulip/TulipElementPropertiesData.h
include/tulip/TulipPlugin.h
include/tulip/TypeConverter.h
include/tulip/Types.h
+include/tulip/Vector.h
include/tulip/WithParameter.h
+include/tulip/cxx/Array.cxx
+include/tulip/cxx/Circle.cxx
+include/tulip/cxx/Matrix.cxx
include/tulip/cxx/PropertyProxy.cxx
include/tulip/cxx/PropertyProxyContainer.cxx
include/tulip/cxx/Reflect.cxx
include/tulip/cxx/TemplateFactory.cxx
+include/tulip/cxx/Vector.cxx
+include/tulip/tulipconf.h
lib/libtulip-ogl.a
lib/libtulip-ogl.so
lib/libtulip-ogl.so.0
+lib/libtulip-qt.a
+lib/libtulip-qt.so
+lib/libtulip-qt.so.0
lib/libtulip.a
lib/libtulip.so
lib/libtulip.so.0
@@ -82,8 +108,11 @@
lib/tlp/plugins/clustering/quotientclustering.so
lib/tlp/plugins/clustering/segment.so
lib/tlp/plugins/clustering/sizen.so
+lib/tlp/plugins/clustering/strength.so
lib/tlp/plugins/colors/histogrammapping.so
lib/tlp/plugins/colors/linearmapping.so
+lib/tlp/plugins/colors/uniformquantif.so
+lib/tlp/plugins/designer/libTulipWidgets.so
lib/tlp/plugins/export/generic.so
lib/tlp/plugins/export/gml.so
lib/tlp/plugins/export/tlp.so
@@ -93,6 +122,7 @@
lib/tlp/plugins/glyph/cylinder.so
lib/tlp/plugins/glyph/sphere.so
lib/tlp/plugins/import/adjacencymatrix.so
+lib/tlp/plugins/import/circulant.so
lib/tlp/plugins/import/completebinary.so
lib/tlp/plugins/import/completegraph.so
lib/tlp/plugins/import/filesystem.so
@@ -108,6 +138,7 @@
lib/tlp/plugins/layout/conetree.so
lib/tlp/plugins/layout/conetreeextended.so
lib/tlp/plugins/layout/gem.so
+lib/tlp/plugins/layout/gem3d.so
lib/tlp/plugins/layout/generalgraph.so
lib/tlp/plugins/layout/generalgraph3d.so
lib/tlp/plugins/layout/generalgraphbox.so
@@ -116,6 +147,7 @@
lib/tlp/plugins/layout/sugiyama.so
lib/tlp/plugins/layout/treeleaf.so
lib/tlp/plugins/layout/treemap.so
+lib/tlp/plugins/layout/treeortho.so
lib/tlp/plugins/layout/treeradial.so
lib/tlp/plugins/layout/treereingold.so
lib/tlp/plugins/layout/treereingoldextended.so
@@ -137,15 +169,22 @@
lib/tlp/plugins/metric/spreadinginterpolation.so
lib/tlp/plugins/metric/strahler.so
lib/tlp/plugins/metric/strahlerall.so
+lib/tlp/plugins/metric/strength.so
lib/tlp/plugins/metric/strongcomponnet.so
lib/tlp/plugins/metric/treearitymax.so
lib/tlp/plugins/metric/viennot.so
lib/tlp/plugins/selection/inducedsubgraph.so
+lib/tlp/plugins/selection/labelselection.so
+lib/tlp/plugins/selection/loopselection.so
+lib/tlp/plugins/selection/multipleselection.so
lib/tlp/plugins/selection/reachable.so
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/plugins/string/idlabels.so
+share/aclocal/tulip.m4
+ at dirrm lib/tlp/plugins/string
@dirrm lib/tlp/plugins/sizes
@dirrm lib/tlp/plugins/selection
@dirrm lib/tlp/plugins/metric
@@ -153,6 +192,7 @@
@dirrm lib/tlp/plugins/import
@dirrm lib/tlp/plugins/glyph
@dirrm lib/tlp/plugins/export
+ at dirrm lib/tlp/plugins/designer
@dirrm lib/tlp/plugins/colors
@dirrm lib/tlp/plugins/clustering
@dirrm lib/tlp/plugins
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list