diff --git a/astro/kosmorro/Makefile b/astro/kosmorro/Makefile
index 508c8af6502a2..691353a361f59 100644
--- a/astro/kosmorro/Makefile
+++ b/astro/kosmorro/Makefile
@@ -1,7 +1,7 @@
 # Created by: thierry@pompo.net
 
 PORTNAME=	kosmorro
-PORTVERSION=	0.9.0
+PORTVERSION=	0.10.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	astro python
 
@@ -10,19 +10,14 @@ COMMENT=	Ephemerides computation
 
 LICENSE=	AGPLv3
 
-BUILD_DEPENDS=	${PYNUMPY}	\
-		${PYTHON_PKGNAMEPREFIX}skyfield>0:astro/py-skyfield@${PY_FLAVOR}\
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}
-RUN_DEPENDS=	${PYNUMPY}	\
-		${PYTHON_PKGNAMEPREFIX}skyfield>0:astro/py-skyfield@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
 		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}tabulate>0:devel/py-tabulate@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pipenv>0:devel/py-pipenv@${PY_FLAVOR}	\
-		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR}\
-		${PYTHON_PKGNAMEPREFIX}unittest2>0:devel/py-unittest2@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}termcolor>0:devel/py-termcolor@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}kosmorrolib>0:astro/py-kosmorrolib@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 
@@ -58,8 +53,4 @@ post-build:
 	(cd ${WRKSRC} && LC_ALL=C.UTF-8 ${MAKE} manpages)
 .endif
 
-do-test: install
-	#(cd ${WRKSRC} && ${MAKE} test)
-	${DO_NADA} # It uses unittest-data-provider which is deprecated
-
 .include <bsd.port.post.mk>
diff --git a/astro/kosmorro/distinfo b/astro/kosmorro/distinfo
index 54f9e679ae17c..66ed154ccc67d 100644
--- a/astro/kosmorro/distinfo
+++ b/astro/kosmorro/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613319434
-SHA256 (kosmorro-kosmorro-v0.9.0_GH0.tar.gz) = c875c5f31946e0ebc23e9a8b0564f318f5c752fc43d17f412105133920f79620
-SIZE (kosmorro-kosmorro-v0.9.0_GH0.tar.gz) = 532125
+TIMESTAMP = 1622577025
+SHA256 (kosmorro-kosmorro-v0.10.0_GH0.tar.gz) = b8cba4dcdfe7997d5fa91dde11bf727a05f30b159f0b0e24a1e851205616f992
+SIZE (kosmorro-kosmorro-v0.10.0_GH0.tar.gz) = 534814
diff --git a/astro/kosmorro/pkg-plist b/astro/kosmorro/pkg-plist
index 0b767fc388ddb..3adf96711aa63 100644
--- a/astro/kosmorro/pkg-plist
+++ b/astro/kosmorro/pkg-plist
@@ -1,92 +1,72 @@
 bin/kosmorro
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__init__.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/dateutil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/dateutil.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/enum.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/enum.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/ephemerides.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/ephemerides.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/events.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/events.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/exceptions.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/__pycache__/version.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/first-quarter.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/full-moon.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/last-quarter.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/new-moon.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/unknown.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/waning-crescent.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/waning-gibbous.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/waxing-crescent.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/png/waxing-gibbous.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/first-quarter.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/full-moon.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/last-quarter.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/new-moon.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/unknown.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/waning-crescent.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/waning-gibbous.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/waxing-crescent.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/moonphases/svg/waxing-gibbous.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/pdf/kosmorro.sty
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/pdf/template.tex
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/png/kosmorro-icon-white.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/png/kosmorro-icon.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/png/kosmorro-logo-white.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/png/kosmorro-logo.png
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/svg/kosmorro-icon-white.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/svg/kosmorro-icon.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/svg/kosmorro-logo-white.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/assets/svg/kosmorro-logo.svg
-%%PYTHON_SITELIBDIR%%/kosmorrolib/core.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/data.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/dateutil.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/dumper.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/enum.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/ephemerides.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/events.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/exceptions.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/i18n.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/locales/messages.pot
-%%PYTHON_SITELIBDIR%%/kosmorrolib/main.py
-%%PYTHON_SITELIBDIR%%/kosmorrolib/version.py
-%%PYTHON_SITELIBDIR%%/test/__init__.py
-%%PYTHON_SITELIBDIR%%/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/core.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/dateutil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/dateutil.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/dumper.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/ephemerides.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/ephemerides.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/events.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/events.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/testutils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/test/__pycache__/testutils.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/test/core.py
-%%PYTHON_SITELIBDIR%%/test/data.py
-%%PYTHON_SITELIBDIR%%/test/dateutil.py
-%%PYTHON_SITELIBDIR%%/test/dumper.py
-%%PYTHON_SITELIBDIR%%/test/ephemerides.py
-%%PYTHON_SITELIBDIR%%/test/events.py
-%%PYTHON_SITELIBDIR%%/test/testutils.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/__init__.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/__version__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/date%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/date%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/debug%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/debug%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/dumper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/dumper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/environment%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/environment%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/exceptions%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/__version__.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/first-quarter.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/full-moon.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/last-quarter.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/new-moon.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/unknown.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/waning-crescent.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/waning-gibbous.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/waxing-crescent.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/png/waxing-gibbous.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/first-quarter.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/full-moon.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/last-quarter.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/new-moon.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/unknown.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/waning-crescent.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/waning-gibbous.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/waxing-crescent.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/moonphases/svg/waxing-gibbous.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/pdf/kosmorro.sty
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/pdf/template.tex
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/png/kosmorro-icon-white.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/png/kosmorro-icon.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/png/kosmorro-logo-white.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/png/kosmorro-logo.png
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/svg/kosmorro-icon-white.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/svg/kosmorro-icon.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/svg/kosmorro-logo-white.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/assets/svg/kosmorro-logo.svg
+%%PYTHON_SITELIBDIR%%/_kosmorro/date.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/debug.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/dumper.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/environment.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/exceptions.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__init__.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/strings%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/strings%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/strings.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/i18n/utils.py
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/de/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/en_XA/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/es/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/fr/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/messages.pot
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/nb_NO/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/nl/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/locales/ru/LC_MESSAGES/messages.po
+%%PYTHON_SITELIBDIR%%/_kosmorro/main.py
 %%MAN%%man/man1/kosmorro.1.gz
 %%MAN%%man/man7/kosmorro.7.gz