Update to 3.6.1.

Fix a bug in the patch that cause disabled python plugins to be installed.


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

4 files changed, 48 insertions, 37 deletions

diff --git a/graphics/eog-plugins3/Makefile b/graphics/eog-plugins3/Makefile
index 20de73252..2bb806710 100644
--- a/graphics/eog-plugins3/Makefile
+++ b/graphics/eog-plugins3/Makefile
@@ -3,7 +3,7 @@
 #   $MCom: ports/trunk/graphics/eog-plugins3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	eog-plugins
-PORTVERSION=	3.4.1
+PORTVERSION=	3.6.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,11 +11,11 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plug-ins for the Eye of GNOME image viewer application
 
-BUILD_DEPENDS=	eog>=3.4.0:${PORTSDIR}/graphics/eog3
+BUILD_DEPENDS=	eog>=3.6.0:${PORTSDIR}/graphics/eog3
 LIB_DEPENDS=	gdata.13:${PORTSDIR}/devel/libgdata \
 		exif:${PORTSDIR}/graphics/libexif \
 		peas-1.0:${PORTSDIR}/devel/libpeas
-RUN_DEPENDS=	eog>=3.4.0:${PORTSDIR}/graphics/eog3
+RUN_DEPENDS=	eog>=3.6.0:${PORTSDIR}/graphics/eog3
 
 CONFLICTS=	eog-plugins-2.[0-9]*
 
@@ -31,7 +31,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.eog.plugins.exif-display.gschema.xml
 
 OPTIONS_DEFINE=	CHAMPLAIN PYTHON
-OPTIONS_DEFAULT=PYTHON
+OPTIONS_DEFAULT=CHAMPLAIN PYTHON
 CHAMPLAIN_DESC=	Champlain map plugin
 
 .include <bsd.port.options.mk>
@@ -45,8 +45,10 @@ PLIST_SUB+=	CHAMPLAIN="@comment "
 
 .if ${PORT_OPTIONS:MPYTHON}
 CONFIGURE_ARGS+=--enable-python
+USE_PYTHON=	yes
 PLIST_SUB+=	PYTHON=""
-GLIB_SCHEMAS+=	org.gnome.eog.plugins.fullscreenbg.gschema.xml \
+GLIB_SCHEMAS+=	org.gnome.eog.plugins.export-to-folder.gschema.xml \
+		org.gnome.eog.plugins.fullscreenbg.gschema.xml \
 		org.gnome.eog.plugins.pythonconsole.gschema.xml
 .else
 CONFIGURE_ARGS+=--disable-python
diff --git a/graphics/eog-plugins3/distinfo b/graphics/eog-plugins3/distinfo
index 18eb777dc..54d9e9f06 100644
--- a/graphics/eog-plugins3/distinfo
+++ b/graphics/eog-plugins3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/eog-plugins-3.4.1.tar.xz) = e1f7c4a0a9cc825d1ac8a64cc3d8db4da3054d294e4cd60b28eba13643d71055
-SIZE (gnome3/eog-plugins-3.4.1.tar.xz) = 320108
+SHA256 (gnome3/eog-plugins-3.6.1.tar.xz) = 0270ae05f6cdd9c73472323370c4779f1148c77f3f8890c89fb8488cf83051ac
+SIZE (gnome3/eog-plugins-3.6.1.tar.xz) = 330580
diff --git a/graphics/eog-plugins3/files/patch-configure b/graphics/eog-plugins3/files/patch-configure
index e0c37c175..c53047416 100644
--- a/graphics/eog-plugins3/files/patch-configure
+++ b/graphics/eog-plugins3/files/patch-configure
@@ -1,11 +1,11 @@
---- configure.orig	2011-09-22 16:33:23.000000000 +0200
-+++ configure	2011-09-22 16:34:21.000000000 +0200
-@@ -14385,7 +14385,7 @@
+--- configure.orig	2013-05-12 12:16:28.000000000 +0000
++++ configure	2013-05-12 12:16:52.000000000 +0000
+@@ -14495,7 +14495,7 @@
  		disabled_plugins="$disabled_plugins, $1 ($2)"
  	fi
  
 -	PLUGINS=$(echo "$PLUGINS" | sed -e "s/[^a-zA-Z0-9_]$1[ \t\r\n\f]\{1,\}/ /" -e "s/[^a-zA-Z0-9_]$1$//" -e "s/^$1[ \t\r\n\f]\{1,\}//")
-+	PLUGINS=$(echo "$PLUGINS")
++	PLUGINS=$(echo "$PLUGINS" | sed -e "s/[^a-zA-Z0-9_]$1[ \t\r\n]\{1,\}/ /" -e "s/[^a-zA-Z0-9_]$1$//" -e "s/^$1[ \t\r\n]\{1,\}//")
  }
  
  # Disable python plugins if there is no python support
diff --git a/graphics/eog-plugins3/pkg-plist b/graphics/eog-plugins3/pkg-plist
index 7f1072343..5092f2bf9 100644
--- a/graphics/eog-plugins3/pkg-plist
+++ b/graphics/eog-plugins3/pkg-plist
@@ -1,45 +1,53 @@
 lib/eog/plugins/exif-display.plugin
