7 files changed, 240 insertions, 110 deletions

diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index a23991624f0c..c9ffe65c8c5b 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,12 +3,14 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/seed/Makefile,v 1.8 2009/10/19 19:33:26 kwm Exp $
+#   $MCom: ports/devel/seed/Makefile,v 1.19 2010/05/08 17:04:45 marcus Exp $
+#
+# NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
+# To do that, just replace imports.searchPaths with "." and ".." elements.
 #
 
 PORTNAME=	seed
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -39,23 +41,28 @@ MAN1=		seed.1
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not link on sparc64: TLS not available on this platform
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|reference||g' ${WRKSRC}/doc/Makefile.in
-	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
-.if defined(NOPORTEXAMPLES)
-	@${REINPLACE_CMD} -e 's|examples||g' \
-		${WRKSRC}/Makefile.in
-.endif
+#	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
+#		's|$$(datadir)/doc/seed/examples|${EXAMPLESDIR}|g'
+#.if defined(NOPORTEXAMPLES)
+#	@${REINPLACE_CMD} -e 's|examples||g' \
+#		${WRKSRC}/Makefile.in
+#.endif
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's| install-seeddocDATA||g ; s|doc$$||g' \
 		${WRKSRC}/Makefile.in
 .endif
 
+pre-build:
+	cd ${WRKSRC}/extensions && ${SETENV} ${MAKE_ENV} ${GMAKE} \
+	    	${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
+	${CP} ${WRKSRC}/extensions/Seed.js ${WRKSRC}/extensions/Seed.js.sav
+	${CP} ${FILESDIR}/Seed.js ${WRKSRC}/extensions/Seed.js
+
+post-build:
+	${CP} ${WRKSRC}/extensions/Seed.js.sav ${WRKSRC}/extensions/Seed.js
+
 .include <bsd.port.post.mk>
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
index 3733f839437a..6bee1233b0cf 100644
--- a/devel/seed/distinfo
+++ b/devel/seed/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seed-2.28.1.tar.bz2) = ac2b3e2789528510632154ed08380790
-SHA256 (gnome2/seed-2.28.1.tar.bz2) = c5018a9e4267d7b52c690ceb088f8c4573670460d6d5bc413afcc13510d4f4f2
-SIZE (gnome2/seed-2.28.1.tar.bz2) = 839512
+MD5 (gnome2/seed-2.30.0.tar.bz2) = dd09d22c6a06b4bbef7320bb6a715c0f
+SHA256 (gnome2/seed-2.30.0.tar.bz2) = 3b5e7babd1e14793829c9d521319cbf2af9a66bea604c5dc80a9885558f00361
+SIZE (gnome2/seed-2.30.0.tar.bz2) = 770032
diff --git a/devel/seed/files/Seed.js b/devel/seed/files/Seed.js
new file mode 100644
index 000000000000..9edb12c87564
--- /dev/null
+++ b/devel/seed/files/Seed.js
@@ -0,0 +1,203 @@
+GLib = imports.gi.GLib;
+
+Seed.sprintf = function ()
+{
+    if (typeof arguments == "undefined") { return null; }
+    if (arguments.length < 1) { return null; }
+    if (typeof arguments[0] != "string") { return null; }
+    if (typeof RegExp == "undefined") { return null; }
+
+    var string = arguments[0];
+    var exp = new RegExp(/(%([%]|(\-)?(\+|\x20)?(0)?(\d+)?(\.(\d)?)?([bcdfosxX])))/g);
+    var matches = new Array();
+    var strings = new Array();
+    var convCount = 0;
+    var stringPosStart = 0;
+    var stringPosEnd = 0;
+    var matchPosEnd = 0;
+    var newString = '';
+    var match = null;
+
+    while (match = exp.exec(string)) {
+        if (match[9]) { convCount += 1; }
+
+        stringPosStart = matchPosEnd;
+        stringPosEnd = exp.lastIndex - match[0].length;
+        strings[strings.length] = string.substring(stringPosStart, stringPosEnd);
+
+        matchPosEnd = exp.lastIndex;
+        matches[matches.length] = {
+            match: match[0],
+            left: match[3] ? true : false,
+            sign: match[4] || '',
+            pad: match[5] || ' ',
+            min: match[6] || 0,
+            precision: match[8],
+            code: match[9] || '%',
+            negative: parseInt(arguments[convCount]) < 0 ? true : false,
+            argument: String(arguments[convCount])
+        };
+    }
+    strings[strings.length] = string.substring(matchPosEnd);
+
+    if (matches.length == 0) { return string; }
+    if ((arguments.length - 1) < convCount) { return null; }
+
+    var code = null;
+    var match = null;
+    var i = null;
+
+    for (i=0; i<matches.length; i++) {
+
+        if (matches[i].code == '%') { substitution = '%' }
+        else if (matches[i].code == 'b') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(2));
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'c') {
+            matches[i].argument = String(String.fromCharCode(parseInt(Math.abs(parseInt(matches[i].argument)))));
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'd') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'f') {
+            matches[i].argument = String(Math.abs(parseFloat(matches[i].argument)).toFixed(matches[i].precision ? matches[i].precision : 6));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'o') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(8));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 's') {
+            matches[i].argument = matches[i].argument.substring(0, matches[i].precision ? matches[i].precision : matches[i].argument.length)
+            substitution = Seed.sprintf.convert(matches[i], true);
+        }
+        else if (matches[i].code == 'x') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));
+            substitution = Seed.sprintf.convert(matches[i]);
+        }
+        else if (matches[i].code == 'X') {
+            matches[i].argument = String(Math.abs(parseInt(matches[i].argument)).toString(16));
+            substitution = Seed.sprintf.convert(matches[i]).toUpperCase();
+        }
+        else {
+            substitution = matches[i].match;
+        }
+
+        newString += strings[i];
+        newString += substitution;
+
+    }
+    newString += strings[i];
+
+    return newString;
+
+};
+
+Seed.sprintf.convert = function(match, nosign)
+{
+    if (nosign) {
+        match.sign = '';
+    } else {
+        match.sign = match.negative ? '-' : match.sign;
+    }
+    var l = match.min - match.argument.length + 1 - match.sign.length;
+    var pad = new Array(l < 0 ? 0 : l).join(match.pad);
+    if (!match.left) {
+        if (match.pad == "0" || nosign) {
+            return match.sign + pad + match.argument;
+        } else {
+            return pad + match.sign + match.argument;
+        }
+    } else {
+        if (match.pad == "0" || nosign) {
+            return match.sign + match.argument + pad.replace(/0/g, ' ');
+        } else {
+            return match.sign + match.argument + pad;
+        }
+    }
+};
+
+
+Seed.repl = function()
+{
+	try
+	{
+		if(readline)
+		{
+			// readline is loaded
+		}
+	}
+	catch (e)
+	{
+		try
+		{
+			readline = imports.readline;
+		}
+		catch (e)
+		{
+			print(e.name + " " + e.message);
+			return true;
+		}
+	}
+
+	try
+	{
+		item = readline.readline("> ");
+		if (item == "continue")
+			return false;
+		print(eval(item));
+	}
+	catch (e)
+	{
+		print(e.name + " " + e.message);
+	}
+	return true;
+}
+
+
+Seed.glib_repl = function()
+{
+	GLib.idle_add(Seed.repl, null);
+}
+
+Seed.thread_repl = function()
+{
+	GLib.thread_create_full(function() { while(Seed.repl()){} },
+							null, 0, true);
+}
+
+Seed.printf = function () { print(Seed.sprintf.apply(this, arguments)) };
+
+if(!imports.searchPath || (imports.searchPath.length == 0))
+{
+	imports.searchPath = [ ".",
+	                       ".." ];
+
+	if(Seed.argv.length > 1)
+	{
+		__script_path__ = GLib.path_get_dirname(Seed.argv[1]);
+		
+		try
+		{
+			if(!GLib.path_is_absolute(__script_path__))
+			{
+				__script_path__ = GLib.build_filenamev([GLib.get_current_dir(),
+				                                      __script_path__]);
+			}
+		
+			__script_path__ = imports.os.realpath(__script_path__);
+		
+			if(__script_path__ && __script_path__ != "")
+				imports.searchPath.push(__script_path__);
+		}
+		catch(e)
+		{
+			print(imports.JSON.stringify(e));
+		}
+	}
+
+	imports.searchPath.push(".");
+}
diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c
index c216fa88c4a2..ffce2725415b 100644
--- a/devel/seed/files/patch-libseed_seed-importer.c
+++ b/devel/seed/files/patch-libseed_seed-importer.c
@@ -1,6 +1,6 @@
---- libseed/seed-importer.c.orig	2009-08-10 16:23:35.000000000 -0400
-+++ libseed/seed-importer.c	2009-08-22 14:36:00.000000000 -0400
-@@ -22,6 +22,8 @@
+--- libseed/seed-importer.c.orig	2009-12-31 11:42:51.000000000 +0100
++++ libseed/seed-importer.c	2010-01-02 02:12:09.000000000 +0100
+@@ -19,6 +19,8 @@
  
  #include <gio/gio.h>
  #include <string.h>
