Update to 1.1.3.

New gjs based JS engine.


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

3 files changed, 39 insertions, 14 deletions

diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 5af684cbd..95fbf545b 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libpeas/Makefile,v 1.14 2011/03/10 14:50:58 kwm Exp $
+#   $MCom: ports/devel/libpeas/Makefile,v 1.15 2011/04/05 17:20:58 kwm Exp $
 #
 
 PORTNAME=	libpeas
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +18,7 @@ COMMENT=	Next evolution of the Gedit plugins engine
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		valac:${PORTSDIR}/lang/vala
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_PYTHON=	2.5+
 USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
@@ -27,16 +27,17 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack glib20 gtk30 ltverhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include " \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
-OPTIONS=	PYTHONS "Enable python plugins" on \
-		SEED "Enable JavaScript plugins" on 
+OPTIONS=	PYTHON "Enable python plugins" on \
+		SEED "Enable JavaScript plugins (based on webkit-gtk3)" on \
+		GJS "Enable JavaScript plugins (based on libxul)" off
 
 .include <bsd.port.options.mk>
 
 .if defined(WITH_SEED)
-CONFIGURE_ARGS+=--enable-seed
+CONFIGURE_ARGS+=--enable-seed=yes
 LIB_DEPENDS=	seed-gtk3.0:${PORTSDIR}/devel/seed3
 PLIST_SUB+=	SEED=""
 .else
@@ -44,14 +45,23 @@ CONFIGURE_ARGS+=--enable-seed=no
 PLIST_SUB+=	SEED="@comment "
 .endif
 
-.if defined(WITH_PYTHONS)
+.if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=--enable-python
-BUILD_DEPENDS+=	py*-gobject>=2.28.0:${PORTSDIR}/devel/py-gobject
-USE_GNOME+=	pygobject
+USE_GNOME+=	pygobject3
 PLIST_SUB+=	PYTHONS=""
 .else
 CONFIGURE_ARGS+=--enable-python=no
 PLIST_SUB+=	PYTHONS="@comment "
 .endif
 
+.if defined(WITH_GJS)
+CONFIGURE_ARGS+=--enable-gjs
+BUILD_DEPENDS+=	gjs>=1.29.16:${PORTSDIR}/lang/gjs
+LIB_DEPENDS+=	gjs.0:${PORTSDIR}/lang/gjs
+PLIST_SUB+=	GJS=""
+.else
+CONFIGURE_ARGS+=--enable-gjs=no
+PLIST_SUB+=	GJS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo
index fdf10abf2..496ad53a3 100644
--- a/devel/libpeas/distinfo
+++ b/devel/libpeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libpeas-1.0.0.tar.bz2) = b1482690565241baf3870311a77efb3f89a4335f48cb4ca31e8b8405220a8d99
-SIZE (gnome3/libpeas-1.0.0.tar.bz2) = 598820
+SHA256 (gnome3/libpeas-1.1.3.tar.xz) = 74e80a86f7f34bb03ab914ecd6f5fb8201c062f577b9b60317e6cc72bbedb2c0
+SIZE (gnome3/libpeas-1.1.3.tar.xz) = 507292
diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist
index f09c0a564..8313ecaa9 100644
--- a/devel/libpeas/pkg-plist
+++ b/devel/libpeas/pkg-plist
@@ -20,6 +20,9 @@ lib/libpeas-1.0.so.0
 lib/libpeas-1.0/loaders/libcloader.a
 lib/libpeas-1.0/loaders/libcloader.la
 lib/libpeas-1.0/loaders/libcloader.so
+%%GJS%%lib/libpeas-1.0/loaders/libgjsloader.a
+%%GJS%%lib/libpeas-1.0/loaders/libgjsloader.la
+%%GJS%%lib/libpeas-1.0/loaders/libgjsloader.so
 %%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.a
 %%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.la
 %%PYTHONS%%lib/libpeas-1.0/loaders/libpythonloader.so
@@ -30,6 +33,8 @@ lib/libpeas-gtk-1.0.a
 lib/libpeas-gtk-1.0.la
 lib/libpeas-gtk-1.0.so
 lib/libpeas-gtk-1.0.so.0
