3 files changed, 37 insertions, 177 deletions

diff --git a/misc/pantry/Makefile b/misc/pantry/Makefile
index a5eda13e960a..b1adf52e222d 100644
--- a/misc/pantry/Makefile
+++ b/misc/pantry/Makefile
@@ -6,39 +6,16 @@
 #
 
 PORTNAME=	pantry
-PORTVERSION=	0.${DISTVERSION}
-DISTVERSION=	31
+PORTVERSION=	32
 CATEGORIES=	misc
-MASTER_SITES=	http://www.smileystation.com/pantry/downloads/ CENKES
+MASTER_SITES=	http://www.smileystation.com/pantry/downloads/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	earl@eeg3.net
 COMMENT=	Command-line nutrition analysis program
 
-RUN_DEPENDS=	py*-bsddb>=2:${PORTSDIR}/databases/py-bsddb
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 
-USE_PYTHON=	yes
-USE_PYDISTUTILS=yes
-MAN1=	${PORTNAME}.1
-PYDISTUTILS_PKGVERSION=	${DISTVERSION}
-
-post-extract:
-	@${MV} ${WRKSRC}/docs/${PORTNAME}.1 ${WRKSRC}/
-	@${MV} ${WRKSRC}/CHANGELOG ${WRKSRC}/docs/
-
-post-install:
-	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MAN1PREFIX}/man/man1/
-.ifndef NOPORTDOCS
-	@cd ${WRKSRC}/docs/&&${COPYTREE_SHARE} . ${DOCSDIR}/
-.endif
-.ifndef NOPORTEXAMPLES
-	@cd ${WRKSRC}/examples/&&${COPYTREE_SHARE} . ${EXAMPLESDIR}/
-.endif
-.ifndef NOPORTDATA
-	@${INSTALL} -d ${DATADIR}/
-	@${INSTALL_DATA} ${WRKSRC}/master ${DATADIR}/
-.endif
-
-test:
-	${PREFIX}/bin/pantry --ignore-case --name apple --print names ${DATADIR}/master
+MAN1=		pantry.1 pantryd.1
 
 .include <bsd.port.mk>
diff --git a/misc/pantry/distinfo b/misc/pantry/distinfo
index c5ab6c590ac3..b1696e932a20 100644
--- a/misc/pantry/distinfo
+++ b/misc/pantry/distinfo
@@ -1,3 +1,3 @@
-MD5 (pantry-31.tar.gz) = 43f4dc5ed23d385a3667e6ca1a7c406b
-SHA256 (pantry-31.tar.gz) = 8b66d4e7446f008056e137bbe433b397806cd1726b9266e7dc526c250772f78f
-SIZE (pantry-31.tar.gz) = 2132740
+MD5 (pantry-32.tar.bz2) = ecfd9fba44f69a4c710764fbd1c48bf8
+SHA256 (pantry-32.tar.bz2) = cf5394c7d083103be99b32a9e946efe276caa7f84b438aef6a1d15512577eb4b
+SIZE (pantry-32.tar.bz2) = 1844050
diff --git a/misc/pantry/pkg-plist b/misc/pantry/pkg-plist
index 79a55177be89..43439789b5fc 100644
--- a/misc/pantry/pkg-plist
+++ b/misc/pantry/pkg-plist
@@ -1,146 +1,29 @@
 bin/pantry
-%%PYTHON_SITELIBDIR%%/pantry/__init__.py
-%%PYTHON_SITELIBDIR%%/pantry/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pantry/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pantry/cli/__init__.py
-%%PYTHON_SITELIBDIR%%/pantry/cli/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pantry/cli/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pantry/cli/config.py
-%%PYTHON_SITELIBDIR%%/pantry/cli/config.pyc
-%%PYTHON_SITELIBDIR%%/pantry/cli/config.pyo
-%%PYTHON_SITELIBDIR%%/pantry/cli/main.py
-%%PYTHON_SITELIBDIR%%/pantry/cli/main.pyc
-%%PYTHON_SITELIBDIR%%/pantry/cli/main.pyo
-%%PYTHON_SITELIBDIR%%/pantry/cli/reportPrinter.py
-%%PYTHON_SITELIBDIR%%/pantry/cli/reportPrinter.pyc
-%%PYTHON_SITELIBDIR%%/pantry/cli/reportPrinter.pyo
-%%PYTHON_SITELIBDIR%%/pantry/cli/reports.py
-%%PYTHON_SITELIBDIR%%/pantry/cli/reports.pyc
-%%PYTHON_SITELIBDIR%%/pantry/cli/reports.pyo
-%%PYTHON_SITELIBDIR%%/pantry/lib/__init__.py
-%%PYTHON_SITELIBDIR%%/pantry/lib/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pantry/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pantry/lib/cabinets.py
-%%PYTHON_SITELIBDIR%%/pantry/lib/cabinets.pyc
-%%PYTHON_SITELIBDIR%%/pantry/lib/cabinets.pyo
-%%PYTHON_SITELIBDIR%%/pantry/lib/foods.py
-%%PYTHON_SITELIBDIR%%/pantry/lib/foods.pyc
-%%PYTHON_SITELIBDIR%%/pantry/lib/foods.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%%/CHANGELOG
-%%PORTDOCS%%%%DOCSDIR%%/entities
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/apa.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/apb.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch01.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s05.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s06.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s07.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch02s08.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch03s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch03s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s05.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s06.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch04s07.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch05.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch05s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch05s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch05s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch06.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch06s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch06s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch06s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/ch07s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/index.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01s02.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01s04.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/pr01s05.html
-%%PORTDOCS%%%%DOCSDIR%%/html-chunk/re01.html
-%%PORTDOCS%%%%DOCSDIR%%/pantry-user-guide-USLetter.pdf
-%%PORTDOCS%%%%DOCSDIR%%/pantry-user-guide.html
-%%PORTDOCS%%%%DOCSDIR%%/pantry-user-guide.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foods.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/foods.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panconvert.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/pantryrc.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/recipes.xml
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsh-functions
-%%PORTDATA%%%%DATADIR%%/master
-@dirrm %%PYTHON_SITELIBDIR%%/pantry/cli
-@dirrm %%PYTHON_SITELIBDIR%%/pantry/lib/xmlproc
-@dirrm %%PYTHON_SITELIBDIR%%/pantry/lib
-@dirrm %%PYTHON_SITELIBDIR%%/pantry
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/html-chunk
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDATA%%@dirrm %%DATADIR%%
+bin/pantryd
+%%DOCSDIR%%/pantry_user_guide.html
+%%DOCSDIR%%/pantry_user_guide.txt
+%%DOCSDIR%%/pantry_user_guide_a4.pdf
+%%DOCSDIR%%/pantry_user_guide_us_letter.pdf
+%%DATADIR%%/data/starter_database
+%%DATADIR%%/examples/foods/Heritage_Flakes
+%%DATADIR%%/examples/foods/Potbelly_Chicken_Salad_Sandwich
+%%DATADIR%%/examples/foods/Qdoba_Chicken_Queso_Burrito
+%%DATADIR%%/examples/recipes/Brownies
+%%DATADIR%%/examples/recipes/Easy_Corn_Bread
+%%DATADIR%%/examples/recipes/Fruit_Bowl
+%%DATADIR%%/scripts/_pantry
+%%DATADIR%%/scripts/addFoods
+%%DATADIR%%/scripts/addRecipes
+%%DATADIR%%/scripts/convert_sr
+%%DATADIR%%/scripts/food_template
+%%DATADIR%%/scripts/ingrlist
+%%DATADIR%%/scripts/macronuts
+%%DATADIR%%/scripts/recipe_template
+%%DATADIR%%/scripts/zsh_functions
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/examples/recipes
+@dirrm %%DATADIR%%/examples/foods
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%