Update to 2.7.1.

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

4 files changed, 13 insertions, 86 deletions

diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index d54193b37..0256798b5 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eog2
-PORTVERSION=	2.7.0
+PORTVERSION=	2.7.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.7
@@ -20,9 +20,9 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack eel2 libgnomeprintui \
-		librsvg2
+		librsvg2 desktopfileutils
 USE_X_PREFIX=	yes
-USE_LIBTOOL_VER=13
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -34,4 +34,7 @@ GCONF_SCHEMAS=	eog.schemas
 LIB_DEPENDS+=	exif.10:${PORTSDIR}/graphics/libexif
 .endif
 
+post-install:
+	@-update-desktop-database > /dev/null
+
 .include <bsd.port.post.mk>
diff --git a/graphics/eog2/distinfo b/graphics/eog2/distinfo
index 73ac90d84..92ec99ed9 100644
--- a/graphics/eog2/distinfo
+++ b/graphics/eog2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/eog-2.7.0.tar.bz2) = 8081319151a829d43c2f8463a53354ea
-SIZE (gnome2/eog-2.7.0.tar.bz2) = 807494
+MD5 (gnome2/eog-2.7.1.tar.bz2) = 9c373a1e1355622d253d45da8a4efecc
+SIZE (gnome2/eog-2.7.1.tar.bz2) = 792518
diff --git a/graphics/eog2/files/patch-libeog_eog-uri-converter.c b/graphics/eog2/files/patch-libeog_eog-uri-converter.c
deleted file mode 100644
index e6d1f43c8..000000000
--- a/graphics/eog2/files/patch-libeog_eog-uri-converter.c
+++ /dev/null
@@ -1,81 +0,0 @@
---- libeog/eog-uri-converter.c.orig	Thu Jul 22 16:40:16 2004
-+++ libeog/eog-uri-converter.c	Thu Jul 22 16:44:59 2004
-@@ -20,7 +20,7 @@
- 	union {
- 		char    *string;  /* if type == EOG_UC_STRING */
- 		gulong  counter;  /* if type == EOG_UC_COUNTER */
--	};
-+	} data;
- } EogUCToken;
- 
- 
-@@ -64,8 +64,8 @@
- {
- 	EogUCToken *token = (EogUCToken*) data;
- 
--	if (token->type == EOG_UC_STRING && token->string != NULL) {
--		g_free (token->string);
-+	if (token->type == EOG_UC_STRING && token->data.string != NULL) {
-+		g_free (token->data.string);
- 	}
- 
- 	g_free (token);
-@@ -321,8 +321,8 @@
- 
- 	token = g_new0 (EogUCToken, 1);
- 	token->type = EOG_UC_STRING;
--	token->string = g_new0 (char, n_bytes);
--	token->string = g_utf8_strncpy (token->string, start_byte, substr_len);
-+	token->data.string = g_new0 (char, n_bytes);
-+	token->data.string = g_utf8_strncpy (token->data.string, start_byte, substr_len);
- 	
- 	return token;
- }
-@@ -334,7 +334,7 @@
- 
- 	token = g_new0 (EogUCToken, 1);
- 	token->type = EOG_UC_COUNTER;
--	token->counter = 0;
-+	token->data.counter = 0;
- 
- 	return token;
- }
-@@ -488,13 +488,13 @@
- 		
- 		switch (token->type) {
- 		case EOG_UC_STRING:
--			str = g_strdup_printf ("string [%s]", token->string);
-+			str = g_strdup_printf ("string [%s]", token->data.string);
- 			break;
- 		case EOG_UC_FILENAME:
- 			str = "filename";
- 			break;
- 		case EOG_UC_COUNTER:
--			str = g_strdup_printf ("counter [%li]", token->counter);
-+			str = g_strdup_printf ("counter [%li]", token->data.counter);
- 			break;
- 		case EOG_UC_COMMENT:
- 			str = "comment";
-@@ -785,7 +785,7 @@
- 
- 		switch (token->type) {
- 		case EOG_UC_STRING:
--			str = g_string_append (str, token->string);
-+			str = g_string_append (str, token->data.string);
- 			break;
- 
- 		case EOG_UC_FILENAME:
-@@ -793,10 +793,10 @@
- 			break;
- 
- 		case EOG_UC_COUNTER: {
--			if (token->counter < priv->counter_start) 
--				token->counter = priv->counter_start;
-+			if (token->data.counter < priv->counter_start) 
-+				token->data.counter = priv->counter_start;
- 			
--			str = append_counter (str, token->counter++, conv);
-+			str = append_counter (str, token->data.counter++, conv);
- 			break;
- 		}
- #if 0
diff --git a/graphics/eog2/pkg-plist b/graphics/eog2/pkg-plist
index c10de24a3..af5be1636 100644
--- a/graphics/eog2/pkg-plist
+++ b/graphics/eog2/pkg-plist
@@ -1,5 +1,6 @@
 bin/eog
 share/gnome/applications/eog.desktop
+@exec update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/eog/glade/eog.glade
 share/gnome/gnome-2.0/ui/eog-gtk-ui.xml
 share/gnome/help/eog/C/eog.xml
@@ -75,6 +76,7 @@ share/locale/az/LC_MESSAGES/eog.mo
 share/locale/be/LC_MESSAGES/eog.mo
 share/locale/bg/LC_MESSAGES/eog.mo
 share/locale/bn/LC_MESSAGES/eog.mo
+share/locale/bs/LC_MESSAGES/eog.mo
 share/locale/ca/LC_MESSAGES/eog.mo
 share/locale/cs/LC_MESSAGES/eog.mo
 share/locale/cy/LC_MESSAGES/eog.mo
@@ -108,10 +110,12 @@ share/locale/mk/LC_MESSAGES/eog.mo
 share/locale/ml/LC_MESSAGES/eog.mo
 share/locale/mn/LC_MESSAGES/eog.mo
 share/locale/ms/LC_MESSAGES/eog.mo
+share/locale/nb/LC_MESSAGES/eog.mo
 share/locale/ne/LC_MESSAGES/eog.mo
 share/locale/nl/LC_MESSAGES/eog.mo
 share/locale/nn/LC_MESSAGES/eog.mo
 share/locale/no/LC_MESSAGES/eog.mo
+share/locale/or/LC_MESSAGES/eog.mo
 share/locale/pa/LC_MESSAGES/eog.mo
 share/locale/pl/LC_MESSAGES/eog.mo
 share/locale/pt/LC_MESSAGES/eog.mo
@@ -166,3 +170,4 @@ share/locale/zh_TW/LC_MESSAGES/eog.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-sv.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/eog/eog-zh_TW.omf 2>/dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true