Update to 1.0

PR:		ports/99975
Submitted by:	maintainer

4 files changed, 43 insertions, 62 deletions

diff --git a/www/planet/Makefile b/www/planet/Makefile
index c8de696c21dd..b4a8065a1bf6 100644
--- a/www/planet/Makefile
+++ b/www/planet/Makefile
@@ -1,19 +1,20 @@
-# New ports collection makefile for:	planet
-# Date created:				26 September 2005
-# Whom:					Alan Snelson <alan@wave2.co.uk>
+# New ports collection makefile for:    planet
+# Date created:                         26 September 2005
+# Whom:                                 Alan Snelson <alan@wave2.co.uk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	planet
-PORTVERSION=	0.0p22
+PORTVERSION=	1.0
 CATEGORIES=	www
 MASTER_SITES=	http://www.wave2.co.uk/freebsd/planet/
 
 MAINTAINER=	alan@wave2.co.uk
 COMMENT=	Planet is a flexible feed aggregator - and more!
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:${PORTSDIR}/devel/py-mx-experimental
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:${PORTSDIR}/devel/py-mx-experimental \
+		${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb
 
 NO_BUILD=	yes
 USE_PYTHON=	yes
diff --git a/www/planet/distinfo b/www/planet/distinfo
index 71220ead1518..e4ddaf5cdcc2 100644
--- a/www/planet/distinfo
+++ b/www/planet/distinfo
@@ -1,3 +1,3 @@
-MD5 (planet-0.0p22.tar.gz) = e755e5fd0f98bdec7e88890612e01f24
-SHA256 (planet-0.0p22.tar.gz) = 54276baadda1c4af9f3f6cf857bea9234039d84375c773b604bae1583b0c228d
-SIZE (planet-0.0p22.tar.gz) = 123705
+MD5 (planet-1.0.tar.gz) = 8efcc0cf4df33f9423b997677c36147e
+SHA256 (planet-1.0.tar.gz) = e4ca69c8bd9adf186a39943d12e6afc010549d6a90982b495eaa4dd8d7430b35
+SIZE (planet-1.0.tar.gz) = 138340
diff --git a/www/planet/files/patch-htmltmpl.py b/www/planet/files/patch-htmltmpl.py
deleted file mode 100644
index 748b6a59e4e4..000000000000
--- a/www/planet/files/patch-htmltmpl.py
+++ /dev/null
@@ -1,27 +0,0 @@
-*** htmltmpl.py Mon Sep 26 19:14:38 2005
---- htmltmpl.py Mon Sep 26 19:00:07 2005
-***************
-*** 267,277 ****
-          fd = file.fileno()
-          if LOCKTYPE == LOCKTYPE_FCNTL:
-              if lock == LOCK_SH:
-!                 fcntl.fcntl(fd, fcntl.LOCK_SH)
-              elif lock == LOCK_EX:
-!                 fcntl.fcntl(fd, fcntl.LOCK_EX)
-              elif lock == LOCK_UN:
-!                 fcntl.fcntl(fd, fcntl.LOCK_UN)
-              else:
-                  raise TemplateError, "BUG: bad lock in lock_file"
-          elif LOCKTYPE == LOCKTYPE_MSVCRT:
---- 267,277 ----
-          fd = file.fileno()
-          if LOCKTYPE == LOCKTYPE_FCNTL:
-              if lock == LOCK_SH:
-!                 fcntl.flock(fd, fcntl.LOCK_SH)
-              elif lock == LOCK_EX:
-!                 fcntl.flock(fd, fcntl.LOCK_EX)
-              elif lock == LOCK_UN:
-!                 fcntl.flock(fd, fcntl.LOCK_UN)
-              else:
-                  raise TemplateError, "BUG: bad lock in lock_file"
-          elif LOCKTYPE == LOCKTYPE_MSVCRT:
diff --git a/www/planet/pkg-plist b/www/planet/pkg-plist
index f8d404219424..10ac9205ad8e 100644
--- a/www/planet/pkg-plist
+++ b/www/planet/pkg-plist
@@ -1,38 +1,45 @@
 %%DATADIR%%/AUTHORS
-%%DATADIR%%/ChangeLog
 %%DATADIR%%/INSTALL
-%%DATADIR%%/Makefile
+%%DATADIR%%/LICENCE
+%%DATADIR%%/NEWS
+%%DATADIR%%/PKG-INFO
 %%DATADIR%%/README
 %%DATADIR%%/THANKS
-%%DATADIR%%/TODO
-%%DATADIR%%/compat_logging/__init__.py
-%%DATADIR%%/compat_logging/config.py
-%%DATADIR%%/compat_logging/handlers.py
-%%DATADIR%%/examples/config.ini
+%%DATADIR%%/examples/atom.xml.tmpl
+%%DATADIR%%/examples/basic/config.ini
+%%DATADIR%%/examples/basic/index.html.tmpl
+%%DATADIR%%/examples/cache/.empty
+%%DATADIR%%/examples/fancy/config.ini
+%%DATADIR%%/examples/fancy/index.html.tmpl
 %%DATADIR%%/examples/foafroll.xml.tmpl
-%%DATADIR%%/examples/index.html.tmpl
+%%DATADIR%%/examples/output/images/edd.png
+%%DATADIR%%/examples/output/images/evolution.png
+%%DATADIR%%/examples/output/images/jdub.png
+%%DATADIR%%/examples/output/images/keybuk.png
+%%DATADIR%%/examples/output/images/logo.png
+%%DATADIR%%/examples/output/images/planet.png
+%%DATADIR%%/examples/output/images/thom.png
+%%DATADIR%%/examples/output/planet.css
 %%DATADIR%%/examples/opml.xml.tmpl
 %%DATADIR%%/examples/rss10.xml.tmpl
 %%DATADIR%%/examples/rss20.xml.tmpl
-%%DATADIR%%/fancy-examples/config.ini
-%%DATADIR%%/fancy-examples/index.html.tmpl
-%%DATADIR%%/feedparser.py
-%%DATADIR%%/htmltmpl.py
-%%DATADIR%%/htmltmpl.py.orig
-%%DATADIR%%/output/images/edd.png
-%%DATADIR%%/output/images/evolution.png
-%%DATADIR%%/output/images/jdub.png
-%%DATADIR%%/output/images/keybuk.png
-%%DATADIR%%/output/images/logo.png
-%%DATADIR%%/output/images/planet.png
-%%DATADIR%%/output/images/thom.png
-%%DATADIR%%/output/planet.css
+%%DATADIR%%/planet/__init__.py
+%%DATADIR%%/planet/cache.py
+%%DATADIR%%/planet/compat_logging/__init__.py
+%%DATADIR%%/planet/compat_logging/config.py
+%%DATADIR%%/planet/compat_logging/handlers.py
+%%DATADIR%%/planet/feedparser.py
+%%DATADIR%%/planet/htmltmpl.py
+%%DATADIR%%/planet/timeoutsocket.py
+%%DATADIR%%/planet-cache.py
 %%DATADIR%%/planet.py
-%%DATADIR%%/planetlib.py
-%%DATADIR%%/timeoutsocket.py
-@dirrm %%DATADIR%%/compat_logging
+%%DATADIR%%/setup.py
+@dirrm %%DATADIR%%/examples/basic
+@dirrm %%DATADIR%%/examples/cache
+@dirrm %%DATADIR%%/examples/fancy
+@dirrm %%DATADIR%%/examples/output/images
+@dirrm %%DATADIR%%/examples/output
 @dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/fancy-examples
-@dirrm %%DATADIR%%/output/images
-@dirrm %%DATADIR%%/output
+@dirrm %%DATADIR%%/planet/compat_logging
+@dirrm %%DATADIR%%/planet
 @dirrm %%DATADIR%%