Re: x11/openbox diff for py3-xdg

On 07/11/2022 23:21, Stuart Henderson wrote:
> On 2022/11/04 12:45, Heppler, J. Scott wrote:
>> Attached is a diff that upgrades py-xdg to py3-xdg in openbox.
>> Tested on amd64.
>>
>> Thanks to Stuart Henderson for the python 2to3 magic.
>
> re-CC'ing maintainer (who was CC'd when I sent my diff earlier).

ok benoit@ for your diff

>
>> Index: x11/openbox/Makefile
>> ===================================================================
>> RCS file: /cvs/ports/x11/openbox/Makefile,v
>> retrieving revision 1.88
>> diff -u -p -u -r1.88 Makefile
>> --- x11/openbox/Makefile 1 Apr 2022 19:09:43 -0000 1.88
>> +++ x11/openbox/Makefile 4 Nov 2022 19:11:05 -0000
>> @@ -1,7 +1,7 @@
>> COMMENT = small, fast & usable window manager
>>
>> V = 3.6.1
>> -REVISION = 9
>> +REVISION = 10
>> DISTNAME = openbox-${V}
>> SHARED_LIBS += obrender 12.0 # 32.0
>> SHARED_LIBS += obt 1.1 # 2.2
>> @@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
>> MASTER_SITES = ${HOMEPAGE}dist/openbox/
>>
>> MODULES = lang/python
>> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
>>
>> -RUN_DEPENDS = devel/py-xdg \
>> +RUN_DEPENDS = devel/py-xdg${MODPY_FLAVOR} \
>> devel/desktop-file-utils
>> LIB_DEPENDS += devel/gettext,-runtime \
>> devel/pango \
>> @@ -50,10 +49,11 @@ MODPY_ADJ_FILES =data/autostart/openbox-
>>
>> CONFIGURE_STYLE = gnu
>> CONFIGURE_ARGS = --docdir=${PREFIX}/share/examples/openbox
>> -CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
>> - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>> +CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}"
>
> Why change CONFIGURE_ENV? (There's no reason to remove it, and there's
> a chance that doing so will break the port on some archs).
>
> Otherwise it's basically the same as my diff.
>
> I don't use this, but if $MAINTAINER is ok then it would be nice to
> get rid of py2 from x11/openbox and devel/py-xdg. (x11/obmenu will be more
> tricky).
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/openbox/Makefile,v
> retrieving revision 1.88
> diff -u -p -r1.88 Makefile
> --- Makefile 1 Apr 2022 19:09:43 -0000 1.88
> +++ Makefile 7 Nov 2022 22:12:54 -0000
> @@ -1,7 +1,7 @@
> COMMENT = small, fast & usable window manager
>
> V = 3.6.1
> -REVISION = 9
> +REVISION = 10
> DISTNAME = openbox-${V}
> SHARED_LIBS += obrender 12.0 # 32.0
> SHARED_LIBS += obt 1.1 # 2.2
> @@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
> MASTER_SITES = ${HOMEPAGE}dist/openbox/
>
> MODULES = lang/python
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
>
> -RUN_DEPENDS = devel/py-xdg \
> +RUN_DEPENDS = devel/py-xdg${MODPY_FLAVOR} \
> devel/desktop-file-utils
> LIB_DEPENDS += devel/gettext,-runtime \
> devel/pango \
> @@ -55,5 +54,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
>
> pre-configure:
> ${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
> + 2to3 --fix=all --no-diffs --nobackups --verbose --write \
> + ${WRKSRC}/data/autostart/openbox-xdg-autostart
>
> .include <bsd.port.mk>
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
> retrieving revision 1.31
> diff -u -p -r1.31 PLIST
> --- pkg/PLIST 11 Mar 2022 20:16:51 -0000 1.31
> +++ pkg/PLIST 7 Nov 2022 22:12:54 -0000
> @@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
> include/openbox/${API_V}/obt/version.h
> include/openbox/${API_V}/obt/xml.h
> include/openbox/${API_V}/obt/xqueue.h
> -lib/libobrender.a
> +@static-lib lib/libobrender.a
> lib/libobrender.la
> @lib lib/libobrender.so.${LIBobrender_VERSION}
> -lib/libobt.a
> +@static-lib lib/libobt.a
> lib/libobt.la
> @lib lib/libobt.so.${LIBobt_VERSION}
> lib/pkgconfig/obrender-3.5.pc
>