4 files changed, 35 insertions, 43 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 7bb7e7d47350..f61cbc900ddd 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -6,23 +6,21 @@
 #
 
 PORTNAME=	seahorse
-PORTVERSION=	0.7.1
+PORTVERSION=	0.7.2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=sources/${PORTNAME}/0.7
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	A front end for GnuPG
 
 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
+LIB_DEPENDS=	gpgme.9:${PORTSDIR}/security/gpgme
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOMENG=	yes
-USE_GNOME=	gnomehack gnomeprefix
+USE_GNOME=	gnomehack gnomeprefix libgnomeui
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 6a2c26372840..63e524b6eb79 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1 +1 @@
-MD5 (seahorse-0.7.1.tar.gz) = 4d24738bfa8d8c7a9e77f2e36140ba85
+MD5 (seahorse-0.7.2.tar.gz) = f8d079f32f145a6f6277f649d5689412
diff --git a/security/seahorse/files/patch-Makefile.in b/security/seahorse/files/patch-Makefile.in
deleted file mode 100644
index c3fe76800e4b..000000000000
--- a/security/seahorse/files/patch-Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/Makefile.in.orig	Sat Mar 15 13:18:02 2003
-+++ src/Makefile.in	Sat Mar 15 13:18:35 2003
-@@ -586,11 +586,11 @@
- 
- 
- seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
--	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse-marshal > $@
-+	$(GLIB_GENMARSHAL) $< --header --prefix=seahorse_marshal > $@
- 
- seahorse-marshal.c: seahorse-marshal.list $(GLIB_GENMARSHAL)
- 	echo "#include \"seahorse-marshal.h\"" > $@ && \
--	$(GLIB_GENMARSHAL) $< --body --prefix=seahorse-marshal >> $@
-+	$(GLIB_GENMARSHAL) $< --body --prefix=seahorse_marshal >> $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/security/seahorse/pkg-plist b/security/seahorse/pkg-plist
index c031bc656504..fa72267c1e8f 100644
--- a/security/seahorse/pkg-plist
+++ b/security/seahorse/pkg-plist
@@ -2,13 +2,15 @@ bin/seahorse
 etc/gconf/gconf.xml.defaults/apps/seahorse/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/seahorse/listing/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/seahorse/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/seahorse/recipients/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/seahorse/ui/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/recipients/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/ui/%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
@@ -20,28 +22,32 @@ 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/help/seahorse/C/legal.xml
+share/gnome/help/seahorse/C/seahorse.xml
 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-add-subkey.glade2
+share/gnome/seahorse/glade/seahorse-add-uid.glade2
+share/gnome/seahorse/glade/seahorse-change-passphrase.glade2
+share/gnome/seahorse/glade/seahorse-decrypt-file.glade2
+share/gnome/seahorse/glade/seahorse-decrypt-verify-file.glade2
+share/gnome/seahorse/glade/seahorse-encrypt-file.glade2
+share/gnome/seahorse/glade/seahorse-encrypt-sign-file.glade2
 share/gnome/seahorse/glade/seahorse-export.glade2
-share/gnome/seahorse/glade/seahorse-preferences.glade2
+share/gnome/seahorse/glade/seahorse-generate.glade2
 share/gnome/seahorse/glade/seahorse-import.glade2
-share/gnome/seahorse/glade/seahorse-signatures.glade2
+share/gnome/seahorse/glade/seahorse-key-manager.glade2
+share/gnome/seahorse/glade/seahorse-key-properties.glade2
+share/gnome/seahorse/glade/seahorse-passphrase.glade2
+share/gnome/seahorse/glade/seahorse-preferences.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-sign.glade2
-share/gnome/seahorse/glade/seahorse-encrypt-file.glade2
-share/gnome/seahorse/glade/seahorse-decrypt-file.glade2
 share/gnome/seahorse/glade/seahorse-sign-file.glade2
-share/gnome/seahorse/glade/seahorse-verify-file.glade2
-share/gnome/seahorse/glade/seahorse-encrypt-sign-file.glade2
-share/gnome/seahorse/glade/seahorse-decrypt-verify-file.glade2
-share/gnome/seahorse/glade/seahorse-key-manager.glade2
+share/gnome/seahorse/glade/seahorse-sign.glade2
+share/gnome/seahorse/glade/seahorse-signatures.glade2
 share/gnome/seahorse/glade/seahorse-text-editor.glade2
-share/gnome/seahorse/glade/seahorse-key-properties.glade2
+share/gnome/seahorse/glade/seahorse-verify-file.glade2
 share/locale/cs/LC_MESSAGES/seahorse.mo
 share/locale/da/LC_MESSAGES/seahorse.mo
 share/locale/de/LC_MESSAGES/seahorse.mo
@@ -59,15 +65,19 @@ share/locale/sv/LC_MESSAGES/seahorse.mo
 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/seahorse/glade
+@dirrm share/gnome/seahorse
+@dirrm share/gnome/omf/seahorse
 @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/ui
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/recipients
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/preferences
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse/listing
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/seahorse
+@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/ui
+@dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/recipients
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse/listing
 @dirrm etc/gconf/gconf.xml.defaults/apps/seahorse