3 files changed, 57 insertions, 64 deletions

diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index a05b54bac09f..e2972f9fa6c5 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -1,36 +1,29 @@
-# New ports collection makefile for:	revelation
-# Date created:		2004-08-10
-# Whom:			ports@c0decafe.net
+# New ports collection makefile for:	Revelation
+# Date created:				2004-08-10
+# Whom:					ports@c0decafe.net
 #
 # $FreeBSD$
 #
 
 PORTNAME=	revelation
-PORTVERSION=	0.3.4
-PORTREVISION=	2
+PORTVERSION=	0.4.0
 CATEGORIES=	security gnome
 MASTER_SITES=	ftp://oss.codepoet.no/revelation/
 
 MAINTAINER=	ports@c0decafe.net
 COMMENT=	Password manager for the GNOME 2 desktop
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2\
-		${PYTHON_SITELIBDIR}/Crypto/test.py:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/test.py:${PORTSDIR}/security/py-pycrypto
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	pygnome2
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	pygnome2 gnomeprefix gnomehack desktopfileutils
 USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-USE_REINPLACE=	yes
 GCONF_SCHEMAS=	revelation.schemas
 
-post-patch:
-	@${REINPLACE_CMD} 's#share/#share/gnome/#g' \
-		${WRKSRC}/setup.py ${WRKSRC}/src/lib/__init__.py
-	@${REINPLACE_CMD} 's#sys\.prefix#"${PREFIX}"#g' \
-		${WRKSRC}/src/lib/__init__.py
-	@${REINPLACE_CMD} 's#/etc/#${PREFIX}/etc/#' \
-		${WRKSRC}/setup.py ${WRKSRC}/src/lib/data.py
+post-install:
+	-@update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/security/revelation/distinfo b/security/revelation/distinfo
index 0d275ef873ff..62eb7d2dcf09 100644
--- a/security/revelation/distinfo
+++ b/security/revelation/distinfo
@@ -1,2 +1,2 @@
-MD5 (revelation-0.3.4.tar.bz2) = 1b5d3b02bf5cce6568082c39cf74f9e6
-SIZE (revelation-0.3.4.tar.bz2) = 75134
+MD5 (revelation-0.4.0.tar.bz2) = d00dd223a1c35472e573fb11d758cd98
+SIZE (revelation-0.4.0.tar.bz2) = 153079
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index 1b6e2866aba5..65dddb2c6d31 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -1,69 +1,69 @@
 bin/revelation
-%%PYTHON_SITELIBDIR%%/revelation/dialog.py
-%%PYTHON_SITELIBDIR%%/revelation/data.py
-%%PYTHON_SITELIBDIR%%/revelation/misc.py
-%%PYTHON_SITELIBDIR%%/revelation/__init__.py
-%%PYTHON_SITELIBDIR%%/revelation/entry.py
-%%PYTHON_SITELIBDIR%%/revelation/stock.py
-%%PYTHON_SITELIBDIR%%/revelation/widget.py
-%%PYTHON_SITELIBDIR%%/revelation/io.py
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/__init__.py
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/base.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.py
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.py
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.py
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/__init__.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/base.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/__init__.pyo
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/base.pyo
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyo
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyo
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyo
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.pyo
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.pyo
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/revelation/datahandler
-%%PYTHON_SITELIBDIR%%/revelation/dialog.pyc
-%%PYTHON_SITELIBDIR%%/revelation/data.pyc
-%%PYTHON_SITELIBDIR%%/revelation/misc.pyc
+%%PYTHON_SITELIBDIR%%/revelation/__init__.py
+%%PYTHON_SITELIBDIR%%/revelation/config.py
+%%PYTHON_SITELIBDIR%%/revelation/data.py
+%%PYTHON_SITELIBDIR%%/revelation/dialog.py
+%%PYTHON_SITELIBDIR%%/revelation/entry.py
+%%PYTHON_SITELIBDIR%%/revelation/io.py
+%%PYTHON_SITELIBDIR%%/revelation/ui.py
+%%PYTHON_SITELIBDIR%%/revelation/util.py
 %%PYTHON_SITELIBDIR%%/revelation/__init__.pyc
+%%PYTHON_SITELIBDIR%%/revelation/config.pyc
+%%PYTHON_SITELIBDIR%%/revelation/data.pyc
+%%PYTHON_SITELIBDIR%%/revelation/dialog.pyc
 %%PYTHON_SITELIBDIR%%/revelation/entry.pyc
-%%PYTHON_SITELIBDIR%%/revelation/stock.pyc
-%%PYTHON_SITELIBDIR%%/revelation/widget.pyc
 %%PYTHON_SITELIBDIR%%/revelation/io.pyc
-%%PYTHON_SITELIBDIR%%/revelation/dialog.pyo
-%%PYTHON_SITELIBDIR%%/revelation/data.pyo
-%%PYTHON_SITELIBDIR%%/revelation/misc.pyo
+%%PYTHON_SITELIBDIR%%/revelation/ui.pyc
+%%PYTHON_SITELIBDIR%%/revelation/util.pyc
 %%PYTHON_SITELIBDIR%%/revelation/__init__.pyo
+%%PYTHON_SITELIBDIR%%/revelation/config.pyo
+%%PYTHON_SITELIBDIR%%/revelation/data.pyo
+%%PYTHON_SITELIBDIR%%/revelation/dialog.pyo
 %%PYTHON_SITELIBDIR%%/revelation/entry.pyo
-%%PYTHON_SITELIBDIR%%/revelation/stock.pyo
-%%PYTHON_SITELIBDIR%%/revelation/widget.pyo
 %%PYTHON_SITELIBDIR%%/revelation/io.pyo
+%%PYTHON_SITELIBDIR%%/revelation/ui.pyo
+%%PYTHON_SITELIBDIR%%/revelation/util.pyo
+%%PYTHON_SITELIBDIR%%/revelation/authmanager.so
 @dirrm %%PYTHON_SITELIBDIR%%/revelation
-@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2>/dev/null || true
-@unexec rmdir %D/%%PYTHON_LIBDIR%% 2>/dev/null || true
 share/gnome/applications/revelation.desktop
-share/gnome/pixmaps/revelation.png
-share/gnome/revelation/pixmaps/account-creditcard.png
-share/gnome/revelation/pixmaps/account-cryptokey.png
-share/gnome/revelation/pixmaps/account-database.png
-share/gnome/revelation/pixmaps/account-door.png
-share/gnome/revelation/pixmaps/account-email.png
-share/gnome/revelation/pixmaps/account-ftp.png
-share/gnome/revelation/pixmaps/account-generic.png
-share/gnome/revelation/pixmaps/account-phone.png
-share/gnome/revelation/pixmaps/account-shell.png
-share/gnome/revelation/pixmaps/account-website.png
-share/gnome/revelation/pixmaps/folder.png
-share/gnome/revelation/pixmaps/folder-open.png
-share/gnome/revelation/pixmaps/password.png
-share/gnome/revelation/pixmaps/revelation.png
-share/gnome/revelation/pixmaps/revelation-16x16.png
-@dirrm share/gnome/revelation/pixmaps
+share/mime/packages/revelation.xml
+@exec update-desktop-database > /dev/null || /usr/bin/true
+@unexec update-desktop-database > /dev/null || /usr/bin/true
+share/icons/hicolor/16x16/apps/revelation.png
+share/icons/hicolor/24x24/apps/revelation.png
+share/icons/hicolor/32x32/apps/revelation.png
+share/icons/hicolor/48x48/apps/revelation.png
+share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-revelation.png
+@exec update-mime-database %D/share/mime
+@unexec update-mime-database %D/share/mime
+share/gnome/revelation/ui/actions.xml
+share/gnome/revelation/ui/menubar.xml
+share/gnome/revelation/ui/popup-tree.xml
+share/gnome/revelation/ui/toolbar.xml
+@dirrm share/gnome/revelation/ui
 @dirrm share/gnome/revelation