Date: Fri, 31 Jul 2009 05:09:07 GMT From: Earl Gay <earl@eeg3.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/137287: Update port misc/pantry: unbreak and upgrade to 0.32 Message-ID: <200907310509.n6V597X3076767@www.freebsd.org> Resent-Message-ID: <200907310510.n6V5A1Os007902@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137287
>Category: ports
>Synopsis: Update port misc/pantry: unbreak and upgrade to 0.32
>Confidential: no
>Severity: non-critical
>Priority: high
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 31 05:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Earl Gay
>Release: 7.2
>Organization:
>Environment:
FreeBSD fbsdvm.eeg3.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May 1 08:49:13 UTC 2009 root@walker.cse.buffalo.edu:/usr/obj/src/sys/GENERIC i386
>Description:
Due to the severity of the break and code change, the entire port had to be recreated. Also, updated to version 0.32. Additionally, I request maintainership of this port.
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/misc/pantry.orig/Makefile /usr/ports/misc/pantry/Makefile
--- /usr/ports/misc/pantry.orig/Makefile 2009-07-31 00:14:28.000000000 -0400
+++ /usr/ports/misc/pantry/Makefile 2009-07-31 00:26:24.000000000 -0400
@@ -1,44 +1,20 @@
# New ports collection makefile for: pantry
-# Date created: 21 July 2007
-# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org>
+# Date created: 30 July 2009
+# Whom: Earl Gay <earl@eeg3.net>
#
-# $FreeBSD: ports/misc/pantry/Makefile,v 1.13 2009/07/22 21:02:56 pgollucci Exp $
+# $FreeBSD$
#
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_PYTHON= yes
-USE_PYDISTUTILS=yes
+USE_BZIP2= yes
+GNU_CONFIGURE= 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
.include <bsd.port.mk>
diff -ruN /usr/ports/misc/pantry.orig/distinfo /usr/ports/misc/pantry/distinfo
--- /usr/ports/misc/pantry.orig/distinfo 2009-07-31 00:14:28.000000000 -0400
+++ /usr/ports/misc/pantry/distinfo 2009-07-31 00:20:02.000000000 -0400
@@ -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 -ruN /usr/ports/misc/pantry.orig/pkg-plist /usr/ports/misc/pantry/pkg-plist
--- /usr/ports/misc/pantry.orig/pkg-plist 2009-07-31 00:14:28.000000000 -0400
+++ /usr/ports/misc/pantry/pkg-plist 2009-07-31 00:05:52.000000000 -0400
@@ -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
+share/pantry/data/starter_database
+share/doc/pantry/pantry_user_guide.txt
+share/doc/pantry/pantry_user_guide.html
+share/doc/pantry/pantry_user_guide_us_letter.pdf
+share/doc/pantry/pantry_user_guide_a4.pdf
+share/pantry/examples/foods/Heritage_Flakes
+share/pantry/examples/foods/Qdoba_Chicken_Queso_Burrito
+share/pantry/examples/foods/Potbelly_Chicken_Salad_Sandwich
+share/pantry/examples/recipes/Brownies
+share/pantry/examples/recipes/Easy_Corn_Bread
+share/pantry/examples/recipes/Fruit_Bowl
+share/pantry/scripts/addFoods
+share/pantry/scripts/addRecipes
+share/pantry/scripts/convert_sr
+share/pantry/scripts/food_template
+share/pantry/scripts/ingrlist
+share/pantry/scripts/macronuts
+share/pantry/scripts/_pantry
+share/pantry/scripts/recipe_template
+share/pantry/scripts/zsh_functions
+@dirrm share/pantry/data
+@dirrm share/doc/pantry
+@dirrm share/pantry/examples/foods
+@dirrm share/pantry/examples/recipes
+@dirrm share/pantry/examples
+@dirrm share/pantry/scripts
+@dirrm share/pantry
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907310509.n6V597X3076767>