From 7609ebdbe8526e575b98dbead3c7501052f548b0 Mon Sep 17 00:00:00 2001 From: rillig Date: Sun, 2 Jul 2006 10:21:14 +0000 Subject: Updated scigraphica to 2.1.0. This fixes PR 33846. No useful ChangeLog provided. --- graphics/scigraphica/Makefile | 15 +---- graphics/scigraphica/PLIST | 32 ++++----- graphics/scigraphica/distinfo | 13 ++-- graphics/scigraphica/patches/patch-aa | 123 +++++++++++++++++----------------- graphics/scigraphica/patches/patch-ab | 13 ---- graphics/scigraphica/patches/patch-ac | 43 ------------ graphics/scigraphica/patches/patch-ad | 20 ------ 7 files changed, 87 insertions(+), 172 deletions(-) delete mode 100644 graphics/scigraphica/patches/patch-ab delete mode 100644 graphics/scigraphica/patches/patch-ac delete mode 100644 graphics/scigraphica/patches/patch-ad diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile index 7a117e317fa..2c1781ff33b 100644 --- a/graphics/scigraphica/Makefile +++ b/graphics/scigraphica/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2006/04/22 18:44:58 joerg Exp $ +# $NetBSD: Makefile,v 1.36 2006/07/02 10:21:14 rillig Exp $ # -DISTNAME= scigraphica-0.8.0 -PKGREVISION= 10 +DISTNAME= scigraphica-2.1.0 CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scigraphica/} @@ -25,17 +24,9 @@ CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN:Q} USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -PY_PATCHPLIST= YES PTHREAD_AUTO_VARS= yes .include "../../lang/python/application.mk" - -.include "../../devel/readline/buildlink3.mk" -.include "../../graphics/imlib/buildlink3.mk" -.include "../../math/py-Numeric/buildlink3.mk" -.include "../../textproc/libxml/buildlink3.mk" -.include "../../x11/gtk/buildlink3.mk" -.include "../../x11/gtk+extra/buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" +.include "../../graphics/libscigraphica/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/scigraphica/PLIST b/graphics/scigraphica/PLIST index 898fe8b4b88..517fde3e5e9 100644 --- a/graphics/scigraphica/PLIST +++ b/graphics/scigraphica/PLIST @@ -1,5 +1,12 @@ -@comment $NetBSD: PLIST,v 1.2 2002/01/24 19:24:04 wiz Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/07/02 10:21:14 rillig Exp $ bin/scigraphica +lib/scigraphica/${PKGVERSION}/plugins/project/io/io.la +lib/scigraphica/${PKGVERSION}/plugins/project/io/plugin.xml +lib/scigraphica/${PKGVERSION}/plugins/project/menus/menus.la +lib/scigraphica/${PKGVERSION}/plugins/project/menus/plugin.xml +lib/scigraphica/${PKGVERSION}/plugins/project/toolbars/plugin.xml +lib/scigraphica/${PKGVERSION}/plugins/project/toolbars/toolbars.la +man/man1/scigraphica.1 share/gnome/apps/Applications/sg.desktop share/gnome/help/scigraphica/C/FAQ.html share/gnome/help/scigraphica/C/Introduction.html @@ -36,7 +43,6 @@ share/pixmaps/scigraphica/error.xpm share/pixmaps/scigraphica/exec_small.xpm share/pixmaps/scigraphica/exit_small.xpm share/pixmaps/scigraphica/eye.xpm -share/pixmaps/scigraphica/fit5.xpm share/pixmaps/scigraphica/fit_page.xpm share/pixmaps/scigraphica/fitpage.xpm share/pixmaps/scigraphica/folder.xpm @@ -145,6 +151,7 @@ share/pixmaps/scigraphica/target.xpm share/pixmaps/scigraphica/text.xpm share/pixmaps/scigraphica/tools.xpm share/pixmaps/scigraphica/warning.xpm +share/pixmaps/scigraphica/world.xpm share/pixmaps/scigraphica/zoom.xpm share/pixmaps/scigraphica/zoom_minus.xpm share/pixmaps/scigraphica/zoom_plus.xpm @@ -155,28 +162,21 @@ share/scigraphica/examples/3d.sg share/scigraphica/examples/image.sg share/scigraphica/examples/matrix.sg share/scigraphica/examples/multicolumn.sg +share/scigraphica/examples/plot_columns.py +share/scigraphica/examples/plot_expressions.py share/scigraphica/examples/polar.sg -share/scigraphica/examples/py_example1.py -share/scigraphica/examples/py_example2.py share/scigraphica/examples/simpletest.sg share/scigraphica/examples/test.dat share/scigraphica/examples/ticks.sg share/scigraphica/examples/trigonometric.sg share/scigraphica/examples/vectors.sg -share/scigraphica/python/FitWizard.py -share/scigraphica/python/SimpleStats.py -share/scigraphica/python/clarens.py -share/scigraphica/python/clarens_histograms.py -share/scigraphica/python/gtkLeastSquares.py -share/scigraphica/python/pstat.py -share/scigraphica/python/pysga.py -share/scigraphica/python/sgagtk.py -share/scigraphica/python/stats.py -share/scigraphica/python/test_plugin.py -share/scigraphica/python/unpickler.py -@dirrm share/scigraphica/python @dirrm share/scigraphica/examples @dirrm share/scigraphica @dirrm share/pixmaps/scigraphica @dirrm share/gnome/help/scigraphica/C @dirrm share/gnome/help/scigraphica +@dirrm lib/scigraphica/${PKGVERSION}/plugins/project/toolbars +@dirrm lib/scigraphica/${PKGVERSION}/plugins/project/menus +@dirrm lib/scigraphica/${PKGVERSION}/plugins/project/io +@dirrm lib/scigraphica/${PKGVERSION}/plugins/project +@dirrm lib/scigraphica/${PKGVERSION}/plugins diff --git a/graphics/scigraphica/distinfo b/graphics/scigraphica/distinfo index 24f55b99096..60664089297 100644 --- a/graphics/scigraphica/distinfo +++ b/graphics/scigraphica/distinfo @@ -1,9 +1,6 @@ -$NetBSD: distinfo,v 1.8 2006/04/22 18:44:58 joerg Exp $ +$NetBSD: distinfo,v 1.9 2006/07/02 10:21:14 rillig Exp $ -SHA1 (scigraphica-0.8.0.tar.gz) = 7a3b932f4e5de39bbf815c0e5629005e3c209421 -RMD160 (scigraphica-0.8.0.tar.gz) = f0f38cdc877ffe6ed16e655efac324c7c36f0f9f -Size (scigraphica-0.8.0.tar.gz) = 841199 bytes -SHA1 (patch-aa) = 5cd12c4adaa496bafc6bb68c57575a4e35d3913a -SHA1 (patch-ab) = f96a2bf4d9ac22e9ec9c467b010f9f9cf4a642d5 -SHA1 (patch-ac) = c105e7f5ac410bbce44df667594b70cfdba825af -SHA1 (patch-ad) = da24a288074ec93d1c734b57afc92af96a98df49 +SHA1 (scigraphica-2.1.0.tar.gz) = 59574fddfe5a3529c69e1bd84fb62c019b4ef8d0 +RMD160 (scigraphica-2.1.0.tar.gz) = 275790299fcceee41a186b4ec03e1a9e3b3eb125 +Size (scigraphica-2.1.0.tar.gz) = 539549 bytes +SHA1 (patch-aa) = f683594c3c7361e9d3fe6097d6fb5c9fdf3fa34c diff --git a/graphics/scigraphica/patches/patch-aa b/graphics/scigraphica/patches/patch-aa index 3d2e545d444..fcdb666d3c7 100644 --- a/graphics/scigraphica/patches/patch-aa +++ b/graphics/scigraphica/patches/patch-aa @@ -1,62 +1,65 @@ -$NetBSD: patch-aa,v 1.5 2002/01/24 19:24:04 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2006/07/02 10:21:14 rillig Exp $ ---- configure.orig Fri Nov 30 18:01:37 2001 -+++ configure -@@ -7826,35 +7826,7 @@ - EOF - - --# Extract the first word of "python", so it can be a program name with args. --set dummy python; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:7833: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_python_val'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test -n "$python_val"; then -- ac_cv_prog_python_val="$python_val" # Let the user override the test. --else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_python_val="true" -- break -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_python_val" && ac_cv_prog_python_val="false" --fi --fi --python_val="$ac_cv_prog_python_val" --if test -n "$python_val"; then -- echo "$ac_t""$python_val" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -+python_val=true - - numpy=false - -@@ -7875,16 +7847,16 @@ - fi - - if test x$python_prefix = x; then -- PY_PREFIX=`python -c 'import sys ; print sys.prefix'` -- PY_EXEC_PREFIX=`python -c 'import sys ; print sys.exec_prefix'` -+ PY_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.prefix'` -+ PY_EXEC_PREFIX=`${PYTHONBIN} -c 'import sys ; print sys.exec_prefix'` - else - echo "Using alternative python installation under $python_prefix" - PY_PREFIX=$python_prefix - PY_EXEC_PREFIX=$python_prefix - fi - -- PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'` -- PY_VVERSION=`python -c 'import sys ; print sys.version[0:5]'` -+ PY_VERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:3]'` -+ PY_VVERSION=`${PYTHONBIN} -c 'import sys ; print sys.version[0:5]'` - echo "Searching for arrayobject.h" - if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then +See libscigraphica/patches/patch-aa. + +--- configure.orig 2005-06-24 03:44:25.000000000 +0200 ++++ configure 2006-06-28 20:11:19.000000000 +0200 +@@ -2007,7 +2007,6 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(inst + + + +-/* print extra warning messages when compiling CVS */ + test "`echo ${SCIGRAPHICA_VERSION} || grep -i cvs`" && CFLAGS="$CFLAGS -g -O -W -Wall -DWITH_WARNINGS" + + +@@ -10544,10 +10543,7 @@ fi; + PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION" PY_LIBS="python$PY_VERSION" + PY_LIB_LOC="$PY_EXEC_PREFIX/lib/python$PY_VERSION/" +- array_loc=`find $python_numeric_path -name arrayobject.h | sed s/arrayobject\.h//` +- if test x$array_loc = x; then +- array_loc=`find $PY_PREFIX/ -name arrayobject.h | sed s/arrayobject\.h//` +- fi ++ array_loc="${PY_PREFIX}/include/python${PY_VERSION}/numarray" + if test -n $array_loc -a -d $array_loc; then + echo "$array_loc" + PY_CFLAGS="$PY_CFLAGS -I$array_loc -DWITH_NUMERIC_PYTHON" +@@ -10604,22 +10600,6 @@ GTK_EXTRA_VERSION=`$GTK_EXTRA_CONFIG --v + GTK_VERSION=`$GTK_CONFIG --version` + XML_VERSION=`$XML_CONFIG --version` + +-# strip duplicate entries in compiler flags +-echo "stripping compiler flags" +-COMPILER_FLAGS="" +-for i in $CC \ +- $CFLAGS $XML_CFLAGS $GDK_IMLIB_CFLAGS $GTK_CFLAGS $GTK_EXTRA_CFLAGS $PY_CFLAGS \ +- $LIBS $XML_LIBS $GDK_IMLIB_LIBS $GTK_LIBS $GTK_EXTRA_LIBS \ +- $LDFLAGS +-do +- found="false" +- for k in $COMPILER_FLAGS +- do +- test "$i" = "$k" && { found="true" ; break ; } +- done +- test "$found" = "false" && COMPILER_FLAGS="$COMPILER_FLAGS $i" +-done +- + scigraphica_prefix="${prefix}" + scigraphica_exec_prefix="${exec_prefix}" + scigraphica_version="$SCIGRAPHICA_VERSION" +@@ -10637,12 +10617,9 @@ scigraphica_icondir="${datadir}/pixmaps/ + + + cat >>confdefs.h <<_ACEOF +-#define VERSION_INFO "sg-$VERSION\\n$UNAME\\n\ +-gtk-$GTK_VERSION gtkextra-$GTK_EXTRA_VERSION $GNOME_VERSION\\n\ +-xml-$XML_VERSION python-$PY_VVERSION $array_loc\\n"\ +-__DATE__ " " __TIME__ "\\n\ +-Compiler flags:$COMPILER_FLAGS\\n\ +-(C) 2000 Adrian E. Feiguin\\n" ++#define VERSION_INFO \ ++ "sg-$VERSION\\n" \ ++ "(C) 2000 Adrian E. Feiguin\\n" + + _ACEOF + diff --git a/graphics/scigraphica/patches/patch-ab b/graphics/scigraphica/patches/patch-ab deleted file mode 100644 index 760a68083f9..00000000000 --- a/graphics/scigraphica/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.3 2002/01/24 19:24:04 wiz Exp $ - ---- src/Makefile.in.orig Fri Nov 30 18:03:38 2001 -+++ src/Makefile.in -@@ -161,7 +161,7 @@ - - DEFS = @DEFS@ -I. -I$(srcdir) -I.. - CPPFLAGS = @CPPFLAGS@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -export-dynamic - scigraphica_OBJECTS = gtkpixmapmenuitem.$(OBJEXT) gtkplotart.$(OBJEXT) \ - gtkplotgnome.$(OBJEXT) sg.$(OBJEXT) sg_arrange_dialog.$(OBJEXT) \ - sg_axis_dialog.$(OBJEXT) sg_clipboard.$(OBJEXT) \ diff --git a/graphics/scigraphica/patches/patch-ac b/graphics/scigraphica/patches/patch-ac deleted file mode 100644 index 07dc2bacedf..00000000000 --- a/graphics/scigraphica/patches/patch-ac +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2002/01/24 19:24:04 wiz Exp $ - ---- zvt/subshell.c.orig Tue Nov 20 22:41:43 2001 -+++ zvt/subshell.c -@@ -242,6 +242,7 @@ - } - #endif - -+#if 0 - static int - path_max (void) - { -@@ -255,7 +256,7 @@ - # endif - #endif - } -- -+#endif - - static struct termios* - init_term_with_defaults(struct termios* term) -@@ -423,20 +424,17 @@ - static void * - get_ptys (int *master, int *slave, int update_wutmp) - { -- GnomePtyOps op; - int result, n; - void *tag; - struct termios term; -- char *term_name; - - /* - // *master = receive_fd (helper_socket_fdpassing [0]); - // *slave = receive_fd (helper_socket_fdpassing [0]); - */ - -- term_name = ((char *) alloca (path_max())) + 1; - init_term_with_defaults(&term); -- openpty (master, slave, term_name, &term, NULL); -+ openpty (master, slave, 0, &term, NULL); - tag=master; - return tag; - } diff --git a/graphics/scigraphica/patches/patch-ad b/graphics/scigraphica/patches/patch-ad deleted file mode 100644 index fa410f5235b..00000000000 --- a/graphics/scigraphica/patches/patch-ad +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/04/22 18:44:58 joerg Exp $ - ---- src/python/python_config.c.orig 2006-04-22 18:26:55.000000000 +0000 -+++ src/python/python_config.c -@@ -236,6 +236,7 @@ void config_apply(GtkWidget *widget, gpo - } - break; - default: -+ break; - } - } - #ifdef WITH_GNOME -@@ -610,6 +611,7 @@ void sg_create_config_dialog(sg_config_i - break; - - default: -+ break; - } - } - -- cgit v1.2.3