3 files changed, 16 insertions, 89 deletions

diff --git a/security/kedpm/Makefile b/security/kedpm/Makefile
index 1a83d78ee036..9446afd25477 100644
--- a/security/kedpm/Makefile
+++ b/security/kedpm/Makefile
@@ -7,21 +7,20 @@ PORTREVISION=	8
 CATEGORIES=	security
 MASTER_SITES=	SF
 
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple application for managing personal data
 
-RUN_DEPENDS=	${PYTHONPREFIX_SITELIBDIR}/Crypto/__init__.py:${PORTSDIR}/security/py-pycrypto
+LICENSE=	GPLv2 # (or later)
 
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:${PORTSDIR}/security/py-pycrypto
+
+NO_ARCH=	yes
+
+USES=		python
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
-USE_PYDISTUTILS=	YES
+USE_PYTHON=	autoplist distutils
 
-DESKTOP_ENTRIES="Ked Password Manager" \
-		"Secure Password Management" \
-		"${PREFIX}/share/${PORTNAME}/glade/logo.png" \
-		"kedpm" \
-		"" \
-		true
+DESKTOP_ENTRIES="Ked Password Manager" "Secure Password Management" \
+		"${DATADIR}/glade/logo.png" "kedpm" "" true
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/security/kedpm/pkg-descr b/security/kedpm/pkg-descr
index b4da29aa8e35..89752c7eedc4 100644
--- a/security/kedpm/pkg-descr
+++ b/security/kedpm/pkg-descr
@@ -1,9 +1,10 @@
 Password Manager helps to manage large numbers of passwords and related
-information and simplifies the tasks of searching and entering password data.
+information and simplifies the tasks of searching and entering password
+data.
 
-KedPM is written as an extensible framework, which allows users to plug in 
-custom password database back-ends and custom user interface front-ends.
-Currently, only the Figaro PM back-end supported. To control KedPM user can
-choose between CLI and GTK2 based GUI front-ends.
+KedPM is written as an extensible framework, which allows users to plug
+in custom password database back-ends and custom user interface
+front-ends. Currently, only the Figaro PM back-end supported. To control
+KedPM user can choose between CLI and GTK2 based GUI front-ends.
 
 WWW: http://kedpm.sourceforge.net
diff --git a/security/kedpm/pkg-plist b/security/kedpm/pkg-plist
deleted file mode 100644
index b4c86a251ae2..000000000000
--- a/security/kedpm/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-bin/kedpm
-%%PYTHON_SITELIBDIR%%/kedpm/__init__.py
-%%PYTHON_SITELIBDIR%%/kedpm/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/config.py
-%%PYTHON_SITELIBDIR%%/kedpm/config.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/config.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/crypt.py
-%%PYTHON_SITELIBDIR%%/kedpm/crypt.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/crypt.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/exceptions.py
-%%PYTHON_SITELIBDIR%%/kedpm/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/__init__.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/cli.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/cli.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/cli.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/frontend.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/frontend.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/frontend.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/__init__.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/app.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/app.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/app.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/base.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/base.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/base.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/dialogs.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/dialogs.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/dialogs.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/globals.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/globals.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/globals.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/preferences.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/preferences.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/preferences.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/wnd_main.py
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/wnd_main.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk/wnd_main.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/parser.py
-%%PYTHON_SITELIBDIR%%/kedpm/parser.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/parser.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/passdb.py
-%%PYTHON_SITELIBDIR%%/kedpm/passdb.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/passdb.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/password.py
-%%PYTHON_SITELIBDIR%%/kedpm/password.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/password.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/password_tree.py
-%%PYTHON_SITELIBDIR%%/kedpm/password_tree.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/password_tree.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/pdb_figaro.py
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/pdb_figaro.pyc
-%%PYTHON_SITELIBDIR%%/kedpm/plugins/pdb_figaro.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/kedpm/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/kedpm/frontends/gtk
-@dirrm %%PYTHON_SITELIBDIR%%/kedpm/frontends
-@dirrm %%PYTHON_SITELIBDIR%%/kedpm
-share/kedpm/AUTHORS
-share/kedpm/COPYING
-share/kedpm/INSTALL
-share/kedpm/glade/cloud16.png
-share/kedpm/glade/kedpm.glade
-share/kedpm/glade/logo.png
-@dirrm share/kedpm/glade
-@dirrm share/kedpm