Update to 1.6.1.

Obtained from:  Gustau Perez GNOME 3.6 work


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

3 files changed, 22 insertions, 18 deletions

diff --git a/devel/libpeas/Makefile b/devel/libpeas/Makefile
index 97f4182af..5dddac310 100644
--- a/devel/libpeas/Makefile
+++ b/devel/libpeas/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	libpeas
-# Date created:				20 June 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/trunk/devel/libpeas/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	libpeas
-PORTVERSION=	1.4.0
+PORTVERSION=	1.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -24,29 +20,34 @@ USE_LDCONFIG=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack glib20 gtk30 ltverhack
+USES=		pathfix
+USE_GNOME=	gtk30 ltverhack
 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 spidermonkey)" on
+OPTIONS_DEFINE=	PYTHON JS
+OPTIONS_DEFAULT=PYTHON JS GJS
+OPTIONS_MULTI=	JS
+OPTIONS_MULTI_JS=SEED GJS
+JS_DESC=JavaScript plugin support
+SEED_DESC=	JavaScript support based on webkit-gtk3
+GJS_DESC=	JavaScript support based on spidermonkey
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SEED)
+.if ${PORT_OPTIONS:MSEED}
 CONFIGURE_ARGS+=--enable-seed=yes
-LIB_DEPENDS=	seed-gtk3.0:${PORTSDIR}/devel/seed3
+LIB_DEPENDS=	seed-gtk3:${PORTSDIR}/devel/seed3
 PLIST_SUB+=	SEED=""
 .else
 CONFIGURE_ARGS+=--enable-seed=no
 PLIST_SUB+=	SEED="@comment "
 .endif
 
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=--enable-python
 USE_GNOME+=	pygobject3
 PLIST_SUB+=	PYTHONS=""
@@ -55,10 +56,10 @@ CONFIGURE_ARGS+=--enable-python=no
 PLIST_SUB+=	PYTHONS="@comment "
 .endif
 
-.if defined(WITH_GJS)
+.if ${PORT_OPTIONS:MGJS}
 CONFIGURE_ARGS+=--enable-gjs
 BUILD_DEPENDS+=	gjs>=1.32.0:${PORTSDIR}/lang/gjs
-LIB_DEPENDS+=	gjs.0:${PORTSDIR}/lang/gjs
+LIB_DEPENDS+=	gjs:${PORTSDIR}/lang/gjs
 PLIST_SUB+=	GJS=""
 .else
 CONFIGURE_ARGS+=--enable-gjs=no
diff --git a/devel/libpeas/distinfo b/devel/libpeas/distinfo
index 17a03eec6..7b07f46fa 100644
--- a/devel/libpeas/distinfo
+++ b/devel/libpeas/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/libpeas-1.4.0.tar.xz) = d508df249d5aefad0e5a720095e0103355ab13856dae6a10e6e5b8235d5eecf6
-SIZE (gnome3/libpeas-1.4.0.tar.xz) = 521044
+SHA256 (gnome3/libpeas-1.6.1.tar.xz) = 7f133f44101594e0f96a0e5fe69c5893cde500f3edf916f680467dfd74de5c39
+SIZE (gnome3/libpeas-1.6.1.tar.xz) = 523800
diff --git a/devel/libpeas/pkg-plist b/devel/libpeas/pkg-plist
index e16e43b2a..ce93eee9e 100644
--- a/devel/libpeas/pkg-plist
+++ b/devel/libpeas/pkg-plist
@@ -88,6 +88,7 @@ share/locale/as/LC_MESSAGES/libpeas.mo
 share/locale/ast/LC_MESSAGES/libpeas.mo
 share/locale/be/LC_MESSAGES/libpeas.mo
 share/locale/bg/LC_MESSAGES/libpeas.mo
+share/locale/bn_IN/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
@@ -110,8 +111,10 @@ 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/kn/LC_MESSAGES/libpeas.mo
 share/locale/ko/LC_MESSAGES/libpeas.mo
 share/locale/lt/LC_MESSAGES/libpeas.mo
+share/locale/mr/LC_MESSAGES/libpeas.mo
 share/locale/te/LC_MESSAGES/libpeas.mo
 share/locale/th/LC_MESSAGES/libpeas.mo
 share/locale/tr/LC_MESSAGES/libpeas.mo