> On 2020/09/09 17:29, Bjorn Ketelaars wrote: > Please sort RDEPS, and group MODPY_*. Done.
> 'make test' fails. Maybe this is something that can be fixed by > MODPY_ADJ_FILES? On Wed, Sep 9, 2020 at 2:05 PM Stuart Henderson <s...@spacehopper.org> wrote: > or symlink MODPY_BIN to WRKDIR/bin/python .. I think is better to just call to each file. It seems that They are moving to pytest on the next version: https://github.com/gnome-terminator/terminator/blob/master/pytest.ini So, changes will be needed anyways... Let me know what you guys think. Cheers. mariani@ Index: Makefile =================================================================== RCS file: /cvs/ports/x11/terminator/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- Makefile 12 Jul 2019 20:51:22 -0000 1.21 +++ Makefile 9 Sep 2020 20:21:32 -0000 @@ -2,36 +2,42 @@ COMMENT = GTK3 terminal emulator with split-window and tabs support -MODPY_EGG_VERSION = 1.91 -DISTNAME = terminator-${MODPY_EGG_VERSION} -REVISION = 1 +VERSION = 1.92 +DISTNAME = terminator-${VERSION} CATEGORIES = x11 -HOMEPAGE = https://gnometerminator.blogspot.com/p/introduction.html +HOMEPAGE = https://gnome-terminator.org # GPLv2 PERMIT_PACKAGE= Yes -MASTER_SITES = https://launchpad.net/terminator/gtk3/${MODPY_EGG_VERSION}/+download/ +MASTER_SITES = https://github.com/gnome-terminator/terminator/releases/download/v${VERSION}/ MODULES = lang/python \ textproc/intltool RUN_DEPENDS = devel/desktop-file-utils \ devel/gsettings-desktop-schemas \ - devel/py-gobject3 \ - devel/py-notify \ + devel/libnotify \ + devel/py-configobj${MODPY_FLAVOR} \ + devel/py-gobject3${MODPY_FLAVOR} \ devel/vte3 \ - sysutils/py-psutil \ - x11/gtk+3,-guic \ + sysutils/py-psutil${MODPY_FLAVOR} \ x11/gtk+3 \ + x11/gtk+3,-guic \ x11/keybinder3 MODPY_SETUPTOOLS = Yes MODPY_SETUP_ARGS = --without-icon-cache +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} # --single-version-externally-managed option used by MODPY doesn't exist MODPY_DISTUTILS_INSTALL = install --prefix=${LOCALBASE} --root=${DESTDIR} + +do-test: + ${MODPY_BIN} ${WRKDIST}/tests/test_doctests.py + ${MODPY_BIN} ${WRKDIST}/tests/testborg.py + ${MODPY_BIN} ${WRKDIST}/tests/testsignalman.py .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/x11/terminator/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- distinfo 26 Jun 2018 21:25:04 -0000 1.5 +++ distinfo 9 Sep 2020 20:21:32 -0000 @@ -1,2 +1,2 @@ -SHA256 (terminator-1.91.tar.gz) = lfduPAJTlW0ZzqsvjacJpJbxuc+bHFuNPNC22jzHvmk= -SIZE (terminator-1.91.tar.gz) = 910536 +SHA256 (terminator-1.92.tar.gz) = H5TWdq1CyBThWeY3TcqB5OaKwfA/IBM5W6mbacF1c/E= +SIZE (terminator-1.92.tar.gz) = 910613 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/x11/terminator/pkg/PLIST,v retrieving revision 1.9 diff -u -p -r1.9 PLIST --- pkg/PLIST 29 Jun 2018 22:16:35 -0000 1.9 +++ pkg/PLIST 9 Sep 2020 20:21:32 -0000 @@ -2,90 +2,85 @@ bin/remotinator bin/terminator bin/terminator.wrapper -lib/python${MODPY_VERSION}/site-packages/terminator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/terminator-1.92-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/terminatorlib/ lib/python${MODPY_VERSION}/site-packages/terminatorlib/__init__.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}borg.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}container.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}cwd.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}debugserver.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}editablelabel.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}ipc.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}keybindings.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}layoutlauncher.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}notebook.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}optionparse.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}paned.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}prefseditor.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}searchbar.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}signalman.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}terminal.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}terminal_popup_menu.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}terminator.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}titlebar.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}translation.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/${MODPY_PYCACHE}window.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/borg.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/borg.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/config.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/config.pyc -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/ -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/__init__.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/configobj.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/configobj.pyc -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/validate.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/configobj/validate.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/container.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/container.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/cwd.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/cwd.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/debugserver.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/debugserver.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/editablelabel.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/editablelabel.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/encoding.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/encoding.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/factory.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/factory.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/freebsd.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/freebsd.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/ipc.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/ipc.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/keybindings.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/keybindings.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/layoutlauncher.glade lib/python${MODPY_VERSION}/site-packages/terminatorlib/layoutlauncher.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/layoutlauncher.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/notebook.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/notebook.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/optionparse.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/optionparse.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/paned.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/paned.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugin.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugin.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/ lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/__init__.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/__init__.pyc +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}activitywatch.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}custom_commands.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}maven.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}terminalshot.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}testplugin.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/${MODPY_PYCACHE}url_handlers.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/activitywatch.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/activitywatch.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/custom_commands.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/custom_commands.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/logger.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/logger.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/maven.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/maven.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/terminalshot.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/terminalshot.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/testplugin.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/testplugin.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/url_handlers.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/plugins/url_handlers.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/preferences.glade lib/python${MODPY_VERSION}/site-packages/terminatorlib/prefseditor.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/prefseditor.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/searchbar.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/searchbar.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/signalman.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/signalman.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminal.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminal.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminal_popup_menu.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminal_popup_menu.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminator.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/terminator.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/titlebar.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/titlebar.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/translation.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/translation.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/util.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/util.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/version.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/version.pyc lib/python${MODPY_VERSION}/site-packages/terminatorlib/window.py -lib/python${MODPY_VERSION}/site-packages/terminatorlib/window.pyc @man man/man1/terminator.1 @man man/man5/terminator_config.5 share/appdata/ @@ -168,8 +163,6 @@ share/locale/bn/LC_MESSAGES/terminator.m share/locale/bs/LC_MESSAGES/terminator.mo share/locale/ca/LC_MESSAGES/terminator.mo share/locale/ca@valencia/LC_MESSAGES/terminator.mo -share/locale/ckb/ -share/locale/ckb/LC_MESSAGES/ share/locale/ckb/LC_MESSAGES/terminator.mo share/locale/cs/LC_MESSAGES/terminator.mo share/locale/da/LC_MESSAGES/terminator.mo @@ -240,6 +233,9 @@ share/locale/su/ share/locale/su/LC_MESSAGES/ share/locale/su/LC_MESSAGES/terminator.mo share/locale/sv/LC_MESSAGES/terminator.mo +share/locale/sw/ +share/locale/sw/LC_MESSAGES/ +share/locale/sw/LC_MESSAGES/terminator.mo share/locale/ta/LC_MESSAGES/terminator.mo share/locale/te/LC_MESSAGES/terminator.mo share/locale/th/LC_MESSAGES/terminator.mo