+%%GJS%%lib/peas-demo/plugins/gjshello/gjshello.js
+%%GJS%%lib/peas-demo/plugins/gjshello/gjshello.plugin
 lib/peas-demo/plugins/helloworld/helloworld.plugin
 lib/peas-demo/plugins/helloworld/libhelloworld.a
 lib/peas-demo/plugins/helloworld/libhelloworld.la
@@ -54,7 +59,6 @@ share/gir-1.0/Peas-1.0.gir
 share/gir-1.0/PeasGtk-1.0.gir
 share/gtk-doc/html/libpeas/PeasActivatable.html
 share/gtk-doc/html/libpeas/PeasEngine.html
-share/gtk-doc/html/libpeas/PeasExtension.html
 share/gtk-doc/html/libpeas/PeasExtensionBase.html
 share/gtk-doc/html/libpeas/PeasExtensionSet.html
 share/gtk-doc/html/libpeas/PeasGtkConfigurable.html
@@ -71,6 +75,7 @@ share/gtk-doc/html/libpeas/home.png
 share/gtk-doc/html/libpeas/index.html
 share/gtk-doc/html/libpeas/index.sgml
 share/gtk-doc/html/libpeas/left.png
+share/gtk-doc/html/libpeas/libpeas-PeasExtension.html
 share/gtk-doc/html/libpeas/libpeas.devhelp
 share/gtk-doc/html/libpeas/libpeas.devhelp2
 share/gtk-doc/html/libpeas/peas-gtk-plugin-manager.png
@@ -86,14 +91,18 @@ share/locale/ar/LC_MESSAGES/libpeas.mo
 share/locale/as/LC_MESSAGES/libpeas.mo
 share/locale/bg/LC_MESSAGES/libpeas.mo
 share/locale/ca/LC_MESSAGES/libpeas.mo
+share/locale/ca@valencia/LC_MESSAGES/libpeas.mo
 share/locale/cs/LC_MESSAGES/libpeas.mo
 share/locale/da/LC_MESSAGES/libpeas.mo
 share/locale/de/LC_MESSAGES/libpeas.mo
 share/locale/el/LC_MESSAGES/libpeas.mo
 share/locale/en_GB/LC_MESSAGES/libpeas.mo
+share/locale/eo/LC_MESSAGES/libpeas.mo
 share/locale/es/LC_MESSAGES/libpeas.mo
 share/locale/et/LC_MESSAGES/libpeas.mo
 share/locale/eu/LC_MESSAGES/libpeas.mo
+share/locale/fa/LC_MESSAGES/libpeas.mo
+share/locale/fi/LC_MESSAGES/libpeas.mo
 share/locale/fr/LC_MESSAGES/libpeas.mo
 share/locale/gl/LC_MESSAGES/libpeas.mo
 share/locale/gu/LC_MESSAGES/libpeas.mo
@@ -102,7 +111,10 @@ share/locale/hi/LC_MESSAGES/libpeas.mo
 share/locale/hu/LC_MESSAGES/libpeas.mo
 share/locale/id/LC_MESSAGES/libpeas.mo
 share/locale/it/LC_MESSAGES/libpeas.mo
+share/locale/ja/LC_MESSAGES/libpeas.mo
 share/locale/ko/LC_MESSAGES/libpeas.mo
+share/locale/lt/LC_MESSAGES/libpeas.mo
+share/locale/tr/LC_MESSAGES/libpeas.mo
 share/locale/lv/LC_MESSAGES/libpeas.mo
 share/locale/nb/LC_MESSAGES/libpeas.mo
 share/locale/nds/LC_MESSAGES/libpeas.mo
@@ -132,6 +144,8 @@ share/locale/zh_TW/LC_MESSAGES/libpeas.mo
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/nds/LC_MESSAGES
 @dirrmtry share/locale/nds
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrm share/gtk-doc/html/libpeas
@@ -139,6 +153,7 @@ share/locale/zh_TW/LC_MESSAGES/libpeas.mo
 %%SEED%%@dirrm lib/peas-demo/plugins/seedhello
 @dirrm lib/peas-demo/plugins/secondtime
 %%PYTHONS%%@dirrm lib/peas-demo/plugins/pythonhello
+%%GJS%%@dirrm lib/peas-demo/plugins/gjshello
 @dirrm lib/peas-demo/plugins/helloworld
 @dirrm lib/peas-demo/plugins
 @dirrm lib/peas-demo