4 files changed, 8 insertions, 109 deletions

diff --git a/graphics/uniconvertor/Makefile b/graphics/uniconvertor/Makefile
index 0b4d428562b2..c9ce536c2d31 100644
--- a/graphics/uniconvertor/Makefile
+++ b/graphics/uniconvertor/Makefile
@@ -6,25 +6,17 @@
 #
 
 PORTNAME=	uniconvertor
-PORTVERSION=	1.1.4
-PORTREVISION=	1
+PORTVERSION=	1.1.5
 CATEGORIES=	graphics python
-MASTER_SITES=	http://sk1project.org/downloads/uniconvertor/v${PORTVERSION}/ \
+MASTER_SITES=	GOOGLE_CODE \
 		http://mirror.amdmi3.ru/distfiles/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Universal vector graphics translator
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \
-		${PYTHON_SITELIBDIR}/reportlab/__init__.py:${PORTSDIR}/print/py-reportlab2
-
-CONFLICTS=	yudit-[0-9]* netatalk-[0-9]*
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sk1libs/__init__.py:${PORTSDIR}/graphics/sk1libs
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
 
-PYDISTUTILS_PKGNAME=UniConvertor
-
-WRKSRC=		${WRKDIR}/UniConvertor-${PORTVERSION}
-
 .include <bsd.port.mk>
diff --git a/graphics/uniconvertor/distinfo b/graphics/uniconvertor/distinfo
index c513cbf05e04..253c4548d895 100644
--- a/graphics/uniconvertor/distinfo
+++ b/graphics/uniconvertor/distinfo
@@ -1,3 +1,3 @@
-MD5 (uniconvertor-1.1.4.tar.gz) = 91c2f372191959c9c6da85b6e18e04ee
-SHA256 (uniconvertor-1.1.4.tar.gz) = ff80b194d85da107d9c2e22742b59986c434fdd377aff66b954577437d3c7182
-SIZE (uniconvertor-1.1.4.tar.gz) = 536477
+MD5 (uniconvertor-1.1.5.tar.gz) = d1272315a58304ece2ff588834e23f72
+SHA256 (uniconvertor-1.1.5.tar.gz) = c3a9ecb70779911470e01c6b1950b07fc2fe1880777a1e70e44251323f4d5882
+SIZE (uniconvertor-1.1.5.tar.gz) = 246998
diff --git a/graphics/uniconvertor/pkg-descr b/graphics/uniconvertor/pkg-descr
index 49e5f911a7f7..6a11949d8410 100644
--- a/graphics/uniconvertor/pkg-descr
+++ b/graphics/uniconvertor/pkg-descr
@@ -27,4 +27,4 @@ Export filters:
 * PDF (Portable Document Format)
 * PS (PostScript)
 
-WWW: http://sk1project.org/modules.php?name=Products&product=uniconvertor
+WWW: http://sk1project.org/
diff --git a/graphics/uniconvertor/pkg-plist b/graphics/uniconvertor/pkg-plist
index cc9a86424c66..267013f3d345 100644
--- a/graphics/uniconvertor/pkg-plist
+++ b/graphics/uniconvertor/pkg-plist
@@ -1,4 +1,4 @@
-bin/uniconv
+bin/uniconvertor
 %%PYTHON_SITELIBDIR%%/uniconvertor/COPYRIGHTS
 %%PYTHON_SITELIBDIR%%/uniconvertor/GNU_GPL_v2
 %%PYTHON_SITELIBDIR%%/uniconvertor/GNU_LGPL_v2
@@ -188,88 +188,9 @@ bin/uniconv
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/managers/colormanager.pyo
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/_sketch.so
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/_type1.so
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/descr.txt
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/pstokenize.so
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/skread.so
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules/streamfilter.so
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ailoader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ailoader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ailoader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/aisaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/aisaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/aisaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/bziploader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/bziploader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/bziploader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ccxloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ccxloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/ccxloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrziploader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrziploader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cdrziploader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmsaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmsaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cgmsaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cmxloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cmxloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/cmxloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/drawinput.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/drawinput.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/drawinput.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/gziploader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/gziploader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/gziploader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pdfgensaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pdfgensaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pdfgensaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltsaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltsaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pltsaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pssaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pssaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/pssaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1loader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1loader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1loader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1saver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1saver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sk1saver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/skloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/skloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/skloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sksaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sksaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/sksaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgsaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgsaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/svgsaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfsaver.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfsaver.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/wmfsaver.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/xfigloader.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/xfigloader.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters/xfigloader.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/__init__.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/plugins.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/plugins.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/plugins.pyo
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/__init__.pyo
@@ -295,8 +216,6 @@ bin/uniconv
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/create_text.pyc
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/create_text.pyo
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/export_raster.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/export_raster.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/export_raster.pyo
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/footprints.py
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/footprints.pyc
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts/footprints.pyo
@@ -336,26 +255,14 @@ bin/uniconv
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/locale_utils.py
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/locale_utils.pyc
 %%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/locale_utils.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/os_utils.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/os_utils.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/os_utils.pyo
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/output.py
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/output.pyc
-%%PYTHON_SITELIBDIR%%/uniconvertor/app/utils/output.pyo
 %%PYTHON_SITELIBDIR%%/uniconvertor/share/fonts/descr.txt
-%%PYTHON_SITELIBDIR%%/uniconvertor/share/icc/GenericCMYK.icm
-%%PYTHON_SITELIBDIR%%/uniconvertor/share/icc/sRGB.icm
-%%PYTHON_SITELIBDIR%%/uniconvertor/share/icc/sRGB_Color_Space_Profile.icm
 %%PYTHON_SITELIBDIR%%/uniconvertor/share/ps_templates/sk1-proc.ps
 %%PYTHON_SITELIBDIR%%/uniconvertor/share/ps_templates/sketch-proc.ps
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/share/ps_templates
-@dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/share/icc
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/share/fonts
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/share
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/utils
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins/Filters
-@dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/modules
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/managers
 @dirrm %%PYTHON_SITELIBDIR%%/uniconvertor/app/io