2 files changed, 10 insertions, 19 deletions

diff --git a/security/seahorse-plugins/Makefile b/security/seahorse-plugins/Makefile
index 9af57adc87fb..b4afdffe2873 100644
--- a/security/seahorse-plugins/Makefile
+++ b/security/seahorse-plugins/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	seahorse-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,17 +12,19 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plug-ins for the Seahorse key and password management application
 
-LIB_DEPENDS=	cryptui:${PORTSDIR}/security/seahorse \
-		gcrypt:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	libcryptui.so:${PORTSDIR}/security/seahorse \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt
 
-USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES=		pathfix gettext gmake libtool pkgconfig tar:bzip2 \
+		desktop-file-utils shared-mime-info
 USE_GNOME=	intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALLS_OMF=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip
+CONFIGURE_ARGS=	--disable-update-mime-database
 
 OPTIONS_DEFINE=	NAUTILUS GEDIT APPLET NOTIFY
 OPTIONS_DEFAULT=NAUTILUS GEDIT APPLET NOTIFY
@@ -31,9 +33,7 @@ GEDIT_DESC=	GEdit plug-in support
 APPLET_DESC=	Clipboard encryption applet
 
 GCONF_SCHEMAS=	seahorse-plugins.schemas
-MAN1=		seahorse-agent.1 seahorse-tool.1
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGEDIT}
@@ -66,7 +66,7 @@ PLIST_SUB+=	APPLET="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNOTIFY}
-LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS+=	libnotify.so:${PORTSDIR}/devel/libnotify
 .else
 CONFIGURE_ARGS+=--disable-libnotify
 .endif
@@ -77,8 +77,4 @@ post-patch:
 		-e 's|2.24|2.26|g' \
 			${WRKSRC}/configure
 
-post-install:
-	@-update-desktop-database
-	@-update-mime-database ${PREFIX}/share/mime
-
 .include <bsd.port.mk>
diff --git a/security/seahorse-plugins/pkg-plist b/security/seahorse-plugins/pkg-plist
index d6903ab65843..720c2dff58b2 100644
--- a/security/seahorse-plugins/pkg-plist
+++ b/security/seahorse-plugins/pkg-plist
@@ -2,18 +2,17 @@ bin/seahorse-agent
 bin/seahorse-preferences
 bin/seahorse-tool
 %%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.a
-%%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.la
 %%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/libseahorseextension.so
 %%EPHY%%lib/epiphany/%%EPHY_VERSION%%/extensions/seahorse.ephy-extension
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.a
-%%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.la
 %%GEDIT%%lib/gedit-2/plugins/libseahorse-pgp.so
 %%GEDIT%%lib/gedit-2/plugins/seahorse-pgp.gedit-plugin
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.a
-%%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.la
 %%NAUTILUS%%lib/nautilus/extensions-2.0/libnautilus-seahorse.so
 lib/seahorse/seahorse-applet
 libdata/bonobo/servers/GNOME_SeahorseApplet.server
+man/man1/seahorse-agent.1.gz
+man/man1/seahorse-tool.1.gz
 share/applications/seahorse-pgp-encrypted.desktop
 share/applications/seahorse-pgp-keys.desktop
 share/applications/seahorse-pgp-preferences.desktop
@@ -214,10 +213,6 @@ share/pixmaps/seahorse-plugins/scalable/seahorse-sign.svg
 @dirrm share/gnome/help/seahorse-applet/es
 @dirrm share/gnome/help/seahorse-applet/C
 @dirrm share/gnome/help/seahorse-applet
-@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES