ports/51227: Update port: graphics/tulip to 1.2.3
KATO Tsuguru
tkato at prontomail.com
Mon Apr 21 17:40:36 UTC 2003
>Number: 51227
>Category: ports
>Synopsis: Update port: graphics/tulip to 1.2.3
>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 Apr 21 10:40:11 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.3
New file:
files/patch-GlGraph.cpp
files/patch-ltmain.sh
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/tulip/Makefile graphics/tulip/Makefile
--- /usr/ports/graphics/tulip/Makefile Sat Apr 12 22:49:46 2003
+++ graphics/tulip/Makefile Sun Apr 20 10:11:47 2003
@@ -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/
MAINTAINER= ports at 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 -urN /usr/ports/graphics/tulip/distinfo graphics/tulip/distinfo
--- /usr/ports/graphics/tulip/distinfo Sun Feb 9 00:09:39 2003
+++ graphics/tulip/distinfo Sat Apr 19 22:37:44 2003
@@ -1 +1 @@
-MD5 (tulip-1.2.2.tar.gz) = e8273b535aeb4434d8f8c71aa56c06fb
+MD5 (tulip-1.2.3.tar.gz) = 8dc54e902488b23d10cfa905d73dfa6f
diff -urN /usr/ports/graphics/tulip/files/patch-FileSystem.cpp graphics/tulip/files/patch-FileSystem.cpp
--- /usr/ports/graphics/tulip/files/patch-FileSystem.cpp Sun Feb 9 00:09:40 2003
+++ graphics/tulip/files/patch-FileSystem.cpp Sun Apr 20 01:10:47 2003
@@ -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 -urN /usr/ports/graphics/tulip/files/patch-GlGraph.cpp graphics/tulip/files/patch-GlGraph.cpp
--- /usr/ports/graphics/tulip/files/patch-GlGraph.cpp Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-GlGraph.cpp Sat Apr 19 23:54:37 2003
@@ -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 -urN /usr/ports/graphics/tulip/files/patch-TemplateFactory.cxx graphics/tulip/files/patch-TemplateFactory.cxx
--- /usr/ports/graphics/tulip/files/patch-TemplateFactory.cxx Sun Feb 9 00:09:40 2003
+++ graphics/tulip/files/patch-TemplateFactory.cxx Sun Apr 20 09:15:00 2003
@@ -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 -urN /usr/ports/graphics/tulip/files/patch-ltmain.sh graphics/tulip/files/patch-ltmain.sh
--- /usr/ports/graphics/tulip/files/patch-ltmain.sh Thu Jan 1 09:00:00 1970
+++ graphics/tulip/files/patch-ltmain.sh Sat Apr 19 23:26:34 2003
@@ -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 -urN /usr/ports/graphics/tulip/pkg-plist graphics/tulip/pkg-plist
--- /usr/ports/graphics/tulip/pkg-plist Sun Feb 9 00:09:39 2003
+++ graphics/tulip/pkg-plist Sun Apr 20 02:05:57 2003
@@ -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/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/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/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
- at dirrm lib/tlp/samples/tlp
- at dirrm lib/tlp/samples/posets
- at dirrm lib/tlp/samples/matrix
- at dirrm lib/tlp/samples/gml
- at dirrm lib/tlp/samples
@dirrm lib/tlp/plugins/sizes
@dirrm lib/tlp/plugins/selection
@dirrm lib/tlp/plugins/metric
@@ -109,3 +157,6 @@
@dirrm lib/tlp/plugins/clustering
@dirrm lib/tlp/plugins
@dirrm lib/tlp/bitmaps
+ at dirrm lib/tlp
+ at dirrm include/tulip/cxx
+ at dirrm include/tulip
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list