Update to 3.1.3.

Add configure hack to workaround a configure issue when champlain is disabled.


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

4 files changed, 63 insertions, 43 deletions

diff --git a/graphics/eog-plugins3/Makefile b/graphics/eog-plugins3/Makefile
index 631faf040..7a54204ad 100644
--- a/graphics/eog-plugins3/Makefile
+++ b/graphics/eog-plugins3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog-plugins3/Makefile,v 1.6 2011/08/24 13:49:30 kwm Exp $
+#   $MCom: ports/graphics/eog-plugins3/Makefile,v 1.7 2011/08/24 16:05:56 kwm Exp $
 #
 
 PORTNAME=	eog-plugins
-PORTVERSION=	3.0.0
+PORTVERSION=	3.1.3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -15,49 +15,49 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plug-ins for the Eye of GNOME image viewer application
 
-BUILD_DEPENDS=	eog>=2.91.0:${PORTSDIR}/graphics/eog3
-LIB_DEPENDS=	gdata.11:${PORTSDIR}/devel/libgdata \
+BUILD_DEPENDS=	eog>=3.1.0:${PORTSDIR}/graphics/eog3
+LIB_DEPENDS=	gdata.13:${PORTSDIR}/devel/libgdata \
+		exif.12:${PORTSDIR}/graphics/libexif \
 		peas-1.0.0:${PORTSDIR}/devel/libpeas
-RUN_DEPENDS=	eog>=2.91.0:${PORTSDIR}/graphics/eog3
+RUN_DEPENDS=	eog>=3.1.0:${PORTSDIR}/graphics/eog3
 
 CONFLICTS=	eog-plugins-2.[0-9]*
 
 LATEST_LINK=	eog-plugins3
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk30
-WANT_GNOME=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
+GLIB_SCHEMAS=	org.gnome.eog.plugins.exif-display.gschema.xml
+
+OPTIONS=	CHAMPLAIN "Build champlain map plugin" off \
+		PYTHON "Build python based plugins" on
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CHAMPLAIN) || \
-    (exists(${LOCALBASE}/lib/libchamplain-0.10.so)) || defined(WITH_CHAMPLIAN)
-LIB_DEPENDS+=	champlain-0.10.0:${PORTSDIR}/graphics/libchamplain
+.if defined(WITH_CHAMPLAIN)
+LIB_DEPENDS+=	champlain-0.12.0:${PORTSDIR}/graphics/libchamplain
 PLIST_SUB+=	CHAMPLAIN=""
 .else
-PLUST_SUB+=	CHAMPLAIN="@comment "
+PLIST_SUB+=	CHAMPLAIN="@comment "
 .endif
 
-.if !defined(WITHOUT_EXIF) || (exists(${LOCALBASE}/lib/libexif.so.12) || \
-	defined(WITH_EXIF))
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
-PLIST_SUB+=	EXIF=""
-GLIB_SCHEMAS=	org.gnome.eog.plugins.exif-display.gschema.xml
+.if defined(WITH_PYTHON)
+CONFIGURE_ARGS+=--enable-python
+PLIST_SUB+=	PYTHON=""
 .else
-PLIST_SUB+=	EXIF="@comment "
-.endif
-
-#.if ${HAVE_GNOME:Mpygtk2}!=""
-#USE_GNOME+=	pygtk2
-#CONFIGURE_ARGS+=--enable-python
-#PLIST_SUB+=	PYTHON=""
-#.else
 CONFIGURE_ARGS+=--disable-python
 PLIST_SUB+=	PYTHON="@comment "
