Chase gobject-introspection lib bump.

Look for the correct webkit lib name.
Fix build with current gobject-introspection.


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

3 files changed, 167 insertions, 3 deletions

diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 4bf7632d1..c73377c08 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,7 +3,7 @@
 # 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.19 2010/05/08 17:04:45 marcus Exp $
+#   $MCom: ports/devel/seed/Makefile,v 1.21 2010/07/05 11:34:41 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.
@@ -11,7 +11,7 @@
 
 PORTNAME=	seed
 PORTVERSION=	2.30.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,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 \
-		girepository-1.0.0:${PORTSDIR}/devel/gobject-introspection \
+		girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		mpfr.4:${PORTSDIR}/math/mpfr
@@ -44,6 +44,7 @@ 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|reference||g' ${WRKSRC}/doc/Makefile.in
 #	@${FIND} ${WRKSRC}/examples -name Makefile.in -type f | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/devel/seed/files/patch-libseed_seed-closure.c b/devel/seed/files/patch-libseed_seed-closure.c
new file mode 100644
index 000000000..a59c8c98f
--- /dev/null
+++ b/devel/seed/files/patch-libseed_seed-closure.c
@@ -0,0 +1,64 @@
+--- 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
new file mode 100644
index 000000000..95ca15d0b
--- /dev/null
+++ b/devel/seed/files/patch-libseed_seed-types.c
@@ -0,0 +1,99 @@
+--- 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;