+%%PYTHON%%lib/eog/plugins/export-to-folder.plugin
+%%PYTHON%%lib/eog/plugins/export-to-folder.py
+%%PYTHON%%lib/eog/plugins/export-to-folder.pyc
+%%PYTHON%%lib/eog/plugins/export-to-folder.pyo
 lib/eog/plugins/fit-to-width.plugin
-lib/eog/plugins/fullscreenbg.plugin
-lib/eog/plugins/fullscreenbg.py
-lib/eog/plugins/fullscreenbg.pyc
-lib/eog/plugins/fullscreenbg.pyo
+%%PYTHON%%lib/eog/plugins/fullscreenbg.plugin
+%%PYTHON%%lib/eog/plugins/fullscreenbg.py
+%%PYTHON%%lib/eog/plugins/fullscreenbg.pyc
+%%PYTHON%%lib/eog/plugins/fullscreenbg.pyo
+lib/eog/plugins/hide-titlebar.plugin
 lib/eog/plugins/libexif-display.la
 lib/eog/plugins/libexif-display.so
 lib/eog/plugins/libfit-to-width.la
 lib/eog/plugins/libfit-to-width.so
+lib/eog/plugins/libhide-titlebar.la
+lib/eog/plugins/libhide-titlebar.so
+lib/eog/plugins/liblight-theme.la
+lib/eog/plugins/liblight-theme.so
 %%CHAMPLAIN%%lib/eog/plugins/libmap.la
 %%CHAMPLAIN%%lib/eog/plugins/libmap.so
 lib/eog/plugins/libpostasa.la
 lib/eog/plugins/libpostasa.so
-lib/eog/plugins/libpostr.la
-lib/eog/plugins/libpostr.so
 lib/eog/plugins/libsend-by-mail.la
 lib/eog/plugins/libsend-by-mail.so
+lib/eog/plugins/light-theme.plugin
 %%CHAMPLAIN%%lib/eog/plugins/map.plugin
 lib/eog/plugins/postasa.plugin
-lib/eog/plugins/postr.plugin
-lib/eog/plugins/pythonconsole.plugin
-lib/eog/plugins/pythonconsole/__init__.py
-lib/eog/plugins/pythonconsole/__init__.pyc
-lib/eog/plugins/pythonconsole/__init__.pyo
-lib/eog/plugins/pythonconsole/config.py
-lib/eog/plugins/pythonconsole/config.pyc
-lib/eog/plugins/pythonconsole/config.pyo
-lib/eog/plugins/pythonconsole/console.py
-lib/eog/plugins/pythonconsole/console.pyc
-lib/eog/plugins/pythonconsole/console.pyo
+%%PYTHON%%lib/eog/plugins/pythonconsole.plugin
+%%PYTHON%%lib/eog/plugins/pythonconsole/__init__.py
+%%PYTHON%%lib/eog/plugins/pythonconsole/__init__.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/__init__.pyo
+%%PYTHON%%lib/eog/plugins/pythonconsole/config.py
+%%PYTHON%%lib/eog/plugins/pythonconsole/config.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/config.pyo
+%%PYTHON%%lib/eog/plugins/pythonconsole/console.py
+%%PYTHON%%lib/eog/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/console.pyo
 lib/eog/plugins/send-by-mail.plugin
-lib/eog/plugins/slideshowshuffle.plugin
-lib/eog/plugins/slideshowshuffle.py
-lib/eog/plugins/slideshowshuffle.pyc
-lib/eog/plugins/slideshowshuffle.pyo
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.plugin
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.py
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyc
+%%PYTHON%%lib/eog/plugins/slideshowshuffle.pyo
 share/eog/plugins/exif-display/exif-display-config.ui
 share/eog/plugins/exif-display/exif-display.ui
-share/eog/plugins/fullscreenbg/preferences_dialog.ui
+%%PYTHON%%share/eog/plugins/export-to-folder/preferences_dialog.ui
+%%PYTHON%%share/eog/plugins/fullscreenbg/preferences_dialog.ui
 share/eog/plugins/postasa/postasa-config.xml
 share/eog/plugins/postasa/postasa-uploads.xml
-share/eog/plugins/pythonconsole/config.ui
+%%PYTHON%%share/eog/plugins/pythonconsole/config.ui
 share/locale/ar/LC_MESSAGES/eog-plugins.mo
 share/locale/as/LC_MESSAGES/eog-plugins.mo
 share/locale/be@latin/LC_MESSAGES/eog-plugins.mo
@@ -106,9 +114,10 @@ share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo
 @dirrmtry share/locale/be@latin
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/eog/plugins/pythonconsole
+%%PYTHON%%@dirrm share/eog/plugins/pythonconsole
 @dirrm share/eog/plugins/postasa
-@dirrm share/eog/plugins/fullscreenbg
+%%PYTHON%%@dirrm share/eog/plugins/fullscreenbg
+%%PYTHON%%@dirrm share/eog/plugins/export-to-folder
 @dirrm share/eog/plugins/exif-display
 @dirrm share/eog/plugins
-@dirrm lib/eog/plugins/pythonconsole
+%%PYTHON%%@dirrm lib/eog/plugins/pythonconsole