Update to 2.31.91.

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

5 files changed, 13 insertions, 173 deletions

diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index c36bcbe2c..0ff60609e 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -2,16 +2,15 @@
 # Date created:				19 July 2009
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
-# $FreeBSD: ports/devel/seed/Makefile,v 1.9 2010/06/11 15:09:42 ale Exp $
-#   $MCom: ports/devel/seed/Makefile,v 1.22 2010/07/13 09:47:44 kwm Exp $
+# $FreeBSD$
+#   $MCom: ports/devel/seed/Makefile,v 1.23 2010/07/13 12:22:44 kwm 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.30.0
-PORTREVISION=	4
+PORTVERSION=	2.31.91
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,7 +20,7 @@ COMMENT=	GObject JavaScriptCore bridge
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common
 LIB_DEPENDS=	ffi.5:${PORTSDIR}/devel/libffi \
-		webkitgtk-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
+		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2 \
 		girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
@@ -38,7 +37,7 @@ USE_AUTOTOOLS=	libtool:22
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--enable-gtk-doc=no
+CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
 
 MAN1=		seed.1
 
@@ -46,8 +45,9 @@ MAN1=		seed.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' \
-		-e 's|-lwebkit-1.0|-lwebkitgtk-1.0|g' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-ldl||g' \
+		${WRKSRC}/libseed/Makefile.in
 	@${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'
diff --git a/devel/seed/distinfo b/devel/seed/distinfo
index 6bee1233b..be392a77b 100644
--- a/devel/seed/distinfo
+++ b/devel/seed/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/seed-2.31.91.tar.bz2) = 024aff0a69761f77bc346bbad1a2489b
+SHA256 (gnome2/seed-2.31.91.tar.bz2) = 9e1da3adc6ed25b1778508ab67aecfe0923d1083f375b88137ea5f9ff57c22a3
+SIZE (gnome2/seed-2.31.91.tar.bz2) = 762875
diff --git a/devel/seed/files/patch-libseed_seed-closure.c b/devel/seed/files/patch-libseed_seed-closure.c
deleted file mode 100644
index a59c8c98f..000000000
--- a/devel/seed/files/patch-libseed_seed-closure.c
+++ /dev/null
@@ -1,64 +0,0 @@
---- libseed/seed-closure.c.orig	2010-07-13 11:25:23.000000000 +0200
-+++ libseed/seed-closure.c	2010-07-13 11:28:30.000000000 +0200
-@@ -97,30 +97,12 @@
- 	case GI_TYPE_TAG_UINT32:
- 	  arg->v_uint32 = *(guint32 *) args[i];
- 	  break;
--	case GI_TYPE_TAG_LONG:
--	  arg->v_long = *(glong *) args[i];
--	  break;
- 	case GI_TYPE_TAG_INT64:
- 	  arg->v_int64 = *(gint64 *) args[i];
- 	  break;
--	case GI_TYPE_TAG_ULONG:
--	  arg->v_ulong = *(gulong *) args[i];
--	  break;
- 	case GI_TYPE_TAG_UINT64:
- 	  arg->v_uint64 = *(guint64 *) args[i];
- 	  break;
--	case GI_TYPE_TAG_INT:
--	  arg->v_int = *(gint *) args[i];
--	  break;
--	case GI_TYPE_TAG_SSIZE:
--	  arg->v_ssize = *(gssize *) args[i];
--	  break;
--	case GI_TYPE_TAG_SIZE:
--	  arg->v_size = *(gsize *) args[i];
--	  break;
--	case GI_TYPE_TAG_UINT:
--	  arg->v_uint = *(guint *) args[i];
--	  break;
- 	case GI_TYPE_TAG_FLOAT:
- 	  arg->v_float = *(gfloat *) args[i];
- 	  break;
-@@ -215,30 +197,12 @@
-     case GI_TYPE_TAG_UINT32:
-       *(guint32 *) result = return_arg.v_uint32;
-       break;
--    case GI_TYPE_TAG_LONG:
--      *(glong *) result = return_arg.v_long;
--      break;
-     case GI_TYPE_TAG_INT64:
-       *(gint64 *) result = return_arg.v_int64;
-       break;
--    case GI_TYPE_TAG_ULONG:
--      *(gulong *) result = return_arg.v_ulong;
--      break;
-     case GI_TYPE_TAG_UINT64:
-       *(guint64 *) result = return_arg.v_uint64;
-       break;
--    case GI_TYPE_TAG_INT:
--      *(gint *) result = return_arg.v_int;
--      break;
--    case GI_TYPE_TAG_SSIZE:
--      *(gssize *) result = return_arg.v_ssize;
--      break;
--    case GI_TYPE_TAG_SIZE:
--      *(gsize *) result = return_arg.v_size;
--      break;
--    case GI_TYPE_TAG_UINT:
--      *(guint *) result = return_arg.v_uint;
--      break;
-     case GI_TYPE_TAG_FLOAT:
-       *(gfloat *) result = return_arg.v_float;
-       break;
diff --git a/devel/seed/files/patch-libseed_seed-types.c b/devel/seed/files/patch-libseed_seed-types.c
deleted file mode 100644
index 95ca15d0b..000000000
--- a/devel/seed/files/patch-libseed_seed-types.c
+++ /dev/null
@@ -1,99 +0,0 @@
---- libseed/seed-types.c.orig	2010-07-13 11:29:42.000000000 +0200
-+++ libseed/seed-types.c	2010-07-13 11:31:26.000000000 +0200
-@@ -366,23 +366,6 @@
- 	*array_p = dblresult;
-       }
-       break;
--    case GI_TYPE_TAG_INT:
--      {
--	gint *intresult;
--
--	intresult = g_new0 (gint, length + 1);
--
--	for (i = 0; i < length; i++)
--	  {
--	    elem = JSObjectGetPropertyAtIndex (ctx,
--					       (JSObjectRef) array,
--					       i, exception);
--	    intresult[i] = seed_value_to_int (ctx, elem, exception);
--	  }
--
--	*array_p = intresult;
--      }
--      break;
-     case GI_TYPE_TAG_UINT8:
-       {
- 	guint8 *guint8result;
-@@ -492,30 +475,12 @@
-     case GI_TYPE_TAG_UINT32:
-       arg->v_uint32 = seed_value_to_uint (ctx, value, exception);
-       break;
--    case GI_TYPE_TAG_LONG:
--      arg->v_long = seed_value_to_long (ctx, value, exception);
--      break;
-     case GI_TYPE_TAG_INT64:
-       arg->v_int64 = seed_value_to_int64 (ctx, value, exception);
-       break;
--    case GI_TYPE_TAG_ULONG:
--      arg->v_ulong = seed_value_to_ulong (ctx, value, exception);
--      break;
-     case GI_TYPE_TAG_UINT64:
-       arg->v_uint64 = seed_value_to_uint64 (ctx, value, exception);
-       break;
--    case GI_TYPE_TAG_INT:
--      arg->v_int = seed_value_to_int (ctx, value, exception);
--      break;
--    case GI_TYPE_TAG_UINT:
--      arg->v_uint = seed_value_to_uint (ctx, value, exception);
--      break;
--    case GI_TYPE_TAG_SIZE:
--      arg->v_size = seed_value_to_size (ctx, value, exception);
--      break;
--    case GI_TYPE_TAG_SSIZE:
--      arg->v_ssize = seed_value_to_ssize (ctx, value, exception);
--      break;
-     case GI_TYPE_TAG_FLOAT:
-       arg->v_float = seed_value_to_float (ctx, value, exception);
-       break;
-@@ -531,9 +496,6 @@
-     case GI_TYPE_TAG_GTYPE:
-       arg->v_int = seed_value_to_int (ctx, value, exception);
-       break;
--    case GI_TYPE_TAG_TIME_T:
--      arg->v_long = seed_value_to_time_t (ctx, value, exception);
--      break;
-     case GI_TYPE_TAG_INTERFACE:
-       {
- 	GIBaseInfo *interface;
-@@ -774,22 +736,10 @@
-       return seed_value_from_int (ctx, arg->v_int32, exception);
-     case GI_TYPE_TAG_UINT32:
-       return seed_value_from_uint (ctx, arg->v_uint32, exception);
--    case GI_TYPE_TAG_LONG:
--      return seed_value_from_long (ctx, arg->v_long, exception);
-     case GI_TYPE_TAG_INT64:
-       return seed_value_from_int64 (ctx, arg->v_int64, exception);
--    case GI_TYPE_TAG_ULONG:
--      return seed_value_from_ulong (ctx, arg->v_ulong, exception);
-     case GI_TYPE_TAG_UINT64:
-       return seed_value_from_uint64 (ctx, arg->v_uint64, exception);
--    case GI_TYPE_TAG_INT:
--      return seed_value_from_int (ctx, arg->v_int32, exception);
--    case GI_TYPE_TAG_UINT:
--      return seed_value_from_uint (ctx, arg->v_uint32, exception);
--    case GI_TYPE_TAG_SSIZE:
--      return seed_value_from_ssize (ctx, arg->v_ssize, exception);
--    case GI_TYPE_TAG_SIZE:
--      return seed_value_from_size (ctx, arg->v_size, exception);
-     case GI_TYPE_TAG_FLOAT:
-       return seed_value_from_float (ctx, arg->v_float, exception);
-     case GI_TYPE_TAG_DOUBLE:
-@@ -800,8 +750,6 @@
-       return seed_value_from_filename (ctx, arg->v_string, exception);
-     case GI_TYPE_TAG_GTYPE:
-       return seed_value_from_int (ctx, arg->v_int, exception);
--    case GI_TYPE_TAG_TIME_T:
--      return seed_value_from_time_t (ctx, arg->v_long, exception);
-     case GI_TYPE_TAG_ARRAY:
-       {
- 	GITypeInfo *param_type;
diff --git a/devel/seed/pkg-plist b/devel/seed/pkg-plist
index b91412a68..db20734ff 100644
--- a/devel/seed/pkg-plist
+++ b/devel/seed/pkg-plist
@@ -6,6 +6,9 @@ lib/libseed.a
 lib/libseed.la
 lib/libseed.so
 lib/libseed.so.0
+lib/seed/libseed_DynamicObject.a
+lib/seed/libseed_DynamicObject.la
+lib/seed/libseed_DynamicObject.so
 lib/seed/libseed_cairo.a
 lib/seed/libseed_cairo.la
 lib/seed/libseed_cairo.so