On 2025/11/19 10:24, Chaz Kettleson wrote:
> On Wed, Nov 19, 2025 at 09:15:47AM +0000, Stuart Henderson wrote:
> > On 2025/11/17 08:58, Chaz Kettleson wrote:
> > > Hello,
> > > 
> > > I'm preparing to maintain two separate major versions of openHAB. The
> > > below diff updates the 4x line to 4.3.8, and prepares the tree for a
> > > future 5x (with new PLIST). I've looked at other ports to see how best
> > > to do this.
> > > 
> > > Comments? Feedback? OK?
> > 
> > committed, with small tweaks to PLIST (@pkgpath marker required for
> > the update to work, that shouldn't be added to 5x PLIST, and @conflict
> > and @option is-branch, which should).
> > 
> 
> Hi Stuart,
> 
> Thank you.
> 
> It seems the toplevel pkg directory was deleted. This is the tree I was
> expecting:
> 
> |-- 4
> |   |-- Makefile
> |   |-- distinfo
> |   `-- pkg
> |       `-- PLIST
> |-- Makefile
> |-- Makefile.inc
> |-- files
> |   `-- openhab.conf
> `-- pkg
>     |-- DESCR
>     |-- README
>     `-- openhab.rc
> 
> I had adjusted the Makefile.inc with:
> 
> DESCR=          ${.CURDIR}/../pkg/DESCR
> FILESDIR=       ${.CURDIR}/../files
> 
> as well as the do-install to add:
> 
> ${SUBST_CMD} -c -m 555 ${.CURDIR}/../pkg/openhab.rc ${WRKINST}${RCDIR}/openhab
> ${SUBST_DATA} ${.CURDIR}/../pkg/README \
>         ${WRKINST}${LOCALBASE}/share/doc/pkg-readmes/${PKGSTEM}
> 
> -- 
> Chaz

yes, missed readding them after I'd figured out that the git diff didn't
actually move all the files. should be fixed now.