On Wed, Mar 04, 2026 at 03:42:20PM +0000, Stuart Henderson wrote: > Hi, here's a little tweak for niri, > > - start COMMENT with lowercase and don't use A > - use DIST_TUPLE to fetch the distfiles, it's neater when you need > multiple files from github > - regen PLIST (the share/applications/ dir disappears after adding > a RUN_DEPENDS on desktop-file-utils) > > ok?
I haven't build tested them but they all look ok to me > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/wayland/niri/Makefile,v > diff -u -p -r1.4 Makefile > --- Makefile 20 Feb 2026 18:56:41 -0000 1.4 > +++ Makefile 4 Mar 2026 15:38:47 -0000 > @@ -1,31 +1,14 @@ > -COMMENT = A scrollable-tiling Wayland compositor > +COMMENT = scrollable-tiling Wayland compositor > > -V = 25.11.20260220 > +PKGNAME = niri-25.11.20260220 > +REVISION = 0 > > # Use https://github.com/tobhe/niri/tree/openbsd-port until all > # the dependency fixes have propagated to the actual rust packages > -GH_ACCOUNT = tobhe > -GH_PROJECT = niri > -GH_COMMIT = 097810ed0e7ef944fa7bca0947f41b9c34cd89f4 > -DISTNAME = ${GH_PROJECT}-${V} > - > -# Bundled dependencies > -SITES += ${SITES_GITHUB} > -DISTFILES = ${GH_DISTFILE} > - > -EXTRACT_SUFX = .tar.gz > - > -DRM_COMMIT = ea05145076d7b81c1b99656923e6ee539590d654 > -SITES.drm = https://github.com/tobhe/drm-rs/archive/ > -DISTFILES.drm = > drm-rs-${DRM_COMMIT:C/(........).*/\1/}{${DRM_COMMIT}}${EXTRACT_SUFX} > - > -SMITHAY_COMMIT = adf3bfddc019c8950deb650f4ed442c0312e0ea8 > -SITES.smithay = https://github.com/tobhe/smithay/archive/ > -DISTFILES.smithay += > smithay-${SMITHAY_COMMIT:C/(........).*/\1/}{${SMITHAY_COMMIT}}${EXTRACT_SUFX} > - > -POLLING_COMMIT = e838a159551ccbdc7a4c39a51fa36430615f8d34 > -SITES.polling = https://github.com/tobhe/polling/archive/ > -DISTFILES.polling += > polling-${POLLING_COMMIT:C/(........).*/\1/}{${POLLING_COMMIT}}${EXTRACT_SUFX} > +DIST_TUPLE += github tobhe niri > 097810ed0e7ef944fa7bca0947f41b9c34cd89f4 . > +DIST_TUPLE += github tobhe drm-rs > ea05145076d7b81c1b99656923e6ee539590d654 . > +DIST_TUPLE += github tobhe smithay > adf3bfddc019c8950deb650f4ed442c0312e0ea8 . > +DIST_TUPLE += github tobhe polling > e838a159551ccbdc7a4c39a51fa36430615f8d34 . > > MODCARGO_NO_DEFAULT_FEATURES = Yes > MODCARGO_FEATURES = > Index: distinfo > =================================================================== > RCS file: /cvs/ports/wayland/niri/distinfo,v > diff -u -p -r1.4 distinfo > --- distinfo 20 Feb 2026 18:56:41 -0000 1.4 > +++ distinfo 4 Mar 2026 15:38:47 -0000 > @@ -512,10 +512,10 @@ SHA256 (cargo/zerovec-derive-0.10.3.tar. > SHA256 (cargo/zvariant-5.7.0.tar.gz) = > mZ3TvnPFKx/M0QmkqB5PzSD6sdNZnIEhs40E4UGUmNs= > SHA256 (cargo/zvariant_derive-5.7.0.tar.gz) = > ZkP9CyakbSJr2Q0/B8G1Mh/pu38EZzyzesbWiDiFto4= > SHA256 (cargo/zvariant_utils-3.2.1.tar.gz) = > xpSdFC+J9pFt7KIjLPJqivrPK5/cNc52YQXhBEeL5Zk= > -SHA256 (drm-rs-ea051450.tar.gz) = > /kQpiGQwa8+ROPAhovfFbBo6svGWE0yOphbCja4RoVE= > -SHA256 (niri-25.11.20260220-097810ed.tar.gz) = > CueEUIHBiCKsDI+M5hIebaZSKXjyfrsgLjpfU7D30G0= > -SHA256 (polling-e838a159.tar.gz) = > Uhm2K9XdIvILddfgz5w/t1y8vuKjJ4fnXLTOowAdA0k= > -SHA256 (smithay-adf3bfdd.tar.gz) = > Nh3/9bSov/i7CWdZMafrQNfn1lhoPk3+bv10ArR749U= > +SHA256 (tobhe-drm-rs-ea05145076d7b81c1b99656923e6ee539590d654.tar.gz) = > /kQpiGQwa8+ROPAhovfFbBo6svGWE0yOphbCja4RoVE= > +SHA256 (tobhe-niri-097810ed0e7ef944fa7bca0947f41b9c34cd89f4.tar.gz) = > CueEUIHBiCKsDI+M5hIebaZSKXjyfrsgLjpfU7D30G0= > +SHA256 (tobhe-polling-e838a159551ccbdc7a4c39a51fa36430615f8d34.tar.gz) = > Uhm2K9XdIvILddfgz5w/t1y8vuKjJ4fnXLTOowAdA0k= > +SHA256 (tobhe-smithay-adf3bfddc019c8950deb650f4ed442c0312e0ea8.tar.gz) = > Nh3/9bSov/i7CWdZMafrQNfn1lhoPk3+bv10ArR749U= > SIZE (cargo/accesskit-0.21.0.tar.gz) = 34158 > SIZE (cargo/accesskit_atspi_common-0.14.0.tar.gz) = 25918 > SIZE (cargo/accesskit_consumer-0.30.0.tar.gz) = 33463 > @@ -1030,7 +1030,7 @@ SIZE (cargo/zerovec-derive-0.10.3.tar.gz > SIZE (cargo/zvariant-5.7.0.tar.gz) = 90643 > SIZE (cargo/zvariant_derive-5.7.0.tar.gz) = 14214 > SIZE (cargo/zvariant_utils-3.2.1.tar.gz) = 14678 > -SIZE (drm-rs-ea051450.tar.gz) = 69105 > -SIZE (niri-25.11.20260220-097810ed.tar.gz) = 915582 > -SIZE (polling-e838a159.tar.gz) = 59436 > -SIZE (smithay-adf3bfdd.tar.gz) = 798113 > +SIZE (tobhe-drm-rs-ea05145076d7b81c1b99656923e6ee539590d654.tar.gz) = 69105 > +SIZE (tobhe-niri-097810ed0e7ef944fa7bca0947f41b9c34cd89f4.tar.gz) = 915582 > +SIZE (tobhe-polling-e838a159551ccbdc7a4c39a51fa36430615f8d34.tar.gz) = 59436 > +SIZE (tobhe-smithay-adf3bfddc019c8950deb650f4ed442c0312e0ea8.tar.gz) = 798113 > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/wayland/niri/pkg/PLIST,v > diff -u -p -r1.2 PLIST > --- pkg/PLIST 11 Feb 2026 17:19:06 -0000 1.2 > +++ pkg/PLIST 4 Mar 2026 15:38:47 -0000 > @@ -1,6 +1,5 @@ > @bin bin/niri > bin/startniri.sh > -share/applications/ > share/applications/niri.desktop > share/doc/pkg-readmes/${PKGSTEM} > share/examples/niri/
