6 files changed, 66 insertions, 44 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 6b468d6f1f76..bc737242def2 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -953,7 +953,6 @@
     SUBDIR += py-sane
     SUBDIR += py-scikit-image
     SUBDIR += py-seqdiag
-    SUBDIR += py-sk1
     SUBDIR += py-sorl-thumbnail
     SUBDIR += py-soya3d
     SUBDIR += py-stltools
@@ -1071,6 +1070,7 @@
     SUBDIR += silgraphite
     SUBDIR += simage
     SUBDIR += simpleviewer
+    SUBDIR += sk1
     SUBDIR += sk1libs
     SUBDIR += skanlite
     SUBDIR += skanlite-kde4
diff --git a/graphics/py-sk1/distinfo b/graphics/py-sk1/distinfo
deleted file mode 100644
index b68f55499c09..000000000000
--- a/graphics/py-sk1/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1511852233
-SHA256 (sk1project-sk1-wx-g20171127-2352d72_GH0.tar.gz) = 755f3c92f43f225931cbe0c869c5e0f56ab54442527d15c731b949eac72347c5
-SIZE (sk1project-sk1-wx-g20171127-2352d72_GH0.tar.gz) = 7793425
diff --git a/graphics/py-sk1/Makefile b/graphics/sk1/Makefile
index 0b2b984da33d..7e16ecc97263 100644
--- a/graphics/py-sk1/Makefile
+++ b/graphics/sk1/Makefile
@@ -1,16 +1,16 @@
 # $FreeBSD$
 
 PORTNAME=	sk1
-DISTVERSION=	g20171127
-PORTREVISION=	4
+DISTVERSION=	2.0
+DISTVERSIONSUFFIX=	rc3
 CATEGORIES=	graphics python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+MASTER_SITES=	https://downloads.sk1project.net/sk1/${DISTVERSIONFULL}/
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Professional quality illustration program
 
-LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE=	GPLv3+
+LICENSE_FILE=	${WRKSRC}/GPLv3.txt
 
 LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 		libMagickCore-6.so:graphics/ImageMagick6
@@ -20,25 +20,23 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR}
 
-USES=		desktop-file-utils python:2.7
-USE_GITHUB=	yes
-GH_ACCOUNT=	sk1project
-GH_PROJECT=	sk1-wx
-GH_TAGNAME=	2352d72
-USE_PYTHON=	concurrent distutils
+USES=		desktop-file-utils gettext gnome python:2.7 shebangfix
+SHEBANG_FILES=	${PYSETUP}
+USE_PYTHON=	distutils noflavor distutils
 PYSETUP=	setup-sk1.py
 PYDISTUTILS_INSTALLARGS=	--root=${STAGEDIR}
 USE_GNOME=	cairo glib20 pango
-USE_WX=		2.8+ # 2.8 or 3.0 (see the github page)
+USE_WX=		3.0+
 WX_COMPS=	python:lib
+INSTALLS_ICONS=	yes
 
 MAKE_ENV=	FREEBSD_PYTHON_VER=${PYTHON_VER}
-_VER=		"2.0rc3"
+_VER=		${DISTVERSIONFULL}
 PLIST_SUB=	VER="${_VER}"
 
 post-patch:
 	@${REINPLACE_CMD} -E " \
-		s|/usr/|${LOCALBASE}/|g ; \
+		s,/usr/(bin|include|lib|share),${LOCALBASE}/\1,g ; \
 		s|%s-wx-%s' % \(NAME, VERSION\)|%s-wx-%s-%s' % (NAME, VERSION, os.environ['FREEBSD_PYTHON_VER'])| ; \
 		s/sk1\.(desktop|png|xpm|svg)/sk1-${PYTHON_VER}.\1/g ; \
 		s|\(install_path, \['GPLv3.txt', 'LICENSE', \]\),|| " \
diff --git a/graphics/sk1/distinfo b/graphics/sk1/distinfo
new file mode 100644
index 000000000000..0e4942cf32d1
--- /dev/null
+++ b/graphics/sk1/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1545157734
+SHA256 (sk1-2.0rc3.tar.gz) = d3b94131794d42d7c80c678e11a28a8e6a50401af4a35e42ed534d02b14abdff
+SIZE (sk1-2.0rc3.tar.gz) = 1940826
diff --git a/graphics/py-sk1/pkg-descr b/graphics/sk1/pkg-descr
index 5ada302174d0..5ada302174d0 100644
--- a/graphics/py-sk1/pkg-descr
+++ b/graphics/sk1/pkg-descr
diff --git a/graphics/py-sk1/pkg-plist b/graphics/sk1/pkg-plist
index bd38abb318c8..b67a6dde90e3 100644
--- a/graphics/py-sk1/pkg-plist
+++ b/graphics/sk1/pkg-plist
@@ -1,4 +1,8 @@
 bin/sk1
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/__init__.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_actions.py
@@ -17,6 +21,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_plugins.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_plugins.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_proxy.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_proxy.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_stdout.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/app_stdout.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/appconst.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/appconst.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/application.py
@@ -73,10 +79,12 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/editdlg.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/editdlg.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filedlgs.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filedlgs.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filelogviewer.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filelogviewer.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filldlg.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/filldlg.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/logviewer.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/logviewer.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/logconsole.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/logconsole.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/pagedlg.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/pagedlg.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/dialogs/palcoldlg.py
@@ -127,14 +135,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/controllers/trafo_ctrl.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/controllers/trafo_ctrl.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/controllers/zoom_ctrl.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/controllers/zoom_ctrl.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/ctx_menu.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/ctx_menu.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/docarea.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/docarea.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/eventloop.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/eventloop.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/kbd_proc.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/kbd_proc.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/presenter.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/presenter.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/renderer.py
@@ -145,8 +147,6 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/selection.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/selection.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/snapping.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/snapping.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/viewer.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/document/viewer.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/events.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/events.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/modes.py
@@ -157,8 +157,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/artprovider.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/artprovider.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/ctxpanel.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/ctxpanel.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/doctabpanel.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/doctabpanel.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/doctabs.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/doctabs.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/mdiarea.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/mdiarea.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/menubar.py
@@ -169,8 +169,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/palettepanel.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/palettepanel.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgarea.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgarea.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgtabpanel.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgtabpanel.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgtabs.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/plgtabs.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/statusbar.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/statusbar.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/parts/stubpanel.py
@@ -247,20 +247,22 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/colorbtn.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/colorbtn.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/colorctrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/colorctrls.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/ctx_menu.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/ctx_menu.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/ctxmenu.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/ctxmenu.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/fillctrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/fillctrls.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/fontctrl.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/fontctrl.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/gradientctrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/gradientctrls.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/mactoolbar.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/mactoolbar.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/kbd_proc.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/kbd_proc.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/minipalette.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/minipalette.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette_old.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette_old.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette_viewer.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/palette_viewer.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/patternctrls.py
@@ -269,6 +271,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/patterns.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/patterns.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/strokectrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/strokectrls.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/surfaces.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/surfaces.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/unitctrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/pwidgets/unitctrls.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/resources/__init__.py
@@ -783,6 +787,10 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/icons/win/22x22/gtk-zoom-fit.png
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/icons/win/22x22/gtk-zoom-in.png
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/icons/win/22x22/gtk-zoom-out.png
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/icons/win/22x22/gtk-zoom-page.png
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/locales/es/LC_MESSAGES/sk1.mo
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/locales/pt_BR/LC_MESSAGES/sk1.mo
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/locales/ru/LC_MESSAGES/sk1.mo
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/locales/uk/LC_MESSAGES/sk1.mo
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/pd_plugins/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/pd_plugins/__init__.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/pd_plugins/align_plugin/__init__.py
@@ -864,10 +872,6 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/pd_plugins/transform_plugin/transfor
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/templates/list_printers.vbs
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/templates/print_calibration_a4.sk2
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1/share/templates/print_calibration_letter.sk2
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/PKG-INFO
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/sk1-%%VER%%-py%%PYTHON_VER%%.egg-info/top_level.txt
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/__init__.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/app_palettes.py
@@ -1129,8 +1133,6 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_cms.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_cms.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_config.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_config.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_const.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_const.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_filters.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_filters.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/formats/sk2/sk2_methods.py
@@ -1235,6 +1237,8 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libgeom/trafo.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/__init__.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/_libimg.so
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/handlers.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/handlers.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/magickwand.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libimg/magickwand.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/libpango/__init__.py
@@ -1256,28 +1260,40 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/msgconst.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/msgconst.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/sk2const.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/sk2const.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc2conf.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc2conf.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc2const.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc2const.pyc
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc_conf.py
-lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/uc_conf.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/__init__.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/config.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/config.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/fs.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/fs.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/fsutils.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/fsutils.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/mixutils.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/mixutils.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/sconfig.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/sconfig.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/system.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/system.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/translator.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/uc2/utils/translator.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/__init__.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/__init__.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/artprovider.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/artprovider.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/basic.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/basic.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/canvas.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/canvas.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/clipboard.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/clipboard.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/const.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/const.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/filedlgs.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/filedlgs.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/fontchoice.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/fontchoice.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/gctrls.py
@@ -1286,14 +1302,22 @@ lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/layerlist.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/layerlist.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/listwidgets.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/listwidgets.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/menu.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/menu.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/mixins.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/mixins.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/modaldlgs.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/modaldlgs.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/msgdlgs.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/msgdlgs.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/printing.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/printing.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/renderer.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/renderer.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/stubpanel.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/stubpanel.pyc
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/tabs.py
+lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/tabs.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/togglectrls.py
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/togglectrls.pyc
 lib/sk1-wx-%%VER%%-%%PYTHON_VER%%/wal/treewidgets.py