Update to 2.29.5.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13344 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 21 insertions, 20 deletions

diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 3259bf6e9..e83ea98a7 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/devel/seed/Makefile,v 1.10 2009/12/25 15:02:33 kwm Exp $
 #
 
 PORTNAME=	seed
-PORTVERSION=	2.29.4
+PORTVERSION=	2.29.5.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -42,12 +42,12 @@ 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
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
index eed14cf66..2e1256a8a 100644
--- a/devel/seed/distinfo
+++ b/devel/seed/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seed-2.29.4.tar.bz2) = d6ad9d761cc69c3225d12d1d04ebf782
-SHA256 (gnome2/seed-2.29.4.tar.bz2) = 16ae3aa602c66670541eda042388e4775eab10cfe3291c81f090d535e3135948
-SIZE (gnome2/seed-2.29.4.tar.bz2) = 741854
+MD5 (gnome2/seed-2.29.5.1.tar.bz2) = 1a213021c7f0ed0fac29855cb8488b01
+SHA256 (gnome2/seed-2.29.5.1.tar.bz2) = 83082b8d5c3c2229924e75672e6b742a5fb12883a78c146f6d556f869bea3374
+SIZE (gnome2/seed-2.29.5.1.tar.bz2) = 754317
diff --git a/devel/seed/files/patch-libseed_seed-importer.c b/devel/seed/files/patch-libseed_seed-importer.c
index c216fa88c..ffce27254 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_os_seed-os.c b/devel/seed/files/patch-modules_os_seed-os.c
index a24fbd1e1..f87eb4cec 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 11:44:49.000000000 +0100
++++ modules/os/seed-os.c	2010-01-02 02:07:19.000000000 +0100
 @@ -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
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
index 1b7b77628..b91412a68 100644
--- a/devel/seed/pkg-plist
+++ b/devel/seed/pkg-plist
@@ -58,6 +58,7 @@ libdata/pkgconfig/seed.pc
 %%DATADIR%%/extensions/Seed.js
 %%DATADIR%%/extensions/xml.js
 %%DATADIR%%/lang.js
+%%DATADIR%%/repl.js
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog