3 files changed, 67 insertions, 63 deletions

diff --git a/misc/pantry/Makefile b/misc/pantry/Makefile
index 7fcdee3d880d..fc56cdea4fd6 100644
--- a/misc/pantry/Makefile
+++ b/misc/pantry/Makefile
@@ -7,17 +7,18 @@
 
 PORTNAME=	pantry
 PORTVERSION=	0.${DISTVERSION}
-DISTVERSION=	11
+DISTVERSION=	15
 CATEGORIES=	misc
 MASTER_SITES=	SF
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Command-line nutrition analysis program
 
+RUN_DEPENDS=	py*-bsddb>=2:${PORTSDIR}/databases/py-bsddb
+
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 MAN1=	${PORTNAME}.1
-PORTDATA=	master
 PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 
 post-extract:
diff --git a/misc/pantry/distinfo b/misc/pantry/distinfo
index 121fb8a0382e..862da9535efe 100644
--- a/misc/pantry/distinfo
+++ b/misc/pantry/distinfo
@@ -1,3 +1,3 @@
-MD5 (pantry-11.tar.gz) = fa200e8041edb3e757464920fe25d81b
-SHA256 (pantry-11.tar.gz) = 559d6324cc67633affe736854c71fdd913282fe0f1239fedf84a2e1f1f43cde5
-SIZE (pantry-11.tar.gz) = 7542778
+MD5 (pantry-15.tar.gz) = 3b81b57d485d32a198af7bc0504e4281
+SHA256 (pantry-15.tar.gz) = d98313d17772491bd7a5f6ae697be9137adb056cd72522e630e8fc599d32d805
+SIZE (pantry-15.tar.gz) = 7523035
diff --git a/misc/pantry/pkg-plist b/misc/pantry/pkg-plist
index d7457367d0fa..36912369d963 100644
--- a/misc/pantry/pkg-plist
+++ b/misc/pantry/pkg-plist
@@ -24,60 +24,63 @@ bin/pantry-addTo
 %%PYTHON_SITELIBDIR%%/pantry/lib/foods.py
 %%PYTHON_SITELIBDIR%%/pantry/lib/foods.pyc
 %%PYTHON_SITELIBDIR%%/pantry/lib/foods.pyo
-%%PYTHON_SITELIBDIR%%/pantry/unicodeHelper.py
-%%PYTHON_SITELIBDIR%%/pantry/unicodeHelper.pyc
-%%PYTHON_SITELIBDIR%%/pantry/unicodeHelper.pyo
-%%PYTHON_SITELIBDIR%%/pantry/version.py
-%%PYTHON_SITELIBDIR%%/pantry/version.pyc
-%%PYTHON_SITELIBDIR%%/pantry/version.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlCheck.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlCheck.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlCheck.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/__init__.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/_outputters.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/_outputters.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/_outputters.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/catalog.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/catalog.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/catalog.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/characters.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/characters.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/characters.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/charconv.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/charconv.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/charconv.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/dtdparser.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/dtdparser.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/dtdparser.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/errors.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/errors.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/errors.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/namespace.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/namespace.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/namespace.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/utils.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/utils.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/utils.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xcatalog.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xcatalog.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xcatalog.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlapp.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlapp.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlapp.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmldtd.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmldtd.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmldtd.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlproc.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlproc.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlproc.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlutils.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlutils.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlutils.pyo
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlval.py
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlval.pyc
-%%PYTHON_SITELIBDIR%%/pantry/xmlproc/xmlval.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/io.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/io.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/io.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/uniconv.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/uniconv.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/uniconv.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/version.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/version.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/version.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlCheck.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlCheck.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlCheck.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/__init__.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/_outputters.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/_outputters.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/_outputters.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/catalog.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/catalog.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/catalog.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/characters.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/characters.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/characters.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/charconv.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/charconv.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/charconv.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/dtdparser.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/dtdparser.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/dtdparser.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/errors.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/errors.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/errors.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/namespace.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/namespace.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/namespace.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/utils.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/utils.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/utils.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xcatalog.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xcatalog.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xcatalog.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlapp.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlapp.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlapp.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmldtd.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmldtd.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmldtd.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlproc.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlproc.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlproc.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlutils.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlutils.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlutils.pyo
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlval.py
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlval.pyc
+%%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc/xmlval.pyo
 %%PORTDOCS%%%%DOCSDIR%%/entities
 %%PORTDOCS%%%%DOCSDIR%%/examples
 %%PORTDOCS%%%%DOCSDIR%%/files
@@ -116,7 +119,6 @@ bin/pantry-addTo
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07.html
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07s02.html
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07s04.html
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01.html
 %%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01s02.html
@@ -129,13 +131,14 @@ bin/pantry-addTo
 %%PORTDOCS%%%%DOCSDIR%%/pantry-user-guide.txt
 %%PORTDOCS%%%%DOCSDIR%%/pantry-user-guide.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/foods.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foods.xml
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pantry.xml
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/pantryrc.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recipes.xml
+%%PORTDATA%%%%DATADIR%%/master
 @dirrm %%PYTHON_SITELIBDIR%%/pantry/cli
+@dirrm %%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc
 @dirrm %%PYTHON_SITELIBDIR%%/pantry/lib
-@dirrm %%PYTHON_SITELIBDIR%%/pantry/xmlproc
 @dirrm %%PYTHON_SITELIBDIR%%/pantry
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html-chunk
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDATA%%@dirrm %%DATADIR%%