- Remove math/gnumeric dependency by adding GNOME_Gnumeric_Graph.idl to FILESDIR so things like gnucash can still have graphing support.

3 files changed, 132 insertions, 8 deletions

diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index aa048126c42..d8d55a36c1c 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -18,22 +18,21 @@ COMMENT=	A ploting program for GNOME
 
 LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
+USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs bonobo libglade gal gnometarget
 USE_PYTHON=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-explicit-python-linking
+CONFIGURE_ARGS=	--enable-gnumeric --enable-explicit-python-linking
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/libglade-1.0" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		GNUMERIC_IDLDIR="`cd ${PORTSDIR}/math/gnumeric && ${MAKE} -V WRKSRC`/idl"
+		GNUMERIC_IDLDIR="${WRKDIR}/gnumeric"
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-# Can't use BUILD_DEPENDS, because then we have `short circuit' for
-# make clean - Gnumeric tries to clean-up Guppi, while Guppi in turn
-# tries to clean Gnumeric.
 post-extract:
-	@cd ${PORTSDIR}/math/gnumeric && ${MAKE} patch
+	@${MKDIR} ${WRKDIR}/gnumeric
+	@${CP} ${FILESDIR}/GNOME_Gnumeric_Graph.idl ${WRKDIR}/gnumeric
 
 .include <bsd.port.mk>
diff --git a/math/guppi/distinfo b/math/guppi/distinfo
index 402d95009ad..0184ca6f016 100644
--- a/math/guppi/distinfo
+++ b/math/guppi/distinfo
@@ -1,2 +1,4 @@
-MD5 (Guppi-0.40.3.tar.gz) = 701afdafc187b61cfa22a7b2269b970d
-SIZE (Guppi-0.40.3.tar.gz) = 1362461
+MD5 (Guppi-0.40.3.tar.bz2) = 26ec6eb5b6fe7fb4e32ecff64d4f1b16
+SIZE (Guppi-0.40.3.tar.bz2) = 1016831
+MD5 (gnumeric-idl.tar.bz2) = d8c0d225007c4eb2d28c7be7eafe692d
+SIZE (gnumeric-idl.tar.bz2) = 1412
diff --git a/math/guppi/files/GNOME_Gnumeric_Graph.idl b/math/guppi/files/GNOME_Gnumeric_Graph.idl
new file mode 100644
index 00000000000..5a104973748
--- /dev/null
+++ b/math/guppi/files/GNOME_Gnumeric_Graph.idl
@@ -0,0 +1,123 @@
+/**
+ * The interfaces Gnumeric uses to communicate with graphing components
+ *
+ * Author:
+ *   Jody Goldberg <jody@gnome.org>
+ */
+#include <Bonobo.idl>
+
+module GNOME {
+    module Gnumeric {
+	struct Pair {
+	    short start;
+	    short end;
+	};
+	typedef long		   PlotID;
+	typedef long		   SeriesID;
+	typedef long		   VectorID;
+	typedef sequence<Pair>	   SeqPair;
+	typedef sequence<VectorID> VectorIDs;
+	typedef sequence<octet>	   Buffer;
+
+	exception Error { string mesg; };
+
+	enum VectorType {
+	    VECTOR_TYPE_SCALAR,
+	    VECTOR_TYPE_DATE,
+	    VECTOR_TYPE_STRING
+	};
+
+	/* This is a place holder */
+	interface VectorSelection {
+	    oneway void selected (in SeqPair ranges);
+	};
+	module Scalar {
+	    typedef sequence<double> Seq;
+	    interface Vector : VectorSelection {
+		oneway void changed (in short start, in Seq new_values);
+		void value (out Seq values);
+	    };
+	};
+	module String {
+	    typedef sequence<string> Seq;
+	    interface Vector : VectorSelection {
+		oneway void changed (in short start, in Seq new_values);
+		void value (out Seq values);
+	    };
+	};
+
+	module Graph_v2 {
+	    interface ConfigGuru : Bonobo::Control {
+		oneway void applyChanges ();
+	    };
+
+	    interface DataGuru : ConfigGuru {
+		readonly attribute Buffer spec;
+
+		/**
+		 * seriesSetDimension :
+		 *
+		 * Add/Remove/Edit the vector associated with a specific dimension
+		 * of an series.
+		 *
+		 * a vectorID of -1 will remove the dimension.
+		 */
+		void seriesSetDimension (in SeriesID seriesID,
+					 in string dim,
+					 in VectorID vectorID)
+		    raises (Error);
+
+		PlotID   plotAdd      ()		   raises (Error);
+		void     plotDelete   (in PlotID plot)	   raises (Error);
+		SeriesID seriesAdd    (in PlotID plot)	   raises (Error);
+		void     seriesDelete (in SeriesID series) raises (Error);
+	    };
+
+	    interface Manager : Bonobo::Embeddable {
+		ConfigGuru configure (in string type);
+
+		/**
+		 * Read :
+		 * 	A full specified document including enough markup
+		 * 	information to assist in data assignment and for
+		 * 	persistence.
+		 *
+		 * Write :
+		 * 	Take a possibly incomplete description of a graph using
+		 * 	a subset of the dtd used for persistence and initialize
+		 * 	the graphs state.  The document refers to vectors by
+		 * 	IDs that were assigned previously.
+		 */
+		attribute Buffer spec;
+
+		/**
+		 * addVector :
+		 *
+		 * Register new vectors and get their callbacks.
+		 */
+		VectorSelection addVector (in VectorSelection v,
+					   in VectorType type, in VectorID id,
+					   in string default_fmt);
+
+		/**
+		 * clearVectors :
+		 *
+		 * Remove all references to the existing set of vectors.
+		 */
+		oneway void clearVectors ();
+
+		/**
+		 * arrangeVectors :
+		 *
+		 * Take the set of vectors and their optional
+		 * headers in the order specified by the
+		 * supplied @data ids, and arrange them into a
+		 * graph using the 'current' graph type.
+		 */
+		oneway void arrangeVectors (in VectorIDs data,
+					    in VectorIDs optional_headers);
+
+	    };
+	};
+    };
+};