-#.endif
+.endif
+
+.if defined(WITHOUT_CHAMPLAIN)
+post-patch:
+	@${REINPLACE_CMD} -e 's|champlain-gtk|disabled-champlain-gtk|g' \
+		${WRKSRC}/configure
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/eog-plugins3/distinfo b/graphics/eog-plugins3/distinfo
index db4c0805c..7e3345c76 100644
--- a/graphics/eog-plugins3/distinfo
+++ b/graphics/eog-plugins3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/eog-plugins-3.0.0.tar.bz2) = 87cced9baf3c8ba84dcad95d774686694f5cb140a187a7bad3891bc50bc4c7bd
-SIZE (gnome3/eog-plugins-3.0.0.tar.bz2) = 368036
+SHA256 (gnome3/eog-plugins-3.1.3.tar.xz) = 810c96aafc67f191f26ffe0e452407980a9fe675088647176b3d464fe96e5b4f
+SIZE (gnome3/eog-plugins-3.1.3.tar.xz) = 301844
diff --git a/graphics/eog-plugins3/files/patch-configure b/graphics/eog-plugins3/files/patch-configure
new file mode 100644
index 000000000..e0c37c175
--- /dev/null
+++ b/graphics/eog-plugins3/files/patch-configure
@@ -0,0 +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 @@
+ 		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")
+ }
+ 
+ # Disable python plugins if there is no python support
diff --git a/graphics/eog-plugins3/pkg-plist b/graphics/eog-plugins3/pkg-plist
index 876d1b89e..eca3d84dc 100644
--- a/graphics/eog-plugins3/pkg-plist
+++ b/graphics/eog-plugins3/pkg-plist
@@ -1,28 +1,33 @@
-%%PYTHON%%lib/eog/plugins/console.py
-%%PYTHON%%lib/eog/plugins/console.pyc
-%%PYTHON%%lib/eog/plugins/console.pyo
-%%EXIF%%lib/eog/plugins/exif-display.plugin
-%%EXIF%%lib/eog/plugins/exif-display/exif-display-config.ui
-%%EXIF%%lib/eog/plugins/exif-display/exif-display.ui
+lib/eog/plugins/exif-display.plugin
 lib/eog/plugins/fit-to-width.plugin
-%%EXIF%%lib/eog/plugins/libexif-display.la
-%%EXIF%%lib/eog/plugins/libexif-display.so
+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
 %%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/libsend-by-mail.la
 lib/eog/plugins/libsend-by-mail.so
 %%CHAMPLAIN%%lib/eog/plugins/map.plugin
+lib/eog/plugins/postasa.plugin
 %%PYTHON%%lib/eog/plugins/pythonconsole.plugin
-%%PYTHON%%lib/eog/plugins/pythonconsole.py
-%%PYTHON%%lib/eog/plugins/pythonconsole.pyc
-%%PYTHON%%lib/eog/plugins/pythonconsole.pyo
+%%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/console.py
+%%PYTHON%%lib/eog/plugins/pythonconsole/console.pyc
+%%PYTHON%%lib/eog/plugins/pythonconsole/console.pyo
 lib/eog/plugins/send-by-mail.plugin
 %%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/postasa/postasa-config.xml
+share/eog/plugins/postasa/postasa-uploads.xml
 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
@@ -58,6 +63,7 @@ share/locale/pl/LC_MESSAGES/eog-plugins.mo
 share/locale/pt/LC_MESSAGES/eog-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/eog-plugins.mo
 share/locale/ro/LC_MESSAGES/eog-plugins.mo
+share/locale/ru/LC_MESSAGES/eog-plugins.mo
 share/locale/sl/LC_MESSAGES/eog-plugins.mo
 share/locale/sq/LC_MESSAGES/eog-plugins.mo
 share/locale/sv/LC_MESSAGES/eog-plugins.mo
@@ -68,7 +74,10 @@ share/locale/vi/LC_MESSAGES/eog-plugins.mo
 share/locale/zh_CN/LC_MESSAGES/eog-plugins.mo
 share/locale/zh_HK/LC_MESSAGES/eog-plugins.mo
 share/locale/zh_TW/LC_MESSAGES/eog-plugins.mo
-%%EXIF%%@dirrm lib/eog/plugins/exif-display
+@dirrm share/eog/plugins/postasa
+@dirrm share/eog/plugins/exif-display
+@dirrm share/eog/plugins
+@dirrm share/eog
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES