3 files changed, 45 insertions, 13 deletions

diff --git a/www/squishdot/Makefile b/www/squishdot/Makefile
index bac2d438e977..25d87c7f3ac9 100644
--- a/www/squishdot/Makefile
+++ b/www/squishdot/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	squishdot
-PORTVERSION=	0.7.3
+PORTVERSION=	1.2.1
 CATEGORIES=	www
-MASTER_SITES=	http://squishdot.org/Download/ \
+MASTER_SITES=	http://squishdot.org/Download/Squishdot/ \
 		http://www.zope.org/Members/chrisw/Squishdot/
 DISTNAME=	Squishdot-${PORTVERSION:S/./-/g}
 
@@ -16,10 +16,10 @@ MAINTAINER=	nbm@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
 
-NO_BUILD=	YES
+USE_PYTHON=	yes
 
 # You can change this in the environment if you like.
-SZOPEBASEDIR?=		www/Zope
+SZOPEBASEDIR?=	www/Zope
 
 # Don't change these
 ZOPEBASEDIR=		${PREFIX}/${SZOPEBASEDIR}
@@ -30,9 +30,17 @@ WRKSRC=		${WRKDIR}/${ZOPEPRODUCTNAME}
 
 PLIST_SUB=	ZOPEBASEDIR=${SZOPEBASEDIR}
 
+do-build:
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
+
 do-install:
-	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}/
+	@${MKDIR} ${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}
 	@${CP} -Rf ${WRKSRC}/* \
 		${ZOPEBASEDIR}/${ZOPEPRODUCTDIR}/${ZOPEPRODUCTNAME}/
 
+post-install:
+.if !defined(BATCH)
+	@${CAT} ${PKGMESSAGE}
+.endif
+
 .include <bsd.port.mk>
diff --git a/www/squishdot/distinfo b/www/squishdot/distinfo
index a3a23aa6c747..863f0db141d1 100644
--- a/www/squishdot/distinfo
+++ b/www/squishdot/distinfo
@@ -1 +1 @@
-MD5 (Squishdot-0-7-3.tar.gz) = b1caf43ca1d3035a936f449466264689
+MD5 (Squishdot-1-2-1.tar.gz) = 1313405a2e62a1120bf553445d3643f7
diff --git a/www/squishdot/pkg-plist b/www/squishdot/pkg-plist
index 534efec57f4c..635e9647da3e 100644
--- a/www/squishdot/pkg-plist
+++ b/www/squishdot/pkg-plist
@@ -1,8 +1,17 @@
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Article.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Article.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Changes.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Credits.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/HTMLParser.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/HTMLParser.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/License.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Posting.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Posting.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/README.txt
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/SquishSite.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/SquishSite.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot_editForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot_index_html.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot_mail_html.dtml
@@ -15,7 +24,26 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot_searchForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishdot_searchResults.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishfile.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Squishfile.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/0-3-x_0-4-x.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/0-3-x_0-4-x.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/0-7-x_1-0-0.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/0-7-x_1-0-0.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/1-0-0_1-1-0.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/1-0-0_1-1-0.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/1-1-0_1-2-0.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/1-1-0_1-2-0.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/README.TXT
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/__init__.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/fix_replies.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/fix_replies.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/fix_threading.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/fix_threading.pyc
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/update_indexing.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters/update_indexing.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/__init__.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/__init__.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/about.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/addPostingForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/addSquishdotForm.dtml
@@ -29,7 +57,6 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Images/rtshadow.gif
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Images/sitetitle.gif
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Squishdot_index_html.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Squishdot_mail_html.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Squishdot_posting_html.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Squishdot_previewForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Squishdot_searchForm.dtml
@@ -60,9 +87,6 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/misc_methods/advertising.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/misc_methods/copyright.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/misc_methods/quotation.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/newtables/bottom_items.tbl
-%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/newtables/leftbox_items.tbl
-%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/newtables/rightbox_items.tbl
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/rightbox_items.tbl
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/rightbox_methods/features.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/rightbox_methods/prevarticles.dtml
@@ -73,7 +97,6 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/showMessage.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/site_footer.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/site_header.dtml
-%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/doc/Roadmap.txt
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/editPostingForm.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/moderateArticle.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/posting.gif
@@ -82,15 +105,16 @@
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/squishdot.gif
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/squishfile.gif
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/squishlogo.gif
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/stripogram.py
+%%ZOPEBASEDIR%%/lib/python/Products/Squishdot/stripogram.pyc
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/validArticle.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/validComment.dtml
 %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/version.txt
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/doc
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/rightbox_methods
-@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/newtables
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/misc_methods
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/messages
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/TopicImages
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo/Images
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/demo
+@dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot/Updaters
 @dirrm %%ZOPEBASEDIR%%/lib/python/Products/Squishdot