From f0fbe63fb6b7225126351103ff9a6fd1a98b98bf Mon Sep 17 00:00:00 2001
From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Thu, 22 Sep 2011 13:07:55 +0000
Subject: Update to 3.2.0.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16318 df743ca5-7f9a-e211-a948-0013205c9059
---
devel/seed3/Makefile | 6 +-
devel/seed3/distinfo | 4 +-
devel/seed3/files/patch-libseed_seed-importer.c | 49 -------------
devel/seed3/files/patch-modules_os_seed-os.c | 95 -------------------------
4 files changed, 5 insertions(+), 149 deletions(-)
delete mode 100644 devel/seed3/files/patch-libseed_seed-importer.c
delete mode 100644 devel/seed3/files/patch-modules_os_seed-os.c
(limited to 'devel')
diff --git a/devel/seed3/Makefile b/devel/seed3/Makefile
index c6fe23ce4..ab005e11a 100644
--- a/devel/seed3/Makefile
+++ b/devel/seed3/Makefile
@@ -3,14 +3,14 @@
# Whom: Alexander Logvinov <avl@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/devel/seed3/Makefile,v 1.8 2011/06/10 22:59:03 mezz Exp $
+# $MCom: ports/devel/seed3/Makefile,v 1.9 2011/06/11 19:51:16 mezz 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= 3.0.0
+PORTVERSION= 3.2.0
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -29,7 +29,7 @@ LIB_DEPENDS= ffi.5:${PORTSDIR}/devel/libffi \
CONFLICTS= seed-2.[0-9]*
LATEST_LINK= seed3
-USE_BZIP2= yes
+USE_XZ= yes
GNU_CONFIGURE= yes
USE_GETTEXT= yes
USE_GNOME= gnomehack gtk30 intltool libxml2
diff --git a/devel/seed3/distinfo b/devel/seed3/distinfo
index 6e820a6c2..f3ba0a4f7 100644
--- a/devel/seed3/distinfo
+++ b/devel/seed3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/seed-3.0.0.tar.bz2) = c7ef8e0c7cfe633c6bf9bfc13ab56458f053dfb12b784c75cc50dfa7cf828be6
-SIZE (gnome3/seed-3.0.0.tar.bz2) = 772779
+SHA256 (gnome3/seed-3.2.0.tar.xz) = 3d1eca40834b72a5730ddaf8a5f46b8df20ddb2b3b39687d1a84ef966d3d37c0
+SIZE (gnome3/seed-3.2.0.tar.xz) = 682096
diff --git a/devel/seed3/files/patch-libseed_seed-importer.c b/devel/seed3/files/patch-libseed_seed-importer.c
deleted file mode 100644
index ffce27254..000000000
--- a/devel/seed3/files/patch-libseed_seed-importer.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- 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>
-+#include <stdlib.h>
-+#include <unistd.h>
-
- #include "seed-private.h"
-
-@@ -636,8 +638,9 @@ seed_importer_handle_file (JSContextRef
- JSValueRef js_file_dirname;
- JSObjectRef global, c_global;
- JSStringRef file_contents, file_name;
-- gchar *contents, *walk, *file_path, *canonical, *absolute_path;
-+ gchar *contents, *walk, *file_path, *canonical, *absolute_path, *normalp;
- gchar *normalized_path;
-+ gsize path_max;
-
- file_path = g_build_filename (dir, file, NULL);
- canonical = seed_importer_canonicalize_path (file_path);
-@@ -691,15 +694,24 @@ seed_importer_handle_file (JSContextRef
- g_path_get_dirname (file_path), NULL);
- }
-
-- normalized_path = realpath (absolute_path, NULL);
-+#ifdef PATH_MAX
-+ path_max = PATH_MAX;
-+#else
-+ path_max = pathconf (absolute_path, _PC_PATH_MAX);
-+ if (path_max <= 0)
-+ path_max = 4096;
-+#endif
-+ normalized_path = (gchar *) g_malloc (path_max);
-+ normalp = realpath (absolute_path, normalized_path);
-
-- js_file_dirname = seed_value_from_string (ctx, normalized_path, NULL);
-+ js_file_dirname = seed_value_from_string (ctx, normalp, NULL);
-
- seed_object_set_property (nctx, global, "__script_path__", js_file_dirname);
-
- g_hash_table_insert (file_imports, canonical, global);
- g_free (file_path);
- g_free (absolute_path);
-+ g_free (normalized_path);
-
- JSEvaluateScript (nctx, file_contents, NULL, file_name, 0, exception);
-
diff --git a/devel/seed3/files/patch-modules_os_seed-os.c b/devel/seed3/files/patch-modules_os_seed-os.c
deleted file mode 100644
index 6d96d1478..000000000
--- a/devel/seed3/files/patch-modules_os_seed-os.c
+++ /dev/null
@@ -1,95 +0,0 @@
---- 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>
- #include <sys/utsname.h>
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
-
- #include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <termios.h>
-+#include <libutil.h>
-+#include <unistd.h>
-
- #include <fcntl.h>
-
-@@ -54,18 +61,32 @@ seed_os_realpath (SeedContext ctx,
- const SeedValue arguments[],
- SeedException * exception)
- {
-+ SeedValue sv;
- gchar *arg;
-+ gchar *resolved_path;
- gchar *ret;
-+ gsize path_max;
-
- if (argument_count != 1)
- {
- EXPECTED_EXCEPTION("os.realpath", "1 argument");
- }
- arg = seed_value_to_string (ctx, arguments[0], exception);
-- ret = realpath(arg, NULL);
-+#ifdef PATH_MAX
-+ path_max = PATH_MAX;
-+#else
-+ path_max = pathconf (arg, _PC_PATH_MAX);
-+ if (path_max <= 0)
-+ path_max = 4096;
-+#endif
-+ resolved_path = (gchar *) g_malloc (path_max);
-+ ret = realpath(arg, resolved_path);
- g_free (arg);
-
-- return seed_value_from_string (ctx, ret, exception);
-+ sv = seed_value_from_string (ctx, ret, exception);
-+ g_free (resolved_path);
-+
-+ return sv;
- }
-
- SeedValue
-@@ -559,7 +580,12 @@ seed_os_unsetenv (SeedContext ctx,
- }
-
- arg = seed_value_to_string (ctx, arguments[0], exception);
-+#if __FreeBSD_version < 700000
-+ ret = 0;
-+ unsetenv (arg);
-+#else
- ret = unsetenv (arg);
-+#endif
- g_free (arg);
-
- return seed_value_from_int (ctx, ret, exception);
-@@ -702,6 +728,7 @@ seed_os_fdatasync (SeedContext ctx,
- const SeedValue arguments[],
- SeedException * exception)
- {
-+#if !defined(__FreeBSD__)
- gint fd;
-
- if (argument_count != 1)
-@@ -711,6 +738,10 @@ seed_os_fdatasync (SeedContext ctx,
- fd = seed_value_to_int (ctx, arguments[0], exception);
-
- return seed_value_from_int (ctx, fdatasync (fd), exception);
-+#else
-+ errno = ENOSYS;
-+ return seed_value_from_int (ctx, -1, exception);
-+#endif
- }
-
- SeedValue
-@@ -1112,7 +1144,9 @@ seed_module_init(SeedEngine * eng)
- #if defined (O_DIRECT)
- OS_DEFINE_QUICK_ENUM (O_DIRECT);
- #endif
-+#if defined (O_DIRECTORY)
- OS_DEFINE_QUICK_ENUM (O_DIRECTORY);
-+#endif
- OS_DEFINE_QUICK_ENUM (O_NOFOLLOW);
- #if defined (O_NOATIME)
- OS_DEFINE_QUICK_ENUM (O_NOATIME);
--
cgit v1.2.3