On 2025/03/08 01:27, David Uhden Collado wrote: > > > In this email, I have attached a preliminary diff for upgrading Lumina > > from version 1.4.0-p1 to version 1.6.2 [1]. I refer to it as a > > preliminary version because it still requires refinement. Although this > > desktop environment appears to build correctly, the package installation > > does not place the files in the appropriate directories. > > > > I have definitively resolved the issue with file installation; the port now > builds and installs correctly. Previously, I thought I had fixed it, but I > hadn't. However, I have not yet tested whether it functions properly when > executed. > > In this email, I have attached the updated diff. > > OKs? Comments?
not ok, it's not ready yet. (not that there's much you can do with an ok yourself anyway..) : Index: ports/x11/lumina/Makefile : =================================================================== : RCS file: /cvs/ports/x11/lumina/Makefile,v : diff -u -p -u -r1.40 Makefile : --- ports/x11/lumina/Makefile 24 Jan 2025 09:20:59 -0000 1.40 : +++ ports/x11/lumina/Makefile 8 Mar 2025 01:20:42 -0000 : @@ -1,17 +1,14 @@ : COMMENT= Lumina Desktop Environment : : -GH_ACCOUNT= trueos : +GH_ACCOUNT= lumina-desktop : GH_PROJECT= lumina : -GH_TAGNAME= v1.4.0-p1 : -PKGNAME= lumina-1.4.0pl1 : -REVISION= 8 : +GH_TAGNAME= v1.6.2 : +PKGNAME= lumina-1.6.2 PKGNAME can just be dropped here, the default is ok. (it was needed before for -p1 -> pl1). (make show=PKGNAMES to confirm) : CATEGORIES= x11 : : HOMEPAGE= https://lumina-desktop.org/ : : -MAINTAINER= Bryan C. Everly <br...@bceassociates.com> : - dropping maintainer should be discussed first before just putting it in a diff. : MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION} : -FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}/ : +FAKE_FLAGS= INSTALL_ROOT=${WRKINST}/usr/local/ INSTALL_ROOT=${WRKINST}${TRUEPREFIX} (not quite sure why INSTALL_ROOT=${PREFIX} doesn't work though) : - mv ${WRKINST}/etc/luminaDesktop.conf.dist \ : + mv ${WRKINST}/usr/local/etc/luminaDesktop.conf.dist \ mv ${PREFIX}/etc/luminaDesktop.conf.dist [...] : - gunzip ${PREFIX}/man/man{1,8}/*.gz : + gunzip ${WRKINST}/usr/local/man/man{1,8}/*.gz those expand to the same thing here but ${PREFIX} is more correct : -lib/qt5/plugins/platformthemes/liblthemeengine.so : -lib/qt5/plugins/styles/ : -lib/qt5/plugins/styles/liblthemeengine-style.so ... : +usr/ : +usr/local/ : +usr/local/lib/ : +usr/local/lib/qt5/ : +usr/local/lib/qt5/plugins/ : +usr/local/lib/qt5/plugins/platformthemes/ : +@so usr/local/lib/qt5/plugins/platformthemes/liblthemeengine.so : +usr/local/lib/qt5/plugins/styles/ : +@so usr/local/lib/qt5/plugins/styles/liblthemeengine-style.so that (i.e. /usr/local/usr/local/lib/qt5/plugins) is definitely wrong : +etc/ that shouldn't be in the package : share/examples/lumina/ : share/examples/lumina/luminaDesktop.conf : @sample ${SYSCONFDIR}/luminaDesktop.conf : +@tag gtk-update-icon-cache %D/share/icons/material-design-dark : +@tag gtk-update-icon-cache %D/share/icons/material-design-light : +@tag update-desktop-database please collect all the @tag together at the bottom : -share/pixmaps/Lumina-DE.png : share/xsessions/ : share/xsessions/Lumina-DE.desktop : -@tag gtk-update-icon-cache %D/share/icons/material-design-dark : -@tag gtk-update-icon-cache %D/share/icons/material-design-light : -@tag update-desktop-database : +@tag gtk-update-icon-cache %D/share/icons/lumina-icons : +@tag gtk-update-icon-cache %D/share/icons/hicolor : Index: ports/x11/lumina/pkg/DESCR : =================================================================== : RCS file: /cvs/ports/x11/lumina/pkg/DESCR,v : diff -u -p -u -r1.3 DESCR : --- ports/x11/lumina/pkg/DESCR 31 Oct 2016 17:49:30 -0000 1.3 : +++ ports/x11/lumina/pkg/DESCR 8 Mar 2025 01:21:42 -0000 : @@ -1 +1,6 @@ : -Lumina-DE is a lightweight, BSD licensed desktop environment. : +The Lumina Desktop Environment is a lightweight system interface that is : +designed for use on any Unix-like operating system. It takes a plugin-based : +approach, allowing the entire interface to be assembled/arranged by each : +individual user as desired, with a system-wide default layout which can be : +setup by the system administrator. This allows every system (or user session) : +to be designed to maximize the individual user's productivity. stray whitespace at the end of each line except the last : : }else : openbsd-*{ : +- isEmpty(PREFIX){ PREFIX=/usr/local } : ++ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! } : OS = OpenBSD : - LIBS += -L/usr/local/lib -L/usr/lib : + LIBS += -L!!LOCALBASE!!/lib -L/usr/lib : -+ isEmpty(L_ETCDIR){ L_ETCDIR=!!SYSCONFDIR!! } : #Use the defaults for everything else this doesn't feel right, looks like a mis-merge by patch?
