3 files changed, 90 insertions, 8 deletions

diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index d29f07f4ebe7..451767dcc54c 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	griffith
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	deskutils
-MASTER_SITES=	CENKES BERLIOS
+MASTER_SITES=	BERLIOS
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight film collection manager
@@ -18,7 +17,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py
 		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml \
-		py*-sqlalchemy>=0.3.3:${PORTSDIR}/databases/py-sqlalchemy
+		${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:${PORTSDIR}/textproc/py-chardet \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.4.8:${PORTSDIR}/databases/py-sqlalchemy
 
 USE_GETTEXT=	yes
 USE_PYTHON=	yes
@@ -32,6 +32,6 @@ post-patch:
 	@${FIND} ${WRKSRC}/ -name Makefile |\
 		${XARGS} ${REINPLACE_CMD} -e '/^PREFIX/d' -e '/^MANDIR/s|=.*|=${MANPREFIX}/man|'
 	@${REINPLACE_CMD} -e '/^LANGUAGES=/s|find.*|cd i18n/\&\&ls -d *)|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|/usr/share/fonts|${LOCALBASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME}
+#	@${REINPLACE_CMD} -e 's|/usr/share/fonts|${LOCALBASE}/lib/X11/fonts|' ${WRKSRC}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/deskutils/griffith/distinfo b/deskutils/griffith/distinfo
index 8930aedd7b67..21d21a9e02f5 100644
--- a/deskutils/griffith/distinfo
+++ b/deskutils/griffith/distinfo
@@ -1,3 +1,3 @@
-MD5 (griffith-0.9.5.tar.gz) = 212e63425aac0da3b962d4ae06b21a54
-SHA256 (griffith-0.9.5.tar.gz) = 3cf4a199ed945137fec08902a4e7e1415b787ce9a5fff163210ee4385fdedaed
-SIZE (griffith-0.9.5.tar.gz) = 886950
+MD5 (griffith-0.9.9.tar.gz) = dc50a8ea9fe0681385cf5e8be6f7a0e2
+SHA256 (griffith-0.9.9.tar.gz) = 8dc2e998b2620b53204437ec9682ea5024bc4c9a764bb35857e6ae0eced96a3f
+SIZE (griffith-0.9.9.tar.gz) = 1451376
diff --git a/deskutils/griffith/pkg-plist b/deskutils/griffith/pkg-plist
index 8f8f155dbb2b..419774e92a21 100644
--- a/deskutils/griffith/pkg-plist
+++ b/deskutils/griffith/pkg-plist
@@ -89,6 +89,7 @@ share/applications/griffith.desktop
 %%DATADIR%%/lib/plugins/imp/__init__.py
 %%DATADIR%%/lib/plugins/movie/PluginMovie7arte.py
 %%DATADIR%%/lib/plugins/movie/PluginMovieAllocine.py
+%%DATADIR%%/lib/plugins/movie/PluginMovieAmazon.py
 %%DATADIR%%/lib/plugins/movie/PluginMovieAniDB.py
 %%DATADIR%%/lib/plugins/movie/PluginMovieCSFD.py
 %%DATADIR%%/lib/plugins/movie/PluginMovieCineMovies.py
@@ -121,31 +122,106 @@ share/applications/griffith.desktop
 %%DATADIR%%/lib/preferences.py
 %%DATADIR%%/lib/quick_filter.py
 %%DATADIR%%/lib/sql.py
+%%DATADIR%%/lib/test_movieplugins.py
 %%DATADIR%%/lib/update.py
 %%DATADIR%%/lib/version.py
 %%DATADIR%%/lib/view.py
 %%DATADIR%%/lib/widgets.py
+%%DATADIR%%/lib/sqlalchemy/databases
+%%DATADIR%%/lib/sqlalchemy/databases/__init__.py
+%%DATADIR%%/lib/sqlalchemy/databases/firebird.py
+%%DATADIR%%/lib/sqlalchemy/databases/information_schema.py
+%%DATADIR%%/lib/sqlalchemy/databases/informix.py
+%%DATADIR%%/lib/sqlalchemy/databases/mssql.py
+%%DATADIR%%/lib/sqlalchemy/databases/mysql.py
+%%DATADIR%%/lib/sqlalchemy/databases/oracle.py
+%%DATADIR%%/lib/sqlalchemy/databases/postgres.py
+%%DATADIR%%/lib/sqlalchemy/databases/sqlite.py
+%%DATADIR%%/lib/sqlalchemy/engine
+%%DATADIR%%/lib/sqlalchemy/engine/__init__.py
+%%DATADIR%%/lib/sqlalchemy/engine/base.py
+%%DATADIR%%/lib/sqlalchemy/engine/default.py
+%%DATADIR%%/lib/sqlalchemy/engine/strategies.py
+%%DATADIR%%/lib/sqlalchemy/engine/threadlocal.py
+%%DATADIR%%/lib/sqlalchemy/engine/url.py
+%%DATADIR%%/lib/sqlalchemy/ext
+%%DATADIR%%/lib/sqlalchemy/ext/__init__.py
+%%DATADIR%%/lib/sqlalchemy/ext/activemapper.py
+%%DATADIR%%/lib/sqlalchemy/ext/assignmapper.py
+%%DATADIR%%/lib/sqlalchemy/ext/associationproxy.py
+%%DATADIR%%/lib/sqlalchemy/ext/orderinglist.py
+%%DATADIR%%/lib/sqlalchemy/ext/proxy.py
+%%DATADIR%%/lib/sqlalchemy/ext/selectresults.py
+%%DATADIR%%/lib/sqlalchemy/ext/sessioncontext.py
+%%DATADIR%%/lib/sqlalchemy/ext/sqlsoup.py
+%%DATADIR%%/lib/sqlalchemy/mods
+%%DATADIR%%/lib/sqlalchemy/mods/__init__.py
+%%DATADIR%%/lib/sqlalchemy/mods/legacy_session.py
+%%DATADIR%%/lib/sqlalchemy/mods/selectresults.py
+%%DATADIR%%/lib/sqlalchemy/mods/threadlocal.py
+%%DATADIR%%/lib/sqlalchemy/orm
+%%DATADIR%%/lib/sqlalchemy/orm/__init__.py
+%%DATADIR%%/lib/sqlalchemy/orm/attributes.py
+%%DATADIR%%/lib/sqlalchemy/orm/dependency.py
+%%DATADIR%%/lib/sqlalchemy/orm/interfaces.py
+%%DATADIR%%/lib/sqlalchemy/orm/mapper.py
+%%DATADIR%%/lib/sqlalchemy/orm/properties.py
+%%DATADIR%%/lib/sqlalchemy/orm/query.py
+%%DATADIR%%/lib/sqlalchemy/orm/session.py
+%%DATADIR%%/lib/sqlalchemy/orm/strategies.py
+%%DATADIR%%/lib/sqlalchemy/orm/sync.py
+%%DATADIR%%/lib/sqlalchemy/orm/unitofwork.py
+%%DATADIR%%/lib/sqlalchemy/orm/uowdumper.py
+%%DATADIR%%/lib/sqlalchemy/orm/util.py
+%%DATADIR%%/lib/sqlalchemy/__init__.py
+%%DATADIR%%/lib/sqlalchemy/ansisql.py
+%%DATADIR%%/lib/sqlalchemy/exceptions.py
+%%DATADIR%%/lib/sqlalchemy/logging.py
+%%DATADIR%%/lib/sqlalchemy/pool.py
+%%DATADIR%%/lib/sqlalchemy/queue.py
+%%DATADIR%%/lib/sqlalchemy/schema.py
+%%DATADIR%%/lib/sqlalchemy/sql.py
+%%DATADIR%%/lib/sqlalchemy/sql_util.py
+%%DATADIR%%/lib/sqlalchemy/topological.py
+%%DATADIR%%/lib/sqlalchemy/types.py
+%%DATADIR%%/lib/sqlalchemy/util.py
 share/locale/bg/LC_MESSAGES/griffith.mo
 share/locale/ca/LC_MESSAGES/griffith.mo
 share/locale/cs/LC_MESSAGES/griffith.mo
 share/locale/da/LC_MESSAGES/griffith.mo
 share/locale/de/LC_MESSAGES/griffith.mo
 share/locale/el/LC_MESSAGES/griffith.mo
+share/locale/en_GB/LC_MESSAGES/griffith.mo
 share/locale/es/LC_MESSAGES/griffith.mo
+share/locale/et/LC_MESSAGES/griffith.mo
+share/locale/fa/LC_MESSAGES/griffith.mo
+share/locale/fi/LC_MESSAGES/griffith.mo
 share/locale/fr/LC_MESSAGES/griffith.mo
+share/locale/hu/LC_MESSAGES/griffith.mo
+share/locale/id/LC_MESSAGES/griffith.mo
 share/locale/it/LC_MESSAGES/griffith.mo
 share/locale/ja/LC_MESSAGES/griffith.mo
+share/locale/ko/LC_MESSAGES/griffith.mo
+share/locale/lv/LC_MESSAGES/griffith.mo
 share/locale/nb/LC_MESSAGES/griffith.mo
+share/locale/nds/LC_MESSAGES/griffith.mo
 share/locale/nl/LC_MESSAGES/griffith.mo
+share/locale/oc/LC_MESSAGES/griffith.mo
 share/locale/pl/LC_MESSAGES/griffith.mo
+share/locale/ps/LC_MESSAGES/griffith.mo
 share/locale/pt/LC_MESSAGES/griffith.mo
 share/locale/pt_BR/LC_MESSAGES/griffith.mo
 share/locale/ru/LC_MESSAGES/griffith.mo
+share/locale/sk/LC_MESSAGES/griffith.mo
+share/locale/sr/LC_MESSAGES/griffith.mo
 share/locale/sv/LC_MESSAGES/griffith.mo
 share/locale/tr/LC_MESSAGES/griffith.mo
+share/locale/uk/LC_MESSAGES/griffith.mo
 share/locale/zh_CN/LC_MESSAGES/griffith.mo
 share/pixmaps/griffith.png
 share/pixmaps/griffith.xpm
+@dirrm share/locale/nds/LC_MESSAGES
+@dirrm share/locale/nds
 @dirrm %%DATADIR%%/export_templates/csv
 @dirrm %%DATADIR%%/export_templates/html_table
 @dirrm %%DATADIR%%/export_templates/html_tables
@@ -158,5 +234,11 @@ share/pixmaps/griffith.xpm
 @dirrm %%DATADIR%%/lib/plugins/imp
 @dirrm %%DATADIR%%/lib/plugins/movie
 @dirrm %%DATADIR%%/lib/plugins
+@dirrm %%DATADIR%%/lib/sqlalchemy/databases
+@dirrm %%DATADIR%%/lib/sqlalchemy/engine
+@dirrm %%DATADIR%%/lib/sqlalchemy/ext
+@dirrm %%DATADIR%%/lib/sqlalchemy/mods
+@dirrm %%DATADIR%%/lib/sqlalchemy/orm
+@dirrm %%DATADIR%%/lib/sqlalchemy
 @dirrm %%DATADIR%%/lib
 @dirrm %%DATADIR%%