Update to 1.4.0.

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

4 files changed, 26 insertions, 14 deletions

diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 475470567..0cd9fd9e3 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.17 2011/09/21 12:35:21 kwm Exp $
+#   $MCom: ports/devel/libpeas/Makefile,v 1.18 2011/10/08 07:42:55 kwm Exp $
 #
 
 PORTNAME=	libpeas
-PORTVERSION=	1.2.0
+PORTVERSION=	1.4.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -29,10 +29,11 @@ INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS+=--disable-glade-catalog
 
 OPTIONS=	PYTHON "Enable python plugins" on \
 		SEED "Enable JavaScript plugins (based on webkit-gtk3)" off \
-		GJS "Enable JavaScript plugins (based on libxul)" on
+		GJS "Enable JavaScript plugins (based on spidermonkey)" on
 
 .include <bsd.port.options.mk>
 
@@ -56,7 +57,7 @@ PLIST_SUB+=	PYTHONS="@comment "
 
 .if defined(WITH_GJS)
 CONFIGURE_ARGS+=--enable-gjs
-BUILD_DEPENDS+=	gjs>=1.29.16:${PORTSDIR}/lang/gjs
+BUILD_DEPENDS+=	gjs>=1.32.0:${PORTSDIR}/lang/gjs
 LIB_DEPENDS+=	gjs.0:${PORTSDIR}/lang/gjs
 PLIST_SUB+=	GJS=""
 .else
@@ -64,4 +65,6 @@ CONFIGURE_ARGS+=--enable-gjs=no
 PLIST_SUB+=	GJS="@comment "
 .endif
 
+PLIST_SUB+=	VALA="@comment "
+
 .include <bsd.port.mk>
diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo
index e4ff6032f..17a03eec6 100644
--- a/devel/libpeas/distinfo
+++ b/devel/libpeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libpeas-1.2.0.tar.xz) = 871868ff44352367a4b4602352f60fd20eb99794ade454f3b120d87c1560f31c
-SIZE (gnome3/libpeas-1.2.0.tar.xz) = 497176
+SHA256 (gnome3/libpeas-1.4.0.tar.xz) = d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6
+SIZE (gnome3/libpeas-1.4.0.tar.xz) = 521044
diff --git a/devel/libpeas/files/patch-Makefile.in b/devel/libpeas/files/patch-Makefile.in
new file mode 100644
index 000000000..aedda64ca
--- /dev/null
+++ b/devel/libpeas/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2012-05-25 22:12:44.000000000 +0200
++++ Makefile.in	2012-05-25 22:12:52.000000000 +0200
+@@ -328,7 +328,7 @@
+ top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-glade-catalog
+-SUBDIRS = libpeas loaders $(am__append_1) tests data po docs
++SUBDIRS = libpeas loaders $(am__append_1) data po docs
+ GCOVDIRS = libpeas loaders $(am__append_2)
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist
index 5a702cbdc..e16e43b2a 100644
--- a/devel/libpeas/pkg-plist
+++ b/devel/libpeas/pkg-plist
@@ -17,9 +17,6 @@ lib/libpeas-1.0.a
 lib/libpeas-1.0.la
 lib/libpeas-1.0.so
 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
@@ -49,10 +46,10 @@ lib/peas-demo/plugins/secondtime/libsecondtime.so
 lib/peas-demo/plugins/secondtime/secondtime.plugin
 %%SEED%%lib/peas-demo/plugins/seedhello/seedhello.js
 %%SEED%%lib/peas-demo/plugins/seedhello/seedhello.plugin
-lib/peas-demo/plugins/valahello/libvalahello.a
-lib/peas-demo/plugins/valahello/libvalahello.la
-lib/peas-demo/plugins/valahello/libvalahello.so
-lib/peas-demo/plugins/valahello/valahello.plugin
+%%VALA%%lib/peas-demo/plugins/valahello/libvalahello.a
+%%VALA%%lib/peas-demo/plugins/valahello/libvalahello.la
+%%VALA%%lib/peas-demo/plugins/valahello/libvalahello.so
+%%VALA%%lib/peas-demo/plugins/valahello/valahello.plugin
 libdata/pkgconfig/libpeas-1.0.pc
 libdata/pkgconfig/libpeas-gtk-1.0.pc
 share/gir-1.0/Peas-1.0.gir
@@ -119,6 +116,7 @@ share/locale/te/LC_MESSAGES/libpeas.mo
 share/locale/th/LC_MESSAGES/libpeas.mo
 share/locale/tr/LC_MESSAGES/libpeas.mo
 share/locale/lv/LC_MESSAGES/libpeas.mo
+share/locale/ml/LC_MESSAGES/libpeas.mo
 share/locale/nb/LC_MESSAGES/libpeas.mo
 share/locale/nds/LC_MESSAGES/libpeas.mo
 share/locale/nl/LC_MESSAGES/libpeas.mo
@@ -156,7 +154,7 @@ share/locale/zh_TW/LC_MESSAGES/libpeas.mo
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
 @dirrm share/gtk-doc/html/libpeas
-@dirrm lib/peas-demo/plugins/valahello
+%%VALA%%@dirrm lib/peas-demo/plugins/valahello
 %%SEED%%@dirrm lib/peas-demo/plugins/seedhello
 @dirrm lib/peas-demo/plugins/secondtime
 %%PYTHONS%%@dirrm lib/peas-demo/plugins/pythonhello