Update to 0.5.

7 files changed, 53 insertions, 8 deletions

diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index e50aea6f6117..142b18929bc1 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -6,19 +6,21 @@
 #
 
 PORTNAME=	scigraphica
-PORTVERSION=	0.4
+PORTVERSION=	0.5
 CATEGORIES=	math gnome
 MASTER_SITES=	http://magnet.fsu.edu/~feiguin/scigraphica/src/
 DISTNAME=	sg-${PORTVERSION}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-BUILD_DEPENDS=	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	python:${PORTSDIR}/lang/python \
+		${LOCALBASE}/include/python1.5/Numeric/arrayobject.h:${PORTSDIR}/math/numpy
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gtkextra.10:${PORTSDIR}/x11-toolkits/gtkextra \
 		xml.5:${PORTSDIR}/textproc/libxml
 RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore \
-		python:${PORTSDIR}/lang/python
+		python:${PORTSDIR}/lang/python \
+		${LOCALBASE}/include/python1.5/Numeric/arrayobject.h:${PORTSDIR}/math/numpy
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
diff --git a/math/scigraphica/distinfo b/math/scigraphica/distinfo
index c55e3e6b1b2e..166025c1f81a 100644
--- a/math/scigraphica/distinfo
+++ b/math/scigraphica/distinfo
@@ -1 +1 @@
-MD5 (sg-0.4.tar.gz) = f7a7faeff2942451a82e57a8b923e441
+MD5 (sg-0.5.tar.gz) = c6a6a1386e1903649aacb3f7f7f7f6b3
diff --git a/math/scigraphica/files/patch-ac b/math/scigraphica/files/patch-ac
index 2560b5117ef4..7337d4f840fc 100644
--- a/math/scigraphica/files/patch-ac
+++ b/math/scigraphica/files/patch-ac
@@ -1,11 +1,13 @@
---- configure	2000/08/29 12:12:11	1.1
-+++ configure	2000/08/29 12:13:43
-@@ -3409,7 +3409,7 @@
+--- configure.orig	Thu Aug 31 11:01:27 2000
++++ configure	Thu Aug 31 11:15:04 2000
+@@ -3549,8 +3549,8 @@
  	  	  PY_VERSION=`python -c 'import sys ; print sys.version[0:3]'`
  	  	  if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h; then
  		  PY_LIBS="python$PY_VERSION"
 -		  PY_LIB_LOC="-L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+-                  array_loc=`find $PY_PREFIX/include/python$PY_VERSION/ -name arrayobject.h -printf %h`
 +		  PY_LIB_LOC="-pthread -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
-                   array_loc=`find $PY_PREFIX/include/python$PY_VERSION/ -name arrayobject.h -printf %h`
++                  array_loc=`find $PY_PREFIX/include/python$PY_VERSION/ -name arrayobject.h -print | sed 's|/a.*\.h||'`
                    echo arrayobject.h location: $array_loc
                    PY_CFLAGS="-I$PY_PREFIX/include/python$PY_VERSION"
+                   if test -n $array_loc; then
diff --git a/math/scigraphica/files/patch-ad b/math/scigraphica/files/patch-ad
new file mode 100644
index 000000000000..5565d24e2c6a
--- /dev/null
+++ b/math/scigraphica/files/patch-ad
@@ -0,0 +1,10 @@
+--- zvt/subshell.c	2000/08/31 07:45:08	1.1
++++ zvt/subshell.c	2000/08/31 07:46:53
+@@ -24,6 +24,7 @@
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <sys/stat.h>
++#include <sys/param.h>
+ #include <limits.h>
+ #include <unistd.h>
+ #include <string.h>
diff --git a/math/scigraphica/files/patch-ae b/math/scigraphica/files/patch-ae
new file mode 100644
index 000000000000..05f95ae7d506
--- /dev/null
+++ b/math/scigraphica/files/patch-ae
@@ -0,0 +1,11 @@
+--- examples/Makefile.in	2000/08/31 08:26:13	1.1
++++ examples/Makefile.in	2000/08/31 08:26:37
+@@ -114,7 +114,7 @@
+ EXTRA_DIST =  	$(EXAMPLES)
+ 
+ 
+-Examplesdir = $(datadir)/examples
++Examplesdir = $(datadir)/examples/sg
+ 
+ Examples_DATA = $(EXAMPLES)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/math/scigraphica/files/patch-af b/math/scigraphica/files/patch-af
new file mode 100644
index 000000000000..8f7615d0eae7
--- /dev/null
+++ b/math/scigraphica/files/patch-af
@@ -0,0 +1,11 @@
+--- pixmaps/Makefile.in	2000/08/31 08:24:09	1.1
++++ pixmaps/Makefile.in	2000/08/31 08:24:43
+@@ -114,7 +114,7 @@
+ EXTRA_DIST =  	$(PIXMAPS)
+ 
+ 
+-Pixmapdir = $(datadir)/pixmaps
++Pixmapdir = $(datadir)/pixmaps/sg
+ 
+ Pixmap_DATA = $(PIXMAPS)
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/math/scigraphica/pkg-plist b/math/scigraphica/pkg-plist
index 97a57a80a395..893c53144acd 100644
--- a/math/scigraphica/pkg-plist
+++ b/math/scigraphica/pkg-plist
@@ -1,5 +1,9 @@
 bin/sga
 share/gnome/apps/Applications/sg.desktop
+share/gnome/examples/sg/multicolumn.sg
+share/gnome/examples/sg/simpletest.sg
+share/gnome/examples/sg/test.dat
+share/gnome/examples/sg/trigonometric.sg
 share/gnome/pixmaps/sg/arrow.xpm
 share/gnome/pixmaps/sg/arrow2.xpm
 share/gnome/pixmaps/sg/arrow_down.xpm
@@ -18,11 +22,13 @@ share/gnome/pixmaps/sg/fitpage.xpm
 share/gnome/pixmaps/sg/folder.xpm
 share/gnome/pixmaps/sg/font.xpm
 share/gnome/pixmaps/sg/font_large.xpm
+share/gnome/pixmaps/sg/function_small.xpm
 share/gnome/pixmaps/sg/italic.xpm
 share/gnome/pixmaps/sg/layer.xpm
 share/gnome/pixmaps/sg/left.xpm
 share/gnome/pixmaps/sg/logo.xpm
 share/gnome/pixmaps/sg/new.xpm
+share/gnome/pixmaps/sg/new_function.xpm
 share/gnome/pixmaps/sg/new_plot.xpm
 share/gnome/pixmaps/sg/new_sheet.xpm
 share/gnome/pixmaps/sg/open.xpm
@@ -39,6 +45,7 @@ share/gnome/pixmaps/sg/sg.xpm
 share/gnome/pixmaps/sg/sg_icon.xpm
 share/gnome/pixmaps/sg/sheet_icon.xpm
 share/gnome/pixmaps/sg/sheet_icon2.xpm
+share/gnome/pixmaps/sg/sheet_small.xpm
 share/gnome/pixmaps/sg/sorry.xpm
 share/gnome/pixmaps/sg/target.xpm
 share/gnome/pixmaps/sg/text.xpm
@@ -47,3 +54,5 @@ share/gnome/pixmaps/sg/zoom.xpm
 share/gnome/pixmaps/sg/zoom_minus.xpm
 share/gnome/pixmaps/sg/zoom_plus.xpm
 @dirrm share/gnome/pixmaps/sg
+@dirrm share/gnome/examples/sg
+@dirrm share/gnome/examples