@@ -9,7 +9,7 @@
  
  #include "seed-private.h"
  
-@@ -637,8 +639,9 @@ seed_importer_handle_file (JSContextRef 
+@@ -636,8 +638,9 @@ seed_importer_handle_file (JSContextRef 
    JSValueRef js_file_dirname;
    JSObjectRef global, c_global;
    JSStringRef file_contents, file_name;
@@ -20,11 +20,11 @@
  
    file_path = g_build_filename (dir, file, NULL);
    canonical = seed_importer_canonicalize_path (file_path);
-@@ -692,15 +695,24 @@ seed_importer_handle_file (JSContextRef 
+@@ -691,15 +694,24 @@ seed_importer_handle_file (JSContextRef 
  					g_path_get_dirname (file_path), NULL);
      }
  
--  normalized_path = canonicalize_file_name (absolute_path);
+-  normalized_path = realpath (absolute_path, NULL);
 +#ifdef PATH_MAX
 +  path_max = PATH_MAX;
 +#else
diff --git a/devel/seed/files/patch-modules_gettext_seed-gettext.c b/devel/seed/files/patch-modules_gettext_seed-gettext.c
index 999f1d97a905..71aa3b2242f1 100644
--- a/devel/seed/files/patch-modules_gettext_seed-gettext.c
+++ b/devel/seed/files/patch-modules_gettext_seed-gettext.c
@@ -1,6 +1,6 @@
---- modules/gettext/seed-gettext.c.orig	2009-07-26 19:23:31.000000000 -0400
-+++ modules/gettext/seed-gettext.c	2009-07-26 19:25:12.000000000 -0400
-@@ -293,12 +293,24 @@ seed_module_init(SeedEngine *local_eng)
+--- modules/gettext/seed-gettext.c.orig	2009-12-31 05:42:51.000000000 -0500
++++ modules/gettext/seed-gettext.c	2010-01-07 19:07:10.000000000 -0500
+@@ -312,12 +313,24 @@ seed_module_init(SeedEngine *local_eng)
  	DEFINE_ENUM_MEMBER(ns_ref, LC_MONETARY);
  	DEFINE_ENUM_MEMBER(ns_ref, LC_MESSAGES);
  	DEFINE_ENUM_MEMBER(ns_ref, LC_ALL);
diff --git a/devel/seed/files/patch-modules_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c
index a24fbd1e16d7..6d96d1478c92 100644
--- a/devel/seed/files/patch-modules_os_seed-os.c
+++ b/devel/seed/files/patch-modules_os_seed-os.c
@@ -1,5 +1,5 @@
---- modules/os/seed-os.c.orig	2009-10-07 01:43:54.000000000 -0400
-+++ modules/os/seed-os.c	2009-12-19 14:53:48.000000000 -0500
+--- modules/os/seed-os.c.orig	2009-12-31 05:44:49.000000000 -0500
++++ modules/os/seed-os.c	2010-01-07 19:01:05.000000000 -0500
 @@ -29,8 +29,15 @@
  
  #include <sys/stat.h>
@@ -31,7 +31,7 @@
        EXPECTED_EXCEPTION("os.realpath", "1 argument");
      }
    arg = seed_value_to_string (ctx, arguments[0], exception);
--  ret = canonicalize_file_name(arg);
+-  ret = realpath(arg, NULL);
 +#ifdef PATH_MAX
 +  path_max = PATH_MAX;
 +#else
@@ -83,7 +83,7 @@
  }
  
  SeedValue
-@@ -1112,7 +1143,9 @@ seed_module_init(SeedEngine * eng)
+@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng)
  #if defined (O_DIRECT)
    OS_DEFINE_QUICK_ENUM (O_DIRECT);
  #endif
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
index 54621017c52a..b91412a68d76 100644
--- a/devel/seed/pkg-plist
+++ b/devel/seed/pkg-plist
@@ -58,84 +58,13 @@ libdata/pkgconfig/seed.pc
 %%DATADIR%%/extensions/Seed.js
 %%DATADIR%%/extensions/xml.js
 %%DATADIR%%/lang.js
-%%PORTEXAMPLES%%%%DATADIR%%/repl.js
+%%DATADIR%%/repl.js
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE
 %%PORTDOCS%%%%DOCSDIR%%/conventions.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio-server.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Gnio.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/HACKING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/accelgroup.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/actions.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/async-quine.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserSettings.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserStatusbar.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserTab.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserToolbar.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/BrowserView.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/COPYING
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/TabbedBrowser.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/browser/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cairo.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator-mpfr.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/calculator.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cairo-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-cogl-1.0.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/clutter-pad.ui
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/animated-rectangle.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/box2d.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/cairo.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/pink-stage.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/examples/spring.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-pad/redhand.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderEditor.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/ShaderView.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/bob.jpg
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/default.glsl
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clutter-shader/main.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-banshee.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-consolekit.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/dbus-networkmanager.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dbus/networkManagerIfaces.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gdkpixbufloader.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/env.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/pretty.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/thread.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timeout.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/timer.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/glib/twitter.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtkplug.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktextview.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gtktreeview.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-packing.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/json-reddit.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ls.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/n-oscillator.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/notify-test.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/glut-teapot.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/seed-gears.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/opengl/triangle-actor.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango-fontset.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pango.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poppler.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/quine.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/repl.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/soup.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/threaded-repl.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/video.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vte-test.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/sample.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/weather.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-dom.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-tree.js
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/xml/xml-xpath.js
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/mapping/enum-mapping.png
 %%PORTDOCS%%%%DOCSDIR%%/mapping/mapping.html
@@ -160,15 +89,6 @@ libdata/pkgconfig/seed.pc
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.png
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/packing.svg
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/tutorial.html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/browser
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-pad
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/clutter-shader
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/dbus
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/glib
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/opengl
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/xml
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/mapping
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/modules/gtkbuilder