5 files changed, 187 insertions, 119 deletions

diff --git a/security/revelation/Makefile b/security/revelation/Makefile
index 87f992f30658..eec6c0a8e3b9 100644
--- a/security/revelation/Makefile
+++ b/security/revelation/Makefile
@@ -1,43 +1,74 @@
-# New ports collection makefile for:	Revelation
-# Date created:				2004-08-10
-# Whom:					ports@c0decafe.net
-#
+# Created by: ports@c0decafe.net
 # $FreeBSD$
-#
 
 PORTNAME=	revelation
-PORTVERSION=	0.4.11
-PORTREVISION=	11
+PORTVERSION=	0.4.14
 CATEGORIES=	security gnome
-MASTER_SITES=	ftp://oss.codepoet.no/revelation/
+MASTER_SITES=	http://cdn.bitbucket.org/erikg/revelation/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Password manager for the GNOME 2 desktop
 
+LICENSE=	GPLv2
+
+FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/security/cracklib:patch
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
 LIB_DEPENDS=	crack:${PORTSDIR}/security/cracklib
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
+RUN_DEPENDS:=	${BULID_DEPENDS}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+OPTIONS_DEFINE=	APPLET
+APPLET_DESC=	Build with applet
 
 USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_GNOME=	pygnome2 pygnomeextras gnomeprefix gnomehack desktopfileutils \
-		pygnomedesktop
+USE_GNOME=	desktopfileutils gnomehack gnomeprefix pygnome2
 USE_PYTHON=	yes
-GCONF_SCHEMAS=	revelation.schemas revelation-applet.schemas
-INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
-USE_DISPLAY=	yes
+USE_PKGCONFIG=	build
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
+
+GCONF_SCHEMAS=	revelation.schemas
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+DICTPATH=	${LOCALBASE}/libdata/cracklib/pw_dict
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MAPPLET}
+USE_GNOME+=	pygnomedesktop pygnomeextras
+CONFIGURE_ARGS+=	--with-applet
+GCONF_SCHEMAS+=	revelation-applet.schemas
+PLIST_SUB+=	APPLET=""
+.else
+PLIST_SUB+=	APPLET="@comment "
+.endif
+
+.include <bsd.port.pre.mk>
+
+CRACK_WRKSRC=	$$(cd ${PORTSDIR}/security/cracklib && ${MAKE} -V WRKSRC)	
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|\(rvl_py_version=\)".*$$|\1""|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|\(-Wl\)|$$(LDFLAGS) \1|' \
-		${WRKSRC}/src/wrap/crack/Makefile.in
-	@${REINPLACE_CMD} -e 's|#include <crack.h>||' \
-		${WRKSRC}/src/wrap/crack/crack.c.in
-
-.include <bsd.port.mk>
+	@${REINPLACE_CMD} -e \
+		's|^#!.*|#!${SETENV} python|' ${WRKSRC}/src/revelation.py
+	@${REINPLACE_CMD} -e \
+		'/FascistCheck/s|(password)|(password, "${DICTPATH}")|' \
+		${WRKSRC}/src/lib/util.py
+
+post-build:
+	@(cd ${CRACK_WRKSRC}/python && ${CC} -shared -fPIC \
+		-I${PYTHON_INCLUDEDIR} -I${LOCALBASE}/include ${CFLAGS} \
+		-o _cracklib.so _cracklib.c -L${LOCALBASE}/lib -lcrack -lz)
+	@${PYTHON_CMD} -m compileall ${CRACK_WRKSRC}/python
+	@${PYTHON_CMD} -O -m compileall ${CRACK_WRKSRC}/python
+
+post-install:
+	(cd ${CRACK_WRKSRC}/python && ${INSTALL_DATA} \
+		_cracklib.so cracklib.py* \
+		${PYTHONPREFIX_SITELIBDIR}/revelation)
+
+.include <bsd.port.post.mk>
diff --git a/security/revelation/distinfo b/security/revelation/distinfo
index 8787f8d931d5..c15abfc8062c 100644
--- a/security/revelation/distinfo
+++ b/security/revelation/distinfo
@@ -1,2 +1,4 @@
-SHA256 (revelation-0.4.11.tar.bz2) = 82c321ed75dbb6f6e36afd3275598cae3d880fab60c7a0ec6ead08184635efeb
-SIZE (revelation-0.4.11.tar.bz2) = 639842
+SHA256 (revelation-0.4.14.tar.bz2) = 2ab3d1d8bcc2f441feb58122ee6a0fe4070412228194843a180a7b1c9e910019
+SIZE (revelation-0.4.14.tar.bz2) = 371375
+SHA256 (cracklib-2.8.22.tar.gz) = feaff49bfb513ec10b2618c00d2f7f60776ba93fcc5fa22dd3479dd9cad9f770
+SIZE (cracklib-2.8.22.tar.gz) = 631796
diff --git a/security/revelation/files/patch-configure b/security/revelation/files/patch-configure
new file mode 100644
index 000000000000..6627a6337534
--- /dev/null
+++ b/security/revelation/files/patch-configure
@@ -0,0 +1,35 @@
+--- configure.orig	2012-11-12 17:38:33.000000000 +0900
++++ configure	2012-11-12 17:39:23.000000000 +0900
+@@ -3095,7 +3095,7 @@
+ 	if test -z "$PYTHON_INCLUDE" ; then
+ 		PYTHON_INCLUDE=$PYTHON
+ 		rvl_py_include_path=`echo $PYTHON_INCLUDE | sed -e "s/bin/include/"`
+-		rvl_py_version="`$PYTHON -c "import sys; print sys.version[0:3]"`";
++		rvl_py_version=""
+ 		PYTHON_INCLUDE="$rvl_py_include_path$rvl_py_version"
+ 	fi
+ 
+@@ -6501,23 +6501,6 @@
+ 	fi
+ 
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking python module cracklib" >&5
+-$as_echo_n "checking python module cracklib... " >&6; }
+-
+-	$PYTHON -c "import imp; imp.find_module('cracklib')" 2>/dev/null
+-
+-	if test $? -eq 0; then
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-		eval HAVE_PYMOD_CRACKLIB=yes
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-		as_fn_error $? "failed to find module cracklib" "$LINENO" 5
+-		exit 1
+-	fi
+-
+-
+ 
+ 
+ # Check whether --with-applet was given.
diff --git a/security/revelation/pkg-descr b/security/revelation/pkg-descr
index 7dbec8391629..7d9d34ed9013 100644
--- a/security/revelation/pkg-descr
+++ b/security/revelation/pkg-descr
@@ -1,24 +1,8 @@
-Revelation is a password manager for the GNOME 2 desktop, released under the
-GNU GPL license. It stores all your accounts and passwords in a single, secure
-place, and gives you access to it through a user-friendly graphical interface.
-
-Features:
-* Secure storage of passwords - uses an AES-encrypted XML data file with
-  Cipher Block Chaining and compression for randomization.
-* Uses a tree-structure for organizing accounts, making it easy to handle
-  a large number of accounts.
-* Support for importing data from / exporting data to foreign file formats.
-  Currently supported: Figaro's Password Manager, GNOME Password Manager
-  (gpass), .netrc, XML
-* Has many different account types, covering the most common ones: creditcard,
-  crypto key, database, door lock, email, ftp, generic, phone, shell, and
-  website
-* Unlimited undo/redo
-* Cut/copy/paste support
-* Account search
-* Built-in password generator
-* GConf-integrated configuration system
-* User-friendly, HIG-compliant user interface.
+Revelation is a password manager for the GNOME 2 desktop, released
+under the GNU GPL license. It stores accounts and passwords in a single,
+secure place, and gives access to them through a user-friendly graphical
+interface.
 
 Author:	Erik Grinaker <erikg-at-codepoet.no>
-WWW:	http://oss.codepoet.no/revelation/
+	Mikel Olasagasti Uranga <mikel@olasagasti.info>
+WWW:	http://revelation.olasagasti.info/
diff --git a/security/revelation/pkg-plist b/security/revelation/pkg-plist
index 19de610e3d51..9e2cce67d06c 100644
--- a/security/revelation/pkg-plist
+++ b/security/revelation/pkg-plist
@@ -1,102 +1,118 @@
 bin/revelation
-%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/revelation/_cracklib.so
+%%PYTHON_SITELIBDIR%%/revelation/PBKDF2.py
+%%PYTHON_SITELIBDIR%%/revelation/PBKDF2.pyc
+%%PYTHON_SITELIBDIR%%/revelation/PBKDF2.pyo
+%%PYTHON_SITELIBDIR%%/revelation/__init__.py
+%%PYTHON_SITELIBDIR%%/revelation/__init__.pyc
+%%PYTHON_SITELIBDIR%%/revelation/__init__.pyo
 %%PYTHON_SITELIBDIR%%/revelation/bundle/AfSplitter.py
-%%PYTHON_SITELIBDIR%%/revelation/bundle/PBKDFv2.py
-%%PYTHON_SITELIBDIR%%/revelation/bundle/luks.py
-%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.pyc
 %%PYTHON_SITELIBDIR%%/revelation/bundle/AfSplitter.pyc
-%%PYTHON_SITELIBDIR%%/revelation/bundle/PBKDFv2.pyc
-%%PYTHON_SITELIBDIR%%/revelation/bundle/luks.pyc
-%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.pyo
 %%PYTHON_SITELIBDIR%%/revelation/bundle/AfSplitter.pyo
+%%PYTHON_SITELIBDIR%%/revelation/bundle/PBKDFv2.py
+%%PYTHON_SITELIBDIR%%/revelation/bundle/PBKDFv2.pyc
 %%PYTHON_SITELIBDIR%%/revelation/bundle/PBKDFv2.pyo
+%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.py
+%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.pyc
+%%PYTHON_SITELIBDIR%%/revelation/bundle/__init__.pyo
+%%PYTHON_SITELIBDIR%%/revelation/bundle/luks.py
+%%PYTHON_SITELIBDIR%%/revelation/bundle/luks.pyc
 %%PYTHON_SITELIBDIR%%/revelation/bundle/luks.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/revelation/bundle
+%%PYTHON_SITELIBDIR%%/revelation/config.py
+%%PYTHON_SITELIBDIR%%/revelation/config.pyc
+%%PYTHON_SITELIBDIR%%/revelation/config.pyo
+%%PYTHON_SITELIBDIR%%/revelation/cracklib.py
+%%PYTHON_SITELIBDIR%%/revelation/cracklib.pyc
+%%PYTHON_SITELIBDIR%%/revelation/cracklib.pyo
+%%PYTHON_SITELIBDIR%%/revelation/data.py
+%%PYTHON_SITELIBDIR%%/revelation/data.pyc
+%%PYTHON_SITELIBDIR%%/revelation/data.pyo
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/__init__.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/base.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/pwsafe.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.py
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/splashid.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/fpm.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/pwsafe.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/splashid.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.pyc
-%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/__init__.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/base.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/base.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/base.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/csvfile.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/csvfile.pyc
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/csvfile.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/fpm.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/gpass.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/netrc.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/pwsafe.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/pwsafe.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/pwsafe.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/rvl.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/splashid.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/splashid.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/splashid.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/text.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/text.pyo
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.py
+%%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyc
 %%PYTHON_SITELIBDIR%%/revelation/datahandler/xhtml.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/revelation/datahandler
-%%PYTHON_SITELIBDIR%%/revelation/__init__.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/data.pyc
 %%PYTHON_SITELIBDIR%%/revelation/dialog.pyc
-%%PYTHON_SITELIBDIR%%/revelation/entry.pyc
-%%PYTHON_SITELIBDIR%%/revelation/io.pyc
-%%PYTHON_SITELIBDIR%%/revelation/ui.pyc
-%%PYTHON_SITELIBDIR%%/revelation/util.pyc
-%%PYTHON_SITELIBDIR%%/revelation/__init__.pyo
-%%PYTHON_SITELIBDIR%%/revelation/data.pyo
 %%PYTHON_SITELIBDIR%%/revelation/dialog.pyo
+%%PYTHON_SITELIBDIR%%/revelation/entry.py
+%%PYTHON_SITELIBDIR%%/revelation/entry.pyc
 %%PYTHON_SITELIBDIR%%/revelation/entry.pyo
+%%PYTHON_SITELIBDIR%%/revelation/io.py
+%%PYTHON_SITELIBDIR%%/revelation/io.pyc
 %%PYTHON_SITELIBDIR%%/revelation/io.pyo
+%%PYTHON_SITELIBDIR%%/revelation/ui.py
+%%PYTHON_SITELIBDIR%%/revelation/ui.pyc
 %%PYTHON_SITELIBDIR%%/revelation/ui.pyo
+%%PYTHON_SITELIBDIR%%/revelation/util.py
+%%PYTHON_SITELIBDIR%%/revelation/util.pyc
 %%PYTHON_SITELIBDIR%%/revelation/util.pyo
-%%PYTHON_SITELIBDIR%%/revelation/config.py
-%%PYTHON_SITELIBDIR%%/revelation/config.pyc
-%%PYTHON_SITELIBDIR%%/revelation/config.pyo
-%%PYTHON_SITELIBDIR%%/revelation/crack.so
-@dirrm %%PYTHON_SITELIBDIR%%/revelation
-libdata/bonobo/servers/GNOME_RevelationApplet.server
-libexec/revelation-applet
-share/locale/de/LC_MESSAGES/revelation.mo
-share/locale/fr/LC_MESSAGES/revelation.mo
-share/locale/sv/LC_MESSAGES/revelation.mo
-share/locale/zh/LC_MESSAGES/revelation.mo
-share/locale/cs/LC_MESSAGES/revelation.mo
+%%APPLET%%libdata/bonobo/servers/GNOME_RevelationApplet.server
+%%APPLET%%libexec/revelation-applet
 share/applications/revelation.desktop
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-share/revelation/ui/menubar.xml
-share/revelation/ui/popup-tree.xml
-share/revelation/ui/toolbar.xml
-@dirrm share/revelation/ui
-share/revelation/pwdict.hwm
-share/revelation/pwdict.pwd
-share/revelation/pwdict.pwi
-@dirrm share/revelation
 share/icons/hicolor/16x16/apps/revelation.png
-share/icons/hicolor/24x24/apps/revelation.png
 share/icons/hicolor/24x24/apps/revelation-locked.png
-share/icons/hicolor/32x32/apps/revelation.png
+share/icons/hicolor/24x24/apps/revelation.png
+share/icons/hicolor/256x256/apps/revelation.png
 share/icons/hicolor/32x32/apps/revelation-locked.png
-share/icons/hicolor/48x48/apps/revelation.png
+share/icons/hicolor/32x32/apps/revelation.png
 share/icons/hicolor/48x48/apps/revelation-locked.png
+share/icons/hicolor/48x48/apps/revelation.png
 share/icons/hicolor/48x48/mimetypes/gnome-mime-application-x-revelation.png
+share/icons/hicolor/scalable/apps/revelation.svg
+share/locale/ca/LC_MESSAGES/revelation.mo
+share/locale/cs/LC_MESSAGES/revelation.mo
+share/locale/de/LC_MESSAGES/revelation.mo
+share/locale/es/LC_MESSAGES/revelation.mo
+share/locale/et/LC_MESSAGES/revelation.mo
+share/locale/eu/LC_MESSAGES/revelation.mo
+share/locale/fi/LC_MESSAGES/revelation.mo
+share/locale/fr/LC_MESSAGES/revelation.mo
+share/locale/lt/LC_MESSAGES/revelation.mo
+share/locale/nl/LC_MESSAGES/revelation.mo
+share/locale/pt_BR/LC_MESSAGES/revelation.mo
+share/locale/ru/LC_MESSAGES/revelation.mo
+share/locale/sv/LC_MESSAGES/revelation.mo
+share/locale/zh/LC_MESSAGES/revelation.mo
 share/mime/packages/revelation.xml
-share/mime/application/x-revelation.xml
+%%DATADIR%%/ui/menubar.xml
+%%DATADIR%%/ui/popup-tree.xml
+%%DATADIR%%/ui/toolbar.xml
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@dirrm %%PYTHON_SITELIBDIR%%/revelation/datahandler
+@dirrm %%PYTHON_SITELIBDIR%%/revelation/bundle
+@dirrm %%PYTHON_SITELIBDIR%%/revelation
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
-@dirrmtry share/applications