Presenting GNOME 2.14.1 for FreeBSD! Checkout

http://www.gnome.org/start/2.14/ for the official release notes, and a list
of all the gooides in this new release.  In particular, GNOME 2.14 focused
on performance, and they did not miss the mark.  There's some new eye candy,
but most of the big things are waiting until GNOME 2.16.  On the FreeBSD
side, we tried to clean up all the crashers we could.  In particular, we
really improved GNOME's 64-bit support.

The good news is that this release does not bring any big shared library
version bumps, so you can almost do a simple portupgrade to get to 2.14.
There are a few minor gotchas that will be documented in UPDATING shortly.

The FreeBSD GNOME Team would like th thank the following users for their
patches, feedback, and sometimes incessant complaing about crashes (you
know who you are).

Yasuda Keisuke <kysd@po.harenet.ne.jp>
Pascal Hofstee <caelian@gmail.com>
rmgls@wanadoo.fr
tmclaugh
Yuri Pankov <yuri.pankov@gmail.com>
sajd on #freebsd-gnome
ade
ankon on #FreeBSD-Gnome
mux
Pascal Hofstee <caelian@gmail.com>
QuiRK on #freebsd-gnome
Vladimir Timofeev <vovkasm@gmail.com>

12 files changed, 42 insertions, 103 deletions

diff --git a/security/gnome-keyring-manager/Makefile b/security/gnome-keyring-manager/Makefile
index 19454ad0b488..4f91104654a0 100644
--- a/security/gnome-keyring-manager/Makefile
+++ b/security/gnome-keyring-manager/Makefile
@@ -3,29 +3,29 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	2.12.0
+PORTVERSION=	2.14.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.12
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyring manager
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnomekeyring
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
+USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui gnomedocutils
 CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnome-keyring-manager/distinfo b/security/gnome-keyring-manager/distinfo
index 518cfe03c81a..f453addc7767 100644
--- a/security/gnome-keyring-manager/distinfo
+++ b/security/gnome-keyring-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
-SHA256 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = cf0b94305fd14582a20b5bcd55f0f391caa0aefb8019a239631a455997cb54ce
-SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
+MD5 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = d4e38c7b7da99885fa898917e10d8aeb
+SHA256 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = f1182d7e560e485a9e3a9d7e983cbb09849caad21010d7c801c68ce19822b030
+SIZE (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = 391387
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
deleted file mode 100644
index 81a4de59585d..000000000000
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-main-ui.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gnome-keyring-manager-main-ui.c.orig	Fri Jun 10 19:59:37 2005
-+++ src/gnome-keyring-manager-main-ui.c	Fri Jun 10 19:59:45 2005
-@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- {
-   GtkWidget *menubar;
-   GtkAccelGroup *accel_group;
-+  GError *error = NULL;
- 
-   self->priv->action_group = gtk_action_group_new ("MenuActions"); 
-   gtk_action_group_add_actions (self->priv->action_group, entries, 
-@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- 				      self->priv->action_group, 0);
-   accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
-   gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
--  GError *error = NULL;
-   if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
- 					GLADEDIR MENU_FILE,
- 					&error))
diff --git a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
index c05c11acf6e4..3291d28419ec 100644
--- a/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
+++ b/security/gnome-keyring-manager/files/patch-src_gnome-keyring-manager-util.c
@@ -1,23 +1,5 @@
 --- src/gnome-keyring-manager-util.c.orig	Wed May 18 16:41:35 2005
 +++ src/gnome-keyring-manager-util.c	Sat Jul  2 02:12:38 2005
-@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
- {
-   GtkWidget *about;
- 
--  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
-   const char *authors[] = {
-     "Fernando Herrera <fherrera@onirica.com>",
-     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
-     NULL
-   };
- 
-+  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
-   gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
- 				   GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
- 
 @@ -354,6 +354,10 @@ gkm_get_application_path (void)
   	{
  	  path = g_file_read_link ("/proc/self/exe", NULL);
diff --git a/security/gnome-keyring-manager/pkg-plist b/security/gnome-keyring-manager/pkg-plist
index 9b1c28598b19..feae65637b2d 100644
--- a/security/gnome-keyring-manager/pkg-plist
+++ b/security/gnome-keyring-manager/pkg-plist
@@ -8,13 +8,16 @@ share/gnome/gnome-keyring-manager/stock_new-key.png
 share/gnome/gnome-keyring-manager/stock_new-keyring.png
 share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
 share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
 share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
@@ -52,10 +55,15 @@ share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/gnome-keyring-manager
 @dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/es
 @dirrm share/gnome/help/gnome-keyring-manager/C
 @dirrm share/gnome/help/gnome-keyring-manager
 @dirrm share/gnome/gnome-keyring-manager
diff --git a/security/gnomekeyringmanager/Makefile b/security/gnomekeyringmanager/Makefile
index 19454ad0b488..4f91104654a0 100644
--- a/security/gnomekeyringmanager/Makefile
+++ b/security/gnomekeyringmanager/Makefile
@@ -3,29 +3,29 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.14 2005/09/07 14:54:53 adamw Exp $
+#   $MCom: ports/security/gnomekeyringmanager/Makefile,v 1.19 2006/04/13 07:52:37 bland Exp $
 #
 
 PORTNAME=	gnomekeyringmanager
-PORTVERSION=	2.12.0
+PORTVERSION=	2.14.0
 CATEGORIES=	security gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/2.12
+MASTER_SITE_SUBDIR=	sources/gnome-keyring-manager/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-keyring-manager-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME keyring manager
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/gnomekeyring
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui
+USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui gnomedocutils
 CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/security/gnomekeyringmanager/distinfo b/security/gnomekeyringmanager/distinfo
index 518cfe03c81a..f453addc7767 100644
--- a/security/gnomekeyringmanager/distinfo
+++ b/security/gnomekeyringmanager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 0a588c64839390e0c6e07250b509a86a
-SHA256 (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = cf0b94305fd14582a20b5bcd55f0f391caa0aefb8019a239631a455997cb54ce
-SIZE (gnome2/gnome-keyring-manager-2.12.0.tar.bz2) = 380274
+MD5 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = d4e38c7b7da99885fa898917e10d8aeb
+SHA256 (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = f1182d7e560e485a9e3a9d7e983cbb09849caad21010d7c801c68ce19822b030
+SIZE (gnome2/gnome-keyring-manager-2.14.0.tar.bz2) = 391387
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
deleted file mode 100644
index 81a4de59585d..000000000000
--- a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-main-ui.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gnome-keyring-manager-main-ui.c.orig	Fri Jun 10 19:59:37 2005
-+++ src/gnome-keyring-manager-main-ui.c	Fri Jun 10 19:59:45 2005
-@@ -1100,6 +1100,7 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- {
-   GtkWidget *menubar;
-   GtkAccelGroup *accel_group;
-+  GError *error = NULL;
- 
-   self->priv->action_group = gtk_action_group_new ("MenuActions"); 
-   gtk_action_group_add_actions (self->priv->action_group, entries, 
-@@ -1111,7 +1112,6 @@ gkm_main_ui_initialize_menu (GKMMainUI *
- 				      self->priv->action_group, 0);
-   accel_group = gtk_ui_manager_get_accel_group (self->priv->ui_manager);
-   gtk_window_add_accel_group (GTK_WINDOW (self->priv->window), accel_group);
--  GError *error = NULL;
-   if (!gtk_ui_manager_add_ui_from_file (self->priv->ui_manager,
- 					GLADEDIR MENU_FILE,
- 					&error))
diff --git a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
index c05c11acf6e4..3291d28419ec 100644
--- a/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
+++ b/security/gnomekeyringmanager/files/patch-src_gnome-keyring-manager-util.c
@@ -1,23 +1,5 @@
 --- src/gnome-keyring-manager-util.c.orig	Wed May 18 16:41:35 2005
 +++ src/gnome-keyring-manager-util.c	Sat Jul  2 02:12:38 2005
-@@ -304,8 +304,6 @@ gkm_about_dialog_new (GtkWindow *transie
- {
-   GtkWidget *about;
- 
--  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
--
-   const char *authors[] = {
-     "Fernando Herrera <fherrera@onirica.com>",
-     "Mariano Su\303\241rez-Alvarez <mariano@gnome.org>",
-@@ -317,6 +315,8 @@ gkm_about_dialog_new (GtkWindow *transie
-     NULL
-   };
- 
-+  g_return_val_if_fail (GTK_IS_WINDOW (transient_parent), NULL);
-+
-   gtk_about_dialog_set_email_hook ((GtkAboutDialogActivateLinkFunc) gkm_about_dialog_activate_links,
- 				   GINT_TO_POINTER (LINK_TYPE_EMAIL), NULL);
- 
 @@ -354,6 +354,10 @@ gkm_get_application_path (void)
   	{
  	  path = g_file_read_link ("/proc/self/exe", NULL);
diff --git a/security/gnomekeyringmanager/pkg-plist b/security/gnomekeyringmanager/pkg-plist
index 9b1c28598b19..feae65637b2d 100644
--- a/security/gnomekeyringmanager/pkg-plist
+++ b/security/gnomekeyringmanager/pkg-plist
@@ -8,13 +8,16 @@ share/gnome/gnome-keyring-manager/stock_new-key.png
 share/gnome/gnome-keyring-manager/stock_new-keyring.png
 share/gnome/help/gnome-keyring-manager/C/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/C/legal.xml
+share/gnome/help/gnome-keyring-manager/es/gnome-keyring-manager.xml
 share/gnome/help/gnome-keyring-manager/uk/gnome-keyring-manager.xml
 share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-C.omf
+share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-es.omf
 share/gnome/omf/gnome-keyring-manager/gnome-keyring-manager-uk.omf
 share/locale/bg/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/bn/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/ca/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/cs/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/cy/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/da/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/de/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/el/LC_MESSAGES/gnome-keyring-manager.mo
@@ -52,10 +55,15 @@ share/locale/sv/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/th/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/tr/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/uk/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/vi/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring-manager.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-keyring-manager.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring-manager.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
 @dirrm share/gnome/omf/gnome-keyring-manager
 @dirrm share/gnome/help/gnome-keyring-manager/uk
+@dirrm share/gnome/help/gnome-keyring-manager/es
 @dirrm share/gnome/help/gnome-keyring-manager/C
 @dirrm share/gnome/help/gnome-keyring-manager
 @dirrm share/gnome/gnome-keyring-manager
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 75f08979ee46..7fff39609a46 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,11 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.8 2005/10/14 20:39:58 adamw Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.16 2006/03/05 21:52:25 marcus Exp $
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.8
-PORTREVISION=	4
+PORTVERSION=	0.8.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.8
@@ -22,11 +21,11 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 LIB_DEPENDS=	gpgme.15:${PORTSDIR}/security/gpgme
 
 USE_BZIP2=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
-USE_REINPLACE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-gpg-check
@@ -35,14 +34,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	seahorse.schemas
 
-OPTIONS=	GEDIT "Enable the gedit plug-in" on \
-		NAUTILUS "Enable the Nautilus component" on \
+OPTIONS=	NAUTILUS "Enable the Nautilus component" on \
 		LDAP "Enable LDAP support" on \
+		GEDIT "Enable GEdit plug-in support" on \
 		HKP "Enable HKP keyserver interface" on
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_GEDIT)
+.if !defined(WITHOUT_GEDIT)
 BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
@@ -52,7 +51,7 @@ PLIST_SUB+=	GEDIT="@comment "
 CONFIGURE_ARGS+=--disable-gedit
 .endif
 
-.if defined(WITH_NAUTILUS)
+.if !defined(WITHOUT_NAUTILUS)
 USE_GNOME+=	nautilus2
 PLIST_SUB+=	NAUTILUS=""
 .else
@@ -72,10 +71,6 @@ LIB_DEPENDS+=	soup-2.2.8:${PORTSDIR}/devel/libsoup
 CONFIGURE_ARGS+=--disable-hkp
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|gedit-2.10|gedit-2.12|g' \
-		${WRKSRC}/configure
-
 post-install:
 	-@update-desktop-database
 
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index c9ee38c21b90..bd26f470f11d 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/seahorse-0.8.tar.bz2) = b8c4878cdcbf57e9885583672934772c
-SHA256 (gnome2/seahorse-0.8.tar.bz2) = 797a3f22ca135e5def00a872ef9aed07475f753fae76dbddb401011178cd4d17
-SIZE (gnome2/seahorse-0.8.tar.bz2) = 946453
+MD5 (gnome2/seahorse-0.8.1.tar.bz2) = 5d69954ff503c625aa2618acde660496
+SHA256 (gnome2/seahorse-0.8.1.tar.bz2) = 1aba14b58f2366beaf32324d95281a03799b4888ac1701f0ec788b43b4117e90
+SIZE (gnome2/seahorse-0.8.1.tar.bz2) = 971378