On Mon, Sep 21, 2020 at 10:50:43AM +0200, Landry Breuil wrote:
> On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> > Hi.
> >
> > Next version of devel/py-gobject3 will loose python2 support.
> > Direct dependencies involve:
> >
> > audio/exaile
> > misc/gpsd
>
> Here's a diff for this one, xgps starts fine so i guess the goi imports
> are 'okay' (corresponding python code at
> https://gitlab.com/gpsd/gpsd/-/blob/master/xgps.in#L45)
>
> Bumped REVISION-main (for PLIST changes) and REVISION-x11 (to force the
> xgps update, as MODPY_BIN changes in shebang).
>
> I think i got the depends right, and removed py-gtk2. Dunno if more
> depends should be added on gtk libs ?
You need to add a RUN_DEPENDS on x11/gtk+3 because:
from gi.repository import Gtk
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/Makefile,v
> retrieving revision 1.76
> diff -u -r1.76 Makefile
> --- Makefile 26 Sep 2019 21:59:30 -0000 1.76
> +++ Makefile 21 Sep 2020 08:47:23 -0000
> @@ -9,7 +9,7 @@
> PKGNAME-main= gpsd-${VERSION}
> PKGNAME-x11= gpsd-x11-${VERSION}
> PKGNAME-php= gpsd-php-${VERSION}
> -REVISION-php= 0
> +REVISION= 0
>
> SHARED_LIBS += gps 20.0 # 25.0
> CATEGORIES= misc geo
> @@ -27,6 +27,7 @@
> WANTLIB-php =
>
> MODULES += devel/scons lang/python lang/php
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> MODPHP_BUILDDEP= No
> MODSCONS_FLAGS += gpsd_user=_gpsd \
> qt=no \
> @@ -39,7 +40,7 @@
>
> MULTI_PACKAGES = -main -php -x11
>
> -BUILD_DEPENDS= devel/py-gobject3 \
> +BUILD_DEPENDS= devel/py-gobject3${MODPY_FLAVOR} \
> textproc/xmlto \
> textproc/libxslt \
> textproc/docbook \
> @@ -51,12 +52,11 @@
> x11/dbus \
> ${MODGCC4_CPPLIBDEP}
> RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
> - devel/py-serial
> + devel/py-serial${MODPY_FLAVOR}
>
> RUN_DEPENDS-x11 = ${BASE_PKGPATH} \
> - devel/py-gobject3 \
> - devel/desktop-file-utils \
> - x11/py-gtk2
> + devel/py-gobject3${MODPY_FLAVOR} \
> + devel/desktop-file-utils
>
> # the php display script doesn't depend on having any of gpsd around,
> # it just sits there and looks pretty.
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/misc/gpsd/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -r1.10 PLIST-main
> --- pkg/PLIST-main 31 Jul 2019 15:44:31 -0000 1.10
> +++ pkg/PLIST-main 21 Sep 2020 08:47:23 -0000
> @@ -25,25 +25,26 @@
> lib/python${MODPY_VERSION}/site-packages/gps/
> lib/python${MODPY_VERSION}/site-packages/gps-${VERSION}.egg-info
> lib/python${MODPY_VERSION}/site-packages/gps/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/gps/__init__.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/__init__.${MODPY_PYOEXTENSION}
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}gps.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
> +lib/python${MODPY_VERSION}/site-packages/gps/${MODPY_PYCACHE}watch_options.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gps/client.py
> -lib/python${MODPY_VERSION}/site-packages/gps/client.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/client.${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
> +@so lib/python${MODPY_VERSION}/site-packages/gps/clienthelpers.so
> lib/python${MODPY_VERSION}/site-packages/gps/fake.py
> -lib/python${MODPY_VERSION}/site-packages/gps/fake.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/fake.${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/gps/gps.py
> -lib/python${MODPY_VERSION}/site-packages/gps/gps.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/gps.${MODPY_PYOEXTENSION}
> lib/python${MODPY_VERSION}/site-packages/gps/misc.py
> -lib/python${MODPY_VERSION}/site-packages/gps/misc.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/misc.${MODPY_PYOEXTENSION}
> -lib/python${MODPY_VERSION}/site-packages/gps/packet.so
> +@so lib/python${MODPY_VERSION}/site-packages/gps/packet.so
> lib/python${MODPY_VERSION}/site-packages/gps/watch_options.py
> -lib/python${MODPY_VERSION}/site-packages/gps/watch_options.pyc
> -lib/python${MODPY_VERSION}/site-packages/gps/watch_options.${MODPY_PYOEXTENSION}
> @man man/man1/cgps.1
> @man man/man1/gegps.1
> @man man/man1/gps.1
--
Antoine
