- update to 3.2.0

x11/gnome/eog-plugins/Makefile

@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.25 2011/09/20 22:54:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.26 2011/09/27 07:56:18 jasper Exp $
 
 COMMENT=		plugins for EOG
 
 GNOME_PROJECT=		eog-plugins
-GNOME_VERSION=		3.0.0
+GNOME_VERSION=		3.2.0
-REVISION=		3
 
 CATEGORIES=		graphics
 
@@ -16,31 +15,34 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-EXTRACT_SUFX=		.tar.bz2
-
-WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
-WANTLIB += drm exif expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += gthread-2.0 gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += pcre peas-1.0 pixman-1 png pthread-stubs xcb xcb-render
-WANTLIB += xcb-shm z
-
 MODULES=		devel/dconf \
 			devel/gettext \
 			lang/python \
 			x11/gnome
 
-LIB_DEPENDS=    	devel/libpeas \
+WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject
+WANTLIB += crypto dbus-1 drm exif expat ffi fontconfig freetype
+WANTLIB += gcrypt gdata gdk-3 gdk_pixbuf-2.0 gio-2.0 girepository-1.0
+WANTLIB += glib-2.0 gmodule-2.0 gnome-keyring gobject-2.0 gpg-error
+WANTLIB += gthread-2.0 gtk-3 idn kvm m nspr4 nss3 oauth pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre peas-1.0 pixman-1
+WANTLIB += plc4 plds4 png pthread-stubs smime3 softokn3 soup-2.4
+WANTLIB += soup-gnome-2.4 sqlite3 ssl ssl3 xcb xcb-render xcb-shm
+WANTLIB += xml2 z curl idn
+
+LIB_DEPENDS=    	devel/libgdata \
+			devel/libpeas \
 			graphics/libexif
 BUILD_DEPENDS=		${RUN_DEPENDS}
 # Depends on the same X.Y version of eog.
-RUN_DEPENDS=		x11/gnome/eog>=3.0
+RUN_DEPENDS=		x11/gnome/eog>=3.2.0
 
 # XXX: All plugins minus 'map' which requires libchamplain -> clutter
 PLUGINS=		fit-to-width,exif-display,send-by-mail,postasa
 
-CONFIGURE_STYLE= 	gnu
+AUTOCONF_VERSION=	2.68
+CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ARGS+=	--enable-python \
 			--with-plugins=${PLUGINS}
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \

x11/gnome/eog-plugins/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/eog-plugins-3.0.0.tar.bz2) = 7bkHfM5m45acYsCE1EbElQ==
+MD5 (gnome/eog-plugins-3.2.0.tar.xz) = yi9niXGsSVx71Y9XEBXWRw==
-RMD160 (gnome/eog-plugins-3.0.0.tar.bz2) = KsN7Kc0rTxOtYSbTTPnsjWF2nBs=
+RMD160 (gnome/eog-plugins-3.2.0.tar.xz) = SP+OO/8Sg+QCphJHaUtSK9+RqhA=
-SHA1 (gnome/eog-plugins-3.0.0.tar.bz2) = cObZrBkoEwrbmxGC+CgBYPY6oMw=
+SHA1 (gnome/eog-plugins-3.2.0.tar.xz) = v5d2lAnM2W6xrn53zhErQdKSc1Y=
-SHA256 (gnome/eog-plugins-3.0.0.tar.bz2) = h8ztm688i6hNytldd0aGaU9csUChh6e604kbxQvEx70=
+SHA256 (gnome/eog-plugins-3.2.0.tar.xz) = SaeOhioZZ3M7Q5ykpM3kIITo1LGUfEpd2xs1gb7GTcA=
-SIZE (gnome/eog-plugins-3.0.0.tar.bz2) = 368036
+SIZE (gnome/eog-plugins-3.2.0.tar.xz) = 306444

x11/gnome/eog-plugins/patches/patch-configure_ac

@@ -0,0 +1,16 @@
+$OpenBSD: patch-configure_ac,v 1.4 2011/09/27 07:56:18 jasper Exp $
+
+Fix some stupid egrep(1) misusage causing this function to always
+return 1.
+
+--- configure.ac.orig	Tue Sep 27 09:25:50 2011
++++ configure.ac	Tue Sep 27 09:26:09 2011
+@@ -174,7 +174,7 @@ disabled_plugins=
+ # *******************
+ 
+ check_plugin_defined() {
+-	if echo "$2" | egrep "\b($1)\b" > /dev/null;
++	if echo "$2" | egrep "$1" > /dev/null;
+ 	then
+ 		return 1
+ 	else

x11/gnome/eog-plugins/pkg/PLIST

@@ -1,10 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2011/09/12 07:26:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/09/27 07:56:18 jasper Exp $
-lib/eog/
-lib/eog/plugins/
-lib/eog/plugins/exif-display/
 lib/eog/plugins/exif-display.plugin
-lib/eog/plugins/exif-display/exif-display-config.ui
-lib/eog/plugins/exif-display/exif-display.ui
 lib/eog/plugins/fit-to-width.plugin
 @comment lib/eog/plugins/libexif-display.a
 @comment lib/eog/plugins/libexif-display.la
@@ -12,10 +7,21 @@ lib/eog/plugins/libexif-display.so
 @comment lib/eog/plugins/libfit-to-width.a
 @comment lib/eog/plugins/libfit-to-width.la
 lib/eog/plugins/libfit-to-width.so
+@comment lib/eog/plugins/libpostasa.a
+@comment lib/eog/plugins/libpostasa.la
+lib/eog/plugins/libpostasa.so
 @comment lib/eog/plugins/libsend-by-mail.a
 @comment lib/eog/plugins/libsend-by-mail.la
 lib/eog/plugins/libsend-by-mail.so
+lib/eog/plugins/postasa.plugin
 lib/eog/plugins/send-by-mail.plugin
+share/eog/plugins/
+share/eog/plugins/exif-display/
+share/eog/plugins/exif-display/exif-display-config.ui
+share/eog/plugins/exif-display/exif-display.ui
+share/eog/plugins/postasa/
+share/eog/plugins/postasa/postasa-config.xml
+share/eog/plugins/postasa/postasa-uploads.xml
 share/glib-2.0/schemas/org.gnome.eog.plugins.exif-display.gschema.xml
 share/locale/ar/LC_MESSAGES/eog-plugins.mo
 share/locale/as/LC_MESSAGES/eog-plugins.mo
@@ -41,6 +47,7 @@ share/locale/id/LC_MESSAGES/eog-plugins.mo
 share/locale/it/LC_MESSAGES/eog-plugins.mo
 share/locale/ja/LC_MESSAGES/eog-plugins.mo
 share/locale/kn/LC_MESSAGES/eog-plugins.mo
+share/locale/ko/LC_MESSAGES/eog-plugins.mo
 share/locale/lt/LC_MESSAGES/eog-plugins.mo
 share/locale/mk/LC_MESSAGES/eog-plugins.mo
 share/locale/ml/LC_MESSAGES/eog-plugins.mo
@@ -52,6 +59,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