3 files changed, 44 insertions, 33 deletions

diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 1a580d84ee75..9d99129cd71e 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gourmet
-PORTVERSION=	0.9.1
+PORTVERSION=	0.10.2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	grecipe-manager
@@ -14,20 +14,14 @@ MASTER_SITE_SUBDIR=	grecipe-manager
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	GNOME recipe manager
 
-RUN_DEPENDS=	${LOCALBASE}/lib/libmk4py.so:${PORTSDIR}/databases/metakit \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pysqlite2/__init__.py:${PORTSDIR}/databases/py-pysqlite21 \
+		${PYTHON_SITELIBDIR}/PyRTF/__init__.py:${PORTSDIR}/print/py-rtf \
 		${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging
 
-BROKEN=		Incomplete pkg-plist
-
 USE_X_PREFIX=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
 USE_GNOME=	pygnome2
 
-post-install:
-.if exists(${PYTHON_SITELIBDIR}/metakit.pyc)
-	@${CHMOD} 0555 ${PYTHON_SITELIBDIR}/metakit.pyc
-.endif
-
 .include <bsd.port.mk>
diff --git a/deskutils/gourmet/distinfo b/deskutils/gourmet/distinfo
index f12bef8d9f40..1e5158965f35 100644
--- a/deskutils/gourmet/distinfo
+++ b/deskutils/gourmet/distinfo
@@ -1,3 +1,3 @@
-MD5 (gourmet-0.9.1.tar.gz) = fcba9f14a1d1badcfacea6d70a5f442b
-SHA256 (gourmet-0.9.1.tar.gz) = ee2058fa6f75cc747918120920edc1f83b025441f12693c185a81dffa4793629
-SIZE (gourmet-0.9.1.tar.gz) = 1525801
+MD5 (gourmet-0.10.2.tar.gz) = 3dd627b265b3d915b0372ea5a242e56e
+SHA256 (gourmet-0.10.2.tar.gz) = b451013bfaa596edd5fd451d279fe91b6e06aac28a8add6d0f85bc47daf3c097
+SIZE (gourmet-0.10.2.tar.gz) = 1971267
diff --git a/deskutils/gourmet/pkg-plist b/deskutils/gourmet/pkg-plist
index 149838ba48db..de22f0399589 100644
--- a/deskutils/gourmet/pkg-plist
+++ b/deskutils/gourmet/pkg-plist
@@ -17,6 +17,9 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.py
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/ImageExtras.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/LinkedTextView.py
+%%PYTHON_SITELIBDIR%%/gourmet/LinkedTextView.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/LinkedTextView.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.py
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/OptionParser.pyo
@@ -38,33 +41,21 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/DatabaseChooser.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/DatabaseChooser.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/DatabaseChooser.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/PythonicSQL.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/PythonicSQL.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/PythonicSQL.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/backends/__init__.py
 %%PYTHON_SITELIBDIR%%/gourmet/backends/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/backends/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_mysql.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_mysql.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_mysql.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_sqlite.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_sqlite.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/pythonic_sqlite.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rdatabase.py
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rdatabase.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rdatabase.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rmetakit.py
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rmetakit.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/backends/rmetakit.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rmysql.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rmysql.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rmysql.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rsqlite.py
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rsqlite.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/backends/rsqlite.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sql_db.py
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sql_db.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sql_db.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sqlite_db.py
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sqlite_db.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/backends/sqlite_db.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/cb_extras.py
 %%PYTHON_SITELIBDIR%%/gourmet/cb_extras.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/cb_extras.pyo
@@ -194,9 +185,6 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/allrecipes.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/allrecipes.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/allrecipes.pyo
-%%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/eating_well.py
-%%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/eating_well.pyc
-%%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/eating_well.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/epicurious.py
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/epicurious.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/importers/html_plugins/epicurious.pyo
@@ -323,6 +311,9 @@ bin/gourmet
 %%PYTHON_SITELIBDIR%%/gourmet/treeview_extras.py
 %%PYTHON_SITELIBDIR%%/gourmet/treeview_extras.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/treeview_extras.pyo
+%%PYTHON_SITELIBDIR%%/gourmet/upgradeHandler.py
+%%PYTHON_SITELIBDIR%%/gourmet/upgradeHandler.pyc
+%%PYTHON_SITELIBDIR%%/gourmet/upgradeHandler.pyo
 %%PYTHON_SITELIBDIR%%/gourmet/validatingEntry.py
 %%PYTHON_SITELIBDIR%%/gourmet/validatingEntry.pyc
 %%PYTHON_SITELIBDIR%%/gourmet/validatingEntry.pyo
@@ -332,6 +323,7 @@ bin/gourmet
 share/applications/gourmet.desktop
 %%DATADIR%%/ABBREV.txt
 %%DATADIR%%/FAQ
+%%DATADIR%%/FOOD_DES.txt
 %%DATADIR%%/WEIGHT.txt
 %%DATADIR%%/app.glade
 %%DATADIR%%/converter.glade
@@ -343,6 +335,7 @@ share/applications/gourmet.desktop
 %%DATADIR%%/half_gold_star.png
 %%DATADIR%%/no_star.png
 %%DATADIR%%/keyeditor.glade
+%%DATADIR%%/nutritionDruid.glade
 %%DATADIR%%/preferenceDialog.glade
 %%DATADIR%%/rec_ref_window.glade
 %%DATADIR%%/recCard.glade
@@ -351,6 +344,30 @@ share/applications/gourmet.desktop
 %%DATADIR%%/recipe.dtd
 %%DATADIR%%/shopList.glade
 %%DATADIR%%/splash.png
+share/locale/bg/LC_MESSAGES/gourmet.mo
+share/locale/ca/LC_MESSAGES/gourmet.mo
+share/locale/cs/LC_MESSAGES/gourmet.mo
+share/locale/da/LC_MESSAGES/gourmet.mo
+share/locale/de_AT/LC_MESSAGES/gourmet.mo
+share/locale/de_DE/LC_MESSAGES/gourmet.mo
+share/locale/el/LC_MESSAGES/gourmet.mo
+share/locale/es/LC_MESSAGES/gourmet.mo
+share/locale/es_ES/LC_MESSAGES/gourmet.mo
+share/locale/fr/LC_MESSAGES/gourmet.mo
+share/locale/gl/LC_MESSAGES/gourmet.mo
+share/locale/he/LC_MESSAGES/gourmet.mo
+share/locale/it/LC_MESSAGES/gourmet.mo
+share/locale/nb/LC_MESSAGES/gourmet.mo
+share/locale/nl/LC_MESSAGES/gourmet.mo
+share/locale/nl_BE/LC_MESSAGES/gourmet.mo
+share/locale/nl_NL/LC_MESSAGES/gourmet.mo
+share/locale/pl/LC_MESSAGES/gourmet.mo
+share/locale/pt/LC_MESSAGES/gourmet.mo
+share/locale/pt_PT/LC_MESSAGES/gourmet.mo
+share/locale/sk/LC_MESSAGES/gourmet.mo
+share/locale/sv/LC_MESSAGES/gourmet.mo
+share/locale/sv_SE/LC_MESSAGES/gourmet.mo
+share/locale/tr/LC_MESSAGES/gourmet.mo
 share/pixmaps/recbox.png
 @dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gourmet/nutrition