- update to 1.29.17

x11/gnome/gjs/Makefile

@@ -1,14 +1,13 @@
-# $OpenBSD: Makefile,v 1.4 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2011/09/21 14:00:19 jasper Exp $
 
 COMMENT=		Javascript bindings for GNOME
 
 GNOME_PROJECT=		gjs
-GNOME_VERSION=		0.7.14
-REVISION=		0
+GNOME_VERSION=		1.29.17
 
-SHARED_LIBS +=  gjs                  0.0      # 0.0
-SHARED_LIBS +=  gjs-gi               0.0      # 0.0
-SHARED_LIBS +=  gjs-dbus             0.0      # 0.0
+SHARED_LIBS +=  gjs                  1.0      # 0.0
+SHARED_LIBS +=  gjs-dbus             1.0      # 0.0
+SHARED_LIBS +=  gjs-gdbus             1.0      # 0.0
 
 CATEGORIES=		devel
 
@@ -22,8 +21,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EXTRACT_SUFX=		.tar.bz2
-
 MODULES=		devel/gettext \
 			lang/python \
 			x11/gnome
@@ -42,14 +39,18 @@ WANTLIB += ncursesw nspr4 pcre pixman-1 plc4 plds4 png pthread
 WANTLIB += pthread-stubs readline stdc++ xcb xcb-render xcb-shm
 WANTLIB += z
 
-LIB_DEPENDS=		devel/gobject-introspection \
+LIB_DEPENDS=		devel/gobject-introspection>=1.30.0 \
 			lang/spidermonkey \
 			x11/dbus-glib
 REGRESS_DEPENDS=	sysutils/e2fsprogs
 
+CONFIGURE_ARGS+=	--with-js-package="mozilla-js"
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
+pre-configure:
+	@perl -pi -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/configure
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gjs/
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/examples/gjs/

x11/gnome/gjs/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/gjs-0.7.14.tar.bz2) = DhSH4GbfiTcxfaNFRfe1SA==
-RMD160 (gnome/gjs-0.7.14.tar.bz2) = 8xg6r5jGs3xr9EXmMJzX8fUWqRU=
-SHA1 (gnome/gjs-0.7.14.tar.bz2) = 2ZVUKPXL56ZxQZfaHk2+XW1gNg0=
-SHA256 (gnome/gjs-0.7.14.tar.bz2) = Ovb0SaUFxBnUoOWThzfajRubCbM3EMwawe3uLqqG40g=
-SIZE (gnome/gjs-0.7.14.tar.bz2) = 515857
+MD5 (gnome/gjs-1.29.17.tar.xz) = i9tmyRTKlVFjWjpAic4zhQ==
+RMD160 (gnome/gjs-1.29.17.tar.xz) = ObfR7QIzgh68sOORGLH1NSNL2Z4=
+SHA1 (gnome/gjs-1.29.17.tar.xz) = m4NPKJRBTGTgXugUWv68SL40Wr4=
+SHA256 (gnome/gjs-1.29.17.tar.xz) = Qn0/f+soMD4F/D1JQxiv/CgMAIeib3/6KYnqhraL1iU=
+SIZE (gnome/gjs-1.29.17.tar.xz) = 454252

x11/gnome/gjs/patches/patch-configure

@@ -1,16 +1,11 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2011/04/12 06:30:06 jasper Exp $
-
-We know what the Mozilla JavaScript package is called, so just set it and
-prevent configure from not recognizing it.
-
---- configure.orig	Mon Apr 11 20:32:48 2011
-+++ configure	Mon Apr 11 20:32:54 2011
-@@ -15786,7 +15786,7 @@ if test -n "$JS_CONFIG"; then
-     JS_CFLAGS="$($JS_CONFIG --cflags)"
-     JS_LIBS="$($JS_CONFIG --libs)"
-     FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)"
--    JS_PACKAGE=
-+    JS_PACKAGE=mozilla-js
+$OpenBSD: patch-configure,v 1.2 2011/09/21 14:00:19 jasper Exp $
+--- configure.orig	Wed Sep 21 01:07:22 2011
++++ configure	Wed Sep 21 01:07:33 2011
+@@ -15983,6 +15983,7 @@ fi
+         ## some flavors of Firefox .pc only set sdkdir, not libdir
+         FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE`
+         FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE`
++	FIREFOX_JS_LIBDIR="${LOCALBASE}/lib"
 
-     # js-config gives almost usable CFLAGS, we must define one of XP_BEOS,
-     # XP_OS2, XP_WIN or XP_UNIX
+         ## Ubuntu does not set libdir in mozilla-js.pc
+         if test x"$FIREFOX_JS_LIBDIR" = x; then

x11/gnome/gjs/pkg/PLIST

@@ -1,35 +1,35 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/12 06:30:06 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/09/21 14:00:19 jasper Exp $
 bin/gjs
 @bin bin/gjs-console
 include/gjs-1.0/
+include/gjs-1.0/gi/
+include/gjs-1.0/gi/arg.h
+include/gjs-1.0/gi/boxed.h
+include/gjs-1.0/gi/closure.h
+include/gjs-1.0/gi/enumeration.h
+include/gjs-1.0/gi/foreign.h
+include/gjs-1.0/gi/function.h
+include/gjs-1.0/gi/keep-alive.h
+include/gjs-1.0/gi/ns.h
+include/gjs-1.0/gi/object.h
+include/gjs-1.0/gi/param.h
+include/gjs-1.0/gi/repo.h
+include/gjs-1.0/gi/union.h
+include/gjs-1.0/gi/value.h
 include/gjs-1.0/gjs/
 include/gjs-1.0/gjs-dbus/
 include/gjs-1.0/gjs-dbus/dbus-proxy.h
 include/gjs-1.0/gjs-dbus/dbus.h
 include/gjs-1.0/gjs/byteArray.h
 include/gjs-1.0/gjs/compat.h
 include/gjs-1.0/gjs/context.h
-include/gjs-1.0/gjs/gi/
-include/gjs-1.0/gjs/gi/arg.h
-include/gjs-1.0/gjs/gi/boxed.h
-include/gjs-1.0/gjs/gi/closure.h
-include/gjs-1.0/gjs/gi/enumeration.h
-include/gjs-1.0/gjs/gi/foreign.h
-include/gjs-1.0/gjs/gi/function.h
-include/gjs-1.0/gjs/gi/gjs_gi_trace.h
-include/gjs-1.0/gjs/gi/keep-alive.h
-include/gjs-1.0/gjs/gi/ns.h
-include/gjs-1.0/gjs/gi/object.h
-include/gjs-1.0/gjs/gi/param.h
-include/gjs-1.0/gjs/gi/repo.h
-include/gjs-1.0/gjs/gi/union.h
-include/gjs-1.0/gjs/gi/value.h
 include/gjs-1.0/gjs/gjs-module.h
 include/gjs-1.0/gjs/gjs.h
 include/gjs-1.0/gjs/importer.h
 include/gjs-1.0/gjs/jsapi-util.h
 include/gjs-1.0/gjs/mem.h
 include/gjs-1.0/gjs/native.h
+lib/gjs/
 lib/gjs-1.0/
 @comment lib/gjs-1.0/cairoNative.la
 lib/gjs-1.0/cairoNative.so
@@ -41,21 +41,20 @@ lib/gjs-1.0/dbusNative.so
 lib/gjs-1.0/debugger.so
 @comment lib/gjs-1.0/gettextNative.la
 lib/gjs-1.0/gettextNative.so
-@comment lib/gjs-1.0/gi.la
-lib/gjs-1.0/gi.so
 @comment lib/gjs-1.0/langNative.la
 lib/gjs-1.0/langNative.so
 @comment lib/gjs-1.0/mainloop.la
 lib/gjs-1.0/mainloop.so
+lib/gjs/GjsDBus-1.0.gir
+lib/gjs/GjsDBus-1.0.typelib
 @comment lib/libgjs-dbus.la
 @lib lib/libgjs-dbus.so.${LIBgjs-dbus_VERSION}
-@comment lib/libgjs-gi.la
-@lib lib/libgjs-gi.so.${LIBgjs-gi_VERSION}
+@comment lib/libgjs-gdbus.la
+@lib lib/libgjs-gdbus.so.${LIBgjs-gdbus_VERSION}
 @comment lib/libgjs.la
 @lib lib/libgjs.so.${LIBgjs_VERSION}
 lib/pkgconfig/gjs-1.0.pc
 lib/pkgconfig/gjs-dbus-1.0.pc
-lib/pkgconfig/gjs-gi-1.0.pc
 lib/pkgconfig/gjs-internals-1.0.pc
 share/examples/gjs/
 share/examples/gjs/clutter.js
@@ -69,6 +68,9 @@ share/gjs-1.0/dbus.js
 share/gjs-1.0/gettext.js
 share/gjs-1.0/jsUnit.js
 share/gjs-1.0/lang.js
+share/gjs-1.0/overrides/
+share/gjs-1.0/overrides/GLib.js
+share/gjs-1.0/overrides/Gio.js
 share/gjs-1.0/promise.js
 share/gjs-1.0/signals.js
 share/gjs-1.0/tweener/