- update to 1.2.1

- trim Makefile header
- remove indefinite article from COMMENT
- switch MASTER_SITES to CHEESESHOP
- limit python version to 2.x only (pygtk/except/print)
- update WWW

4 files changed, 89 insertions, 46 deletions

diff --git a/devel/dreampie/Makefile b/devel/dreampie/Makefile
index e7027ef38a12..a43a466c1e77 100644
--- a/devel/dreampie/Makefile
+++ b/devel/dreampie/Makefile
@@ -1,23 +1,18 @@
-# New ports collection makefile for:	dreampie
-# Date created:			14 May 2010
-# Whom:				Ju Pengfei <jupengfei@gmail.com>
-#
+# Created by: Ju Pengfei <jupengfei@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	dreampie
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	devel python
-MASTER_SITES=	http://launchpadlibrarian.net/55587528/
+MASTER_SITES=	CHEESESHOP
 
 MAINTAINER=	rm@FreeBSD.org
-COMMENT=	DreamPie is a Python shell which is designed to be reliable and fun
+COMMENT=	Python shell which is designed to be reliable and fun
 
 LICENSE=	GPLv3
 
 USE_GNOME=	pygtk2 pygtksourceview
-USE_PYTHON=	yes
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 
 MAN1=		dreampie.1
diff --git a/devel/dreampie/distinfo b/devel/dreampie/distinfo
index 4e734d869f62..46214dbb42c0 100644
--- a/devel/dreampie/distinfo
+++ b/devel/dreampie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dreampie-1.1.1.tar.gz) = 48a9498c6f14b0d0b7efc973661f9610d3147f61c8b6b0c2ccf99de5a7fd39d1
-SIZE (dreampie-1.1.1.tar.gz) = 112952
+SHA256 (dreampie-1.2.1.tar.gz) = 8e82093f2f02a5c552715259d43931ae3128873643aa39958ace232235eac6c2
+SIZE (dreampie-1.2.1.tar.gz) = 168980
diff --git a/devel/dreampie/pkg-descr b/devel/dreampie/pkg-descr
index 77d6aa928c87..dbd74ca56dd2 100644
--- a/devel/dreampie/pkg-descr
+++ b/devel/dreampie/pkg-descr
@@ -1,3 +1,3 @@
 DreamPie is a Python shell which is designed to be reliable and fun.
 
-WWW: http://dreampie.sourceforge.net/
+WWW: http://www.dreampie.org/
diff --git a/devel/dreampie/pkg-plist b/devel/dreampie/pkg-plist
index f24c26c07881..bb0f85bbd5e0 100644
--- a/devel/dreampie/pkg-plist
+++ b/devel/dreampie/pkg-plist
@@ -11,6 +11,62 @@ bin/dreampie
 %%PYTHON_SITELIBDIR%%/dreampielib/common/objectstream.py
 %%PYTHON_SITELIBDIR%%/dreampielib/common/objectstream.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/common/objectstream.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/dreampie.glade
+%%PYTHON_SITELIBDIR%%/dreampielib/data/dreampie.png
+%%PYTHON_SITELIBDIR%%/dreampielib/data/language-specs/def.lang
+%%PYTHON_SITELIBDIR%%/dreampielib/data/language-specs/language2.rng
+%%PYTHON_SITELIBDIR%%/dreampielib/data/language-specs/python.lang
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/brine.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/brine.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/brine.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/objectstream.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/objectstream.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common/objectstream.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/find_modules.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/find_modules.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/find_modules.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/split_to_singles.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/split_to_singles.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/split_to_singles.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/trunc_traceback.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/trunc_traceback.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess/trunc_traceback.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/brine.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/brine.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/brine.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/objectstream.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/objectstream.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common/objectstream.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/__init__.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/find_modules.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/find_modules.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/find_modules.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/split_to_singles.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/split_to_singles.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/split_to_singles.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/trunc_traceback.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/trunc_traceback.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess/trunc_traceback.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp_main.py
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp_main.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/data/subp_main.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/SimpleGladeApp.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/SimpleGladeApp.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/SimpleGladeApp.pyo
@@ -26,27 +82,36 @@ bin/dreampie
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/autoparen.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/autoparen.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/autoparen.pyo
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/beep.py
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/beep.pyc
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/beep.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/bug_report.py
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/bug_report.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/bug_report.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tip_window.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tip_window.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tip_window.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tips.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tips.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/call_tips.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/common.py
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/common.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/common.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config_dialog.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config_dialog.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/config_dialog.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/crash_workaround.py
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/crash_workaround.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/crash_workaround.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/file_dialogs.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/file_dialogs.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/file_dialogs.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/folding.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/folding.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/folding.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/git.py
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/git.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/git.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/gtkexcepthook.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/gtkexcepthook.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/gtkexcepthook.pyo
@@ -65,9 +130,6 @@ bin/dreampie
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/keyhandler.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/keyhandler.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/keyhandler.pyo
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/load_pygtk.py
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/load_pygtk.pyc
-%%PYTHON_SITELIBDIR%%/dreampielib/gui/load_pygtk.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/newline_and_indent.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/newline_and_indent.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/newline_and_indent.pyo
@@ -95,6 +157,9 @@ bin/dreampie
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/tags.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/tags.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/tags.pyo
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/update_check.py
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/update_check.pyc
+%%PYTHON_SITELIBDIR%%/dreampielib/gui/update_check.pyo
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/vadj_to_bottom.py
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/vadj_to_bottom.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/gui/vadj_to_bottom.pyo
@@ -117,37 +182,20 @@ bin/dreampie
 %%PYTHON_SITELIBDIR%%/dreampielib/subprocess/trunc_traceback.pyc
 %%PYTHON_SITELIBDIR%%/dreampielib/subprocess/trunc_traceback.pyo
 share/applications/dreampie.desktop
-%%DATADIR%%/dreampie.glade
-%%DATADIR%%/subp-py2/dreampielib/__init__.py
-%%DATADIR%%/subp-py2/dreampielib/common/__init__.py
-%%DATADIR%%/subp-py2/dreampielib/common/brine.py
-%%DATADIR%%/subp-py2/dreampielib/common/objectstream.py
-%%DATADIR%%/subp-py2/dreampielib/subprocess/__init__.py
-%%DATADIR%%/subp-py2/dreampielib/subprocess/find_modules.py
-%%DATADIR%%/subp-py2/dreampielib/subprocess/split_to_singles.py
-%%DATADIR%%/subp-py2/dreampielib/subprocess/trunc_traceback.py
-%%DATADIR%%/subp-py3/dreampielib/__init__.py
-%%DATADIR%%/subp-py3/dreampielib/common/__init__.py
-%%DATADIR%%/subp-py3/dreampielib/common/brine.py
-%%DATADIR%%/subp-py3/dreampielib/common/objectstream.py
-%%DATADIR%%/subp-py3/dreampielib/subprocess/__init__.py
-%%DATADIR%%/subp-py3/dreampielib/subprocess/find_modules.py
-%%DATADIR%%/subp-py3/dreampielib/subprocess/split_to_singles.py
-%%DATADIR%%/subp-py3/dreampielib/subprocess/trunc_traceback.py
-%%DATADIR%%/subp_main.py
 share/pixmaps/dreampie.png
 share/pixmaps/dreampie.svg
-@dirrm %%DATADIR%%/subp-py3/dreampielib/subprocess
-@dirrm %%DATADIR%%/subp-py3/dreampielib/common
-@dirrm %%DATADIR%%/subp-py3/dreampielib
-@dirrm %%DATADIR%%/subp-py3
-@dirrm %%DATADIR%%/subp-py2/dreampielib/subprocess
-@dirrm %%DATADIR%%/subp-py2/dreampielib/common
-@dirrm %%DATADIR%%/subp-py2/dreampielib
-@dirrm %%DATADIR%%/subp-py2
-@dirrm %%DATADIR%%
 @dirrmtry share/applications
 @dirrm %%PYTHON_SITELIBDIR%%/dreampielib/subprocess
 @dirrm %%PYTHON_SITELIBDIR%%/dreampielib/gui
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/subprocess
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib/common
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3/dreampielib
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py3
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/subprocess
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib/common
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2/dreampielib
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/subp-py2
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data/language-specs
+@dirrm %%PYTHON_SITELIBDIR%%/dreampielib/data
 @dirrm %%PYTHON_SITELIBDIR%%/dreampielib/common
 @dirrm %%PYTHON_SITELIBDIR%%/dreampielib