5 files changed, 65 insertions, 34 deletions

diff --git a/misc/xyzcmd/Makefile b/misc/xyzcmd/Makefile
index 1990ed8b4dd3..00598098f531 100644
--- a/misc/xyzcmd/Makefile
+++ b/misc/xyzcmd/Makefile
@@ -2,28 +2,33 @@
 # $FreeBSD$
 
 PORTNAME=	xyzcmd
-PORTVERSION=	0.0.4
+PORTVERSION=	0.0.5
 CATEGORIES=	misc python
 MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Pure console visual file manager
 
+LICENSE=	LGPL
+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/urwid/raw_display.py:${PORTSDIR}/devel/py-urwid
 
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 INSTALLS_EGGINFO=yes
+USES=		tar:bzip2
+
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} api ${DOCSDIR} && \
-		${COPYTREE_SHARE} user-manual ${DOCSDIR} && \
-		${INSTALL_DATA} ../ChangeLog overview.pdf ${DOCSDIR}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} api ${STAGEDIR}${DOCSDIR} && \
+		${COPYTREE_SHARE} user-manual ${STAGEDIR}${DOCSDIR} && \
+		${INSTALL_DATA} ../ChangeLog overview.pdf ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/misc/xyzcmd/distinfo b/misc/xyzcmd/distinfo
index a45929894850..0e3b6658aaa2 100644
--- a/misc/xyzcmd/distinfo
+++ b/misc/xyzcmd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xyzcmd-0.0.4.tar.bz2) = fa8c0eb177064e8269bc8f896aa985de1e5779dcf12e849397b592eb593e6468
-SIZE (xyzcmd-0.0.4.tar.bz2) = 1227184
+SHA256 (xyzcmd-0.0.5.tar.bz2) = 792aff7f4309f80ff04ba48aab328bfd88153fe49f9a4cb5bf97d64792f072b3
+SIZE (xyzcmd-0.0.5.tar.bz2) = 1362595
diff --git a/misc/xyzcmd/files/patch-libxyz__ui____init__.py b/misc/xyzcmd/files/patch-libxyz__ui____init__.py
new file mode 100644
index 000000000000..57745b45afe6
--- /dev/null
+++ b/misc/xyzcmd/files/patch-libxyz__ui____init__.py
@@ -0,0 +1,11 @@
+--- ./libxyz/ui/__init__.py.orig	2014-07-01 19:55:27.884601353 +0400
++++ ./libxyz/ui/__init__.py	2014-07-01 19:57:02.576866186 +0400
+@@ -47,6 +47,8 @@
+ )
+ 
+ import urwid as lowui
++if int(lowui.__version__[0]) == 1:
++    lowui.escape.utf8decode = lambda x: x
+ 
+ import display
+ import align
diff --git a/misc/xyzcmd/files/patch-setup.py b/misc/xyzcmd/files/patch-setup.py
deleted file mode 100644
index 4ebc87817bea..000000000000
--- a/misc/xyzcmd/files/patch-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
---- setup.py.orig	2010-05-06 04:30:03.000000000 +0800
-+++ setup.py	2010-05-09 03:20:33.000000000 +0800
-@@ -49,13 +49,9 @@
-                 ],
-     data_files = [
-         ("share/xyzcmd/conf", glob.glob("conf/*")),
--        ("share/doc/xyzcmd/api", glob.glob("doc/api/*")),
-         ("share/xyzcmd/skins", glob.glob("skins/*")),
--        ("share/doc/xyzcmd", ["ChangeLog", "doc/overview.pdf"]),
-         ] +
--    include_rec("plugins", "share/xyzcmd/%s") +
--    include_rec("doc/user-manual", "share/doc/xyzcmd/%s",
--                lambda x: x.replace("doc/user-manual", "user-manual")),
-+    include_rec("plugins", "share/xyzcmd/%s"),
-     
-     requires = ["urwid"],
- 
diff --git a/misc/xyzcmd/pkg-plist b/misc/xyzcmd/pkg-plist
index 065b5024ec86..e9a093232941 100644
--- a/misc/xyzcmd/pkg-plist
+++ b/misc/xyzcmd/pkg-plist
@@ -701,53 +701,81 @@ bin/xyzcmd
 %%DATADIR%%/conf/main.xyz
 %%DATADIR%%/conf/plugins.xyz
 %%DATADIR%%/conf/vfs.xyz
+%%DATADIR%%/locale/ru/LC_MESSAGES/xyzcmd.mo
+%%DATADIR%%/locale/ru/LC_MESSAGES/xyzcmd.po
+%%DATADIR%%/locale/xyzcmd.pot
 %%DATADIR%%/plugins/__init__.py
 %%DATADIR%%/plugins/core/__init__.py
+%%DATADIR%%/plugins/core/__init__.pyc
 %%DATADIR%%/plugins/core/bindlist/__init__.py
+%%DATADIR%%/plugins/core/bindlist/__init__.pyc
 %%DATADIR%%/plugins/core/bindlist/main.py
+%%DATADIR%%/plugins/core/bindlist/main.pyc
 %%DATADIR%%/plugins/core/console/__init__.py
+%%DATADIR%%/plugins/core/console/__init__.pyc
 %%DATADIR%%/plugins/core/console/main.py
+%%DATADIR%%/plugins/core/console/main.pyc
 %%DATADIR%%/plugins/core/keycodes/__init__.py
+%%DATADIR%%/plugins/core/keycodes/__init__.pyc
 %%DATADIR%%/plugins/core/keycodes/main.py
+%%DATADIR%%/plugins/core/keycodes/main.pyc
 %%DATADIR%%/plugins/core/pluginlist/__init__.py
+%%DATADIR%%/plugins/core/pluginlist/__init__.pyc
 %%DATADIR%%/plugins/core/pluginlist/entry.py
+%%DATADIR%%/plugins/core/pluginlist/entry.pyc
 %%DATADIR%%/plugins/core/pluginlist/main.py
+%%DATADIR%%/plugins/core/pluginlist/main.pyc
 %%DATADIR%%/plugins/core/shell/__init__.py
 %%DATADIR%%/plugins/core/shell/bash.py
 %%DATADIR%%/plugins/core/shell/main.py
 %%DATADIR%%/plugins/fsrules/__init__.py
+%%DATADIR%%/plugins/fsrules/__init__.pyc
 %%DATADIR%%/plugins/fsrules/magic/__init__.py
+%%DATADIR%%/plugins/fsrules/magic/__init__.pyc
 %%DATADIR%%/plugins/fsrules/magic/main.py
+%%DATADIR%%/plugins/fsrules/magic/main.pyc
 %%DATADIR%%/plugins/misc/__init__.py
+%%DATADIR%%/plugins/misc/__init__.pyc
 %%DATADIR%%/plugins/misc/about/__init__.py
+%%DATADIR%%/plugins/misc/about/__init__.pyc
 %%DATADIR%%/plugins/misc/about/main.py
+%%DATADIR%%/plugins/misc/about/main.pyc
 %%DATADIR%%/plugins/misc/hello/__init__.py
 %%DATADIR%%/plugins/misc/hello/main.py
 %%DATADIR%%/plugins/misc/where/__init__.py
+%%DATADIR%%/plugins/misc/where/__init__.pyc
 %%DATADIR%%/plugins/misc/where/main.py
+%%DATADIR%%/plugins/misc/where/main.pyc
 %%DATADIR%%/plugins/ui/__init__.py
+%%DATADIR%%/plugins/ui/__init__.pyc
 %%DATADIR%%/plugins/ui/bookmarks/__init__.py
+%%DATADIR%%/plugins/ui/bookmarks/__init__.pyc
 %%DATADIR%%/plugins/ui/bookmarks/main.py
+%%DATADIR%%/plugins/ui/bookmarks/main.pyc
 %%DATADIR%%/plugins/ui/testinput/__init__.py
+%%DATADIR%%/plugins/ui/testinput/__init__.pyc
 %%DATADIR%%/plugins/ui/testinput/main.py
+%%DATADIR%%/plugins/ui/testinput/main.pyc
 %%DATADIR%%/plugins/vfs/__init__.py
+%%DATADIR%%/plugins/vfs/__init__.pyc
 %%DATADIR%%/plugins/vfs/fileinfo/__init__.py
+%%DATADIR%%/plugins/vfs/fileinfo/__init__.pyc
 %%DATADIR%%/plugins/vfs/fileinfo/main.py
+%%DATADIR%%/plugins/vfs/fileinfo/main.pyc
 %%DATADIR%%/plugins/vfs/vfsutils/__init__.py
+%%DATADIR%%/plugins/vfs/vfsutils/__init__.pyc
 %%DATADIR%%/plugins/vfs/vfsutils/box_copy.py
+%%DATADIR%%/plugins/vfs/vfsutils/box_copy.pyc
 %%DATADIR%%/plugins/vfs/vfsutils/main.py
+%%DATADIR%%/plugins/vfs/vfsutils/main.pyc
+share/man/man1/xyzcmd.1
 %%DATADIR%%/skins/glamour
 %%DATADIR%%/skins/grass
 %%DATADIR%%/skins/lighty
 %%DATADIR%%/skins/monochrome
 %%DATADIR%%/skins/seablue
-%%PYTHON_SITELIBDIR%%/libxyz/vfs/zip.py
-%%PYTHON_SITELIBDIR%%/libxyz/vfs/zip.pyc
-%%PYTHON_SITELIBDIR%%/libxyz/vfs/zip.pyo
+%%PORTDOCS%%%%DOCSDIR%%/api/libxyz.ui.entry.BlockEntries-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/libxyz.ui.panel.TabBar-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/libxyz.vfs.zip-module.html
-%%PORTDOCS%%%%DOCSDIR%%/api/libxyz.vfs.zip-pysrc.html
-%%PORTDOCS%%%%DOCSDIR%%/api/libxyz.vfs.zip.ZipVFSObject-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete.domain_base-module.html
@@ -766,7 +794,6 @@ bin/xyzcmd
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete.main-pysrc.html
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete.main.CompleteWindow-class.html
 %%PORTDOCS%%%%DOCSDIR%%/api/plugins.core.complete.main.XYZPlugin-class.html
-%%PORTDOCS%%%%DOCSDIR%%/api/toc-libxyz.vfs.zip-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-plugins.core.complete-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-plugins.core.complete.domain_base-module.html
 %%PORTDOCS%%%%DOCSDIR%%/api/toc-plugins.core.complete.domain_binpath-module.html
@@ -780,6 +807,11 @@ bin/xyzcmd
 %%DATADIR%%/plugins/core/complete/domain_fs.py
 %%DATADIR%%/plugins/core/complete/domain_service.py
 %%DATADIR%%/plugins/core/complete/main.py
+@dirrmtry share/man/man1
+@dirrmtry share/man
+@dirrm %%DATADIR%%/locale/ru/LC_MESSAGES
+@dirrm %%DATADIR%%/locale/ru
+@dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/skins
 @dirrm %%DATADIR%%/plugins/vfs/vfsutils
 @dirrm %%DATADIR%%/plugins/vfs/fileinfo