3 files changed, 66 insertions, 25 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index f0142761409e..c20b0c5e72bf 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -6,30 +6,29 @@
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.5.0
-PORTREVISION=	1
+PORTVERSION=	0.7.0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITE_SUBDIR=${PORTNAME}
 
 MAINTAINER=	dave@mu.org
 
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
+LIB_DEPENDS=	gpgme.9:${PORTSDIR}/security/gpgme \
+		gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
+		glade-2.0.0:${PORTSDIR}/devel/libglade2
 
 USE_X_PREFIX=	yes
-USE_GNOME=	yes
+USE_GNOMENG=	yes
+USE_GNOME=	gnomehack gnomeprefix
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-MAN1=		seahorse.1
-
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|datadir\`/gnome/|datadir\`/|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${CP} ${WRKSRC}/data/seahorse.desktop.in ${WRKSRC}/data/seahorse.desktop
+	@${CP} ${WRKSRC}/data/seahorse.schemas.in ${WRKSRC}/data/seahorse.schemas
 
 .include <bsd.port.mk>
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index b054f37dc48b..ebb6862bf347 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1 +1 @@
-MD5 (seahorse-0.5.0.tar.gz) = d564444761060c2c568b9dac34bb54fb
+MD5 (seahorse-0.7.0.tar.gz) = 0d54d30afdb9961c7c1b146b22ae904f
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index 09f8a99049eb..0d1a694ffbf7 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -1,21 +1,63 @@
 bin/seahorse
-share/gnome/apps/Applications/seahorse.desktop
-share/gnome/help/seahorse/C/seahorse.html
-share/gnome/help/seahorse/C/topic.dat
-share/gnome/help/seahorse/it/seahorse.html
-share/gnome/help/seahorse/it/topic.dat
-share/gnome/help/seahorse/ja/seahorse.html
-share/gnome/help/seahorse/ja/topic.dat
-share/gnome/pixmaps/seahorse/seahorse.png
+etc/gconf/gconf.xml.defaults/apps/seahorse/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/seahorse/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences/%gconf.xml
+etc/gconf/schemas/seahorse.schemas
+share/gnome/applications/seahorse.desktop
+share/gnome/help/seahorse/C/legal.xml
+share/gnome/help/seahorse/C/seahorse.xml
+share/gnome/help/seahorse/C/figures/export.png
+share/gnome/help/seahorse/C/figures/file-manager.png
+share/gnome/help/seahorse/C/figures/generate.png
+share/gnome/help/seahorse/C/figures/import.png
+share/gnome/help/seahorse/C/figures/key-manager.png
+share/gnome/help/seahorse/C/figures/key-properties.png
+share/gnome/help/seahorse/C/figures/passphrase.png
+share/gnome/help/seahorse/C/figures/preferences.png
+share/gnome/help/seahorse/C/figures/recipients.png
+share/gnome/help/seahorse/C/figures/signature.png
+share/gnome/help/seahorse/C/figures/text-editor.png
+share/gnome/omf/seahorse/seahorse-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/seahorse/seahorse-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/pixmaps/seahorse.png
+share/gnome/seahorse/glade/seahorse-generate.glade2
+share/gnome/seahorse/glade/seahorse-export.glade2
+share/gnome/seahorse/glade/seahorse-preferences.glade2
+share/gnome/seahorse/glade/seahorse-import.glade2
+share/gnome/seahorse/glade/seahorse-signatures.glade2
+share/gnome/seahorse/glade/seahorse-recipients.glade2
+share/gnome/seahorse/glade/seahorse-add-uid.glade2
+share/gnome/seahorse/glade/seahorse-add-subkey.glade2
+share/gnome/seahorse/glade/seahorse-revoke.glade2
+share/gnome/seahorse/glade/seahorse-key-manager.glade2
+share/gnome/seahorse/glade/seahorse-text-editor.glade2
+share/gnome/seahorse/glade/seahorse-key-properties.glade2
+share/gnome/seahorse/glade/seahorse-file-manager.glade2
 share/locale/cs/LC_MESSAGES/seahorse.mo
 share/locale/da/LC_MESSAGES/seahorse.mo
 share/locale/de/LC_MESSAGES/seahorse.mo
+share/locale/es/LC_MESSAGES/seahorse.mo
 share/locale/fi/LC_MESSAGES/seahorse.mo
 share/locale/fr/LC_MESSAGES/seahorse.mo
+share/locale/hu/LC_MESSAGES/seahorse.mo
 share/locale/ja/LC_MESSAGES/seahorse.mo
+share/locale/nl/LC_MESSAGES/seahorse.mo
+share/locale/no/LC_MESSAGES/seahorse.mo
+share/locale/ru/LC_MESSAGES/seahorse.mo
+share/locale/sl/LC_MESSAGES/seahorse.mo
 share/locale/sv/LC_MESSAGES/seahorse.mo
-@dirrm share/gnome/pixmaps/seahorse
-@dirrm share/gnome/help/seahorse/ja
-@dirrm share/gnome/help/seahorse/it
+share/locale/tr/LC_MESSAGES/seahorse.mo
+share/locale/uk/LC_MESSAGES/seahorse.mo
+share/locale/zh_CN/LC_MESSAGES/seahorse.mo
+@dirrm share/gnome/help/seahorse/C/figures
 @dirrm share/gnome/help/seahorse/C
 @dirrm share/gnome/help/seahorse
+@dirrm share/gnome/omf/seahorse
+@dirrm share/gnome/seahorse/glade
+@dirrm share/gnome/seahorse
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse
+@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/preferences
+@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/seahorse/seahorse-C.omf 2>/dev/null || /usr/bin/true