4 files changed, 25 insertions, 26 deletions

diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile
index 97229b7fa2e7..981481358309 100644
--- a/deskutils/treeline/Makefile
+++ b/deskutils/treeline/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	treeline
-PORTVERSION=	0.10.2
+PORTVERSION=	0.11.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://www.bellz.org/treeline/ \
 		http://depot.fsck.ch/mirror/distfiles/
@@ -33,7 +33,7 @@ LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
 WRKSRC=		${WRKDIR}/TreeLine
 USE_QT_VER=	3
-USE_PYTHON=	yes
+USE_PYTHON=	2.3+
 NO_BUILD=	yes
 
 pre-everything::
@@ -47,10 +47,12 @@ pre-everything::
 	@${ECHO_MSG} ""
 
 do-install:
-	@cd ${WRKSRC} && ${PYTHON_CMD} install.py -p ${PREFIX} -x
+	@cd ${WRKSRC} && ${PYTHON_CMD} install.py \
+	-p ${PREFIX} -d ${DOCSDIR} -i ${DATADIR}/icons -x
 
 post-install:
 	${RM} ${DOCSDIR}/INSTALL ${DOCSDIR}/LICENSE
+	${RM} ${PREFIX}/lib/${PORTNAME}/uninstall.py*
 .if defined(NOPORTDOCS)
 	${RM} ${DOCSDIR}/*
 	${RMDIR} ${DOCSDIR}
diff --git a/deskutils/treeline/distinfo b/deskutils/treeline/distinfo
index 7baf9bde34a1..bed977177f47 100644
--- a/deskutils/treeline/distinfo
+++ b/deskutils/treeline/distinfo
@@ -1,2 +1,2 @@
-MD5 (treeline-0.10.2.tar.gz) = e052231518efc4c3d26b946855aedc73
-SIZE (treeline-0.10.2.tar.gz) = 161269
+MD5 (treeline-0.11.0.tar.gz) = ceab16ce78f1bc36b2c22fd00d555d89
+SIZE (treeline-0.11.0.tar.gz) = 186940
diff --git a/deskutils/treeline/files/patch-install.py b/deskutils/treeline/files/patch-install.py
deleted file mode 100644
index 1bcc6fdd82be..000000000000
--- a/deskutils/treeline/files/patch-install.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- install.py.orig	Tue Oct 19 19:34:17 2004
-+++ install.py	Tue Oct 19 19:34:29 2004
-@@ -231,10 +231,6 @@
-                     'dataFilePath = None', \
-                     'dataFilePath =  \'%s\'   # modified by install script\n' \
-                     % dataPrefixDir)
--    if os.path.isdir('icons'):
--        iconBuildDir = os.path.join(buildRoot, prefixDir[1:], 'share', 'icons')
--        print '  Copying icon files to %s' % iconBuildDir
--        copyDir('icons', iconBuildDir)
-     createWrapper(pythonPrefixDir, progName)
-     binBuildDir = os.path.join(buildRoot, prefixDir[1:], 'bin')
-     print '  Copying executable file "%s" to %s' % (progName, binBuildDir)
diff --git a/deskutils/treeline/pkg-plist b/deskutils/treeline/pkg-plist
index e8215daeab86..14b7b46bcbda 100644
--- a/deskutils/treeline/pkg-plist
+++ b/deskutils/treeline/pkg-plist
@@ -1,12 +1,8 @@
 bin/treeline
 lib/treeline/cmdline.py
 lib/treeline/cmdline.pyc
-lib/treeline/docparam.py
-lib/treeline/docparam.pyc
 lib/treeline/fieldformat.py
 lib/treeline/fieldformat.pyc
-lib/treeline/formatlist.py
-lib/treeline/formatlist.pyc
 lib/treeline/genboolean.py
 lib/treeline/genboolean.pyc
 lib/treeline/gendate.py
@@ -15,12 +11,20 @@ lib/treeline/gennumber.py
 lib/treeline/gennumber.pyc
 lib/treeline/gentime.py
 lib/treeline/gentime.pyc
+lib/treeline/globalref.py
+lib/treeline/globalref.pyc
 lib/treeline/helpview.py
 lib/treeline/helpview.pyc
+lib/treeline/icondict.py
+lib/treeline/icondict.pyc
+lib/treeline/nodeformat.py
+lib/treeline/nodeformat.pyc
 lib/treeline/numbering.py
 lib/treeline/numbering.pyc
 lib/treeline/option.py
 lib/treeline/option.pyc
+lib/treeline/optiondefaults.py
+lib/treeline/optiondefaults.pyc
 lib/treeline/optiondlg.py
 lib/treeline/optiondlg.pyc
 lib/treeline/output.py
@@ -45,8 +49,8 @@ lib/treeline/treedialogs.py
 lib/treeline/treedialogs.pyc
 lib/treeline/treedoc.py
 lib/treeline/treedoc.pyc
-lib/treeline/treeformat.py
-lib/treeline/treeformat.pyc
+lib/treeline/treeformats.py
+lib/treeline/treeformats.pyc
 lib/treeline/treeitem.py
 lib/treeline/treeitem.pyc
 lib/treeline/treeline.py
@@ -55,16 +59,20 @@ lib/treeline/treemainwin.py
 lib/treeline/treemainwin.pyc
 lib/treeline/treerightviews.py
 lib/treeline/treerightviews.pyc
+lib/treeline/treeselection.py
+lib/treeline/treeselection.pyc
 lib/treeline/treestates.py
 lib/treeline/treestates.pyc
 lib/treeline/treeview.py
 lib/treeline/treeview.pyc
+lib/treeline/treexmlparse.py
+lib/treeline/treexmlparse.pyc
 lib/treeline/undo.py
 lib/treeline/undo.pyc
-lib/treeline/uninstall.py
-lib/treeline/uninstall.pyc
 lib/treeline/xpm.py
 lib/treeline/xpm.pyc
+%%DATADIR%%/icons/treeline_lg.png
+%%DATADIR%%/icons/treeline_sm.png
 %%PORTDOCS%%%%DOCSDIR%%/README.html
 %%PORTDOCS%%%%DOCSDIR%%/readme.trl
 %%PORTDOCS%%%%DOCSDIR%%/sample_basic.trl
@@ -75,4 +83,6 @@ lib/treeline/xpm.pyc
 %%PORTDOCS%%%%DOCSDIR%%/sample_table.trl
 @dirrm lib/treeline/plugins
 @dirrm lib/treeline
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%