3 files changed, 29 insertions, 12 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f879683460d7..66db0612215a 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.7.6
-PORTREVISION=	1
+PORTVERSION=	0.7.7
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	asa@agava.com
+MAINTAINER=	gnome@freebsd.org
 COMMENT=	A front end for GnuPG
 
 BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
@@ -27,13 +26,16 @@ USE_GNOME=	gnomehack intlhack gnomeprefix eel2
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-gpg-check
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	seahorse.schemas
 
-OPTIONS=	GEDIT "Enable the gedit plug-in" on
+OPTIONS=	GEDIT "Enable the gedit plug-in" on \
+		NAUTILUS "Enable the Nautilus component" on \
+		LDAP "Enable LDAP support" on
 
 .include <bsd.port.pre.mk>
 
@@ -42,14 +44,25 @@ BUILD_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 RUN_DEPENDS+=	gedit:${PORTSDIR}/editors/gedit
 PLIST_SUB+=	GEDIT=""
 GCONF_SCHEMAS+=	seahorse-gedit.schemas
-post-patch:
-	@${REINPLACE_CMD} -e "s|gedit-2.8|gedit-2.10|g" \
-		${WRKSRC}/configure
 .else
 PLIST_SUB+=	GEDIT="@comment "
 CONFIGURE_ARGS+=--disable-gedit
 .endif
 
+.if defined(WITH_NAUTILUS)
+USE_GNOME+=	nautilus2
+PLIST_SUB+=	NAUTILUS=""
+.else
+PLIST_SUB+=	NAUTILUS="@comment "
+CONFIGURE_ARGS+=--disable-nautilus
+.endif
+
+.if defined(WITH_LDAP)
+USE_OPENLDAP=	yes
+.else
+CONFIGURE_ARGS+=--disable-ldap
+.endif
+
 post-install:
 	-@update-desktop-database
 
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index ef9568b16bc4..1e9eded46512 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/seahorse-0.7.6.tar.bz2) = b0a0942faabc1dd9367b4bea9cdd9c4a
-SIZE (gnome2/seahorse-0.7.6.tar.bz2) = 1088531
+MD5 (gnome2/seahorse-0.7.7.tar.bz2) = e9dda6d9f4fa23da562b5edd026f8437
+SIZE (gnome2/seahorse-0.7.7.tar.bz2) = 1085781
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index b50404ae6a1e..c64258b124f9 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,17 +1,17 @@
 bin/seahorse
 bin/seahorse-agent
 bin/seahorse-pgp-preferences
-lib/bonobo/libseahorse-pgp-file-listener.so
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
 %%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
 lib/libseahorse-internal.a
 lib/libseahorse-internal.so
 lib/libseahorse-internal.so.0
-libdata/bonobo/servers/Seahorse_PGP_File_Listener.server
+%%NAUTILUS%%lib/nautilus/extensions-1.0/libnautilus-seahorse.so
+share/gnome/applications/seahorse-pgp-preferences.desktop
 share/gnome/applications/seahorse.desktop
-share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 share/gnome/applications/seahorse-pgp-encrypted.desktop
 share/gnome/applications/seahorse-pgp-signature.desktop
+share/gnome/control-center-2.0/capplets/seahorse-pgp-preferences.desktop
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 share/gnome/help/seahorse/C/figures/export.png
 share/gnome/help/seahorse/C/figures/file-manager.png
@@ -36,6 +36,7 @@ share/gnome/seahorse/glade/seahorse-add-subkey.glade
 share/gnome/seahorse/glade/seahorse-add-uid.glade
 share/gnome/seahorse/glade/seahorse-agent-cache.glade
 share/gnome/seahorse/glade/seahorse-change-passphrase.glade
+share/gnome/seahorse/glade/seahorse-expires.glade
 share/gnome/seahorse/glade/seahorse-generate-adv.glade
 share/gnome/seahorse/glade/seahorse-generate-druid.glade
 share/gnome/seahorse/glade/seahorse-generate-select.glade
@@ -43,10 +44,12 @@ share/gnome/seahorse/glade/seahorse-key-manager.glade
 share/gnome/seahorse/glade/seahorse-key-properties.glade
 share/gnome/seahorse/glade/seahorse-keyserver-results.glade
 share/gnome/seahorse/glade/seahorse-keyserver-search.glade
+share/gnome/seahorse/glade/seahorse-keyserver-sync.glade
 share/gnome/seahorse/glade/seahorse-multi-encrypt.glade
 share/gnome/seahorse/glade/seahorse-passphrase.glade
 share/gnome/seahorse/glade/seahorse-prefs.glade
 share/gnome/seahorse/glade/seahorse-preferences.glade
+share/gnome/seahorse/glade/seahorse-progress.glade
 share/gnome/seahorse/glade/seahorse-recipients.glade
 share/gnome/seahorse/glade/seahorse-revoke.glade
 share/gnome/seahorse/glade/seahorse-sign.glade
@@ -79,6 +82,7 @@ share/locale/pl/LC_MESSAGES/seahorse.mo
 share/locale/pt/LC_MESSAGES/seahorse.mo
 share/locale/pt_BR/LC_MESSAGES/seahorse.mo
 share/locale/ru/LC_MESSAGES/seahorse.mo
+share/locale/rw/LC_MESSAGES/seahorse.mo
 share/locale/sk/LC_MESSAGES/seahorse.mo
 share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sq/LC_MESSAGES/seahorse.mo