Stuart
Thanks so much for the help. Commit away!
On Sat, Jan 7, 2017 at 7:26 PM Stuart Henderson <s...@spacehopper.org> wrote:
> On 2017/01/07 11:04, Bryan C. Everly wrote:
>
> > On Sat, Jan 7, 2017 at 8:29 AM, Stuart Henderson <s...@spacehopper.org>
> wrote:
>
> > > On 2017/01/06 20:15, Ryan Freeman wrote:
>
> > >> I edited those changes in by hand. The only thing that sticks out at
> me
>
> > >> that might be a preferred change is to strike the dash between the
> version
>
> > >> and the p1 part, so the package name becomes lumina-1.2.0p1...
>
> > >
>
> > > Neither lumina-1.2.0-p1 nor lumina-1.2.0p1 are allowed (the former is
>
> > > treated as a flavour, the latter conflicts with future use of
> REVISION).
>
> > > Use PKGNAME=lumina-1.2.0pl1 or PKGNAME=lumina-${GH_TAGNAME:S/-p/pl/}.
>
> > >
>
> >
>
> > Thanks Stu. I've attached an updated diff that should resolve any
>
> > remaining issues as it incorporates everyone's feedback.
>
>
>
> > GH_PROJECT= lumina
>
> > -GH_TAGNAME= v1.1.0
>
> > -REVISION= 0
>
> > +GH_TAGNAME= v1.2.0-p1
>
> >
>
> > -SHARED_LIBS += LuminaUtils 1.1 # 1.1
>
> > +PKGNAME=lumina-1.2.0p1
>
> ^^
>
> As mentioned, this conflicts with any future use of REVISION.
>
>
>
> > +SHARED_LIBS += LuminaUtils 1.2 # 1.2
>
> ..
>
> > -@lib lib/libLuminaUtils.so.${LIBLuminaUtils_VERSION}
>
>
>
> The library was removed, so SHARED_LIBS is no longer useful
>
> (and if it was still useful, there are rules about when to change
>
> that, which should be in the ports faq, at least I hope they've
>
> survive the faq trimming :) -- and setting LIBLuminaUtils_VERSION
>
> is also surplus.
>
>
>
> Here's a fixed version, and reorder the Makefile a bit according to
>
> the usual ordering while there. (Builds OK, it doesn't run well under
>
> Xephyr so I haven't really done runtime testing as I don't want to
>
> rearrange that much to test), if that's ok with you I can commit it.
>
>
>
> Index: Makefile
>
> ===================================================================
>
> RCS file: /cvs/ports/x11/lumina/Makefile,v
>
> retrieving revision 1.21
>
> diff -u -p -r1.21 Makefile
>
> --- Makefile 25 Dec 2016 14:34:40 -0000 1.21
>
> +++ Makefile 8 Jan 2017 00:20:58 -0000
>
> @@ -4,24 +4,23 @@ COMMENT= Lumina Desktop Environment
>
>
>
> GH_ACCOUNT= trueos
>
> GH_PROJECT= lumina
>
> -GH_TAGNAME= v1.1.0
>
> -REVISION= 0
>
> -
>
> -SHARED_LIBS += LuminaUtils 1.1 # 1.1
>
> +GH_TAGNAME= v1.2.0-p1
>
> +PKGNAME= lumina-${GH_TAGNAME:S/v//:S/-p/pl/}
>
>
>
> CATEGORIES= x11
>
> -MAINTAINER= Bryan C. Everly <br...@bceassociates.com>
>
> +
>
> HOMEPAGE= http://lumina-desktop.org/
>
>
>
> +MAINTAINER= Bryan C. Everly <br...@bceassociates.com>
>
> +
>
> +# BSD
>
> +PERMIT_PACKAGE_CDROM= Yes
>
> +
>
> WANTLIB += GL Qt5Concurrent Qt5Core Qt5Gui Qt5Multimedia
> Qt5MultimediaWidgets
>
> WANTLIB += Qt5Network Qt5Svg Qt5Widgets Qt5X11Extras Xdamage c
>
> WANTLIB += m pthread xcb xcb-composite xcb-damage xcb-ewmh xcb-icccm
>
> WANTLIB += xcb-image xcb-util
>
>
>
> -# BSD
>
> -PERMIT_PACKAGE_CDROM= Yes
>
> -NO_TEST= Yes
>
> -
>
> MODULES= x11/qt5
>
>
>
> RUN_DEPENDS= devel/desktop-file-utils \
>
> @@ -38,13 +37,16 @@ LIB_DEPENDS= x11/qt5/qtmultimedia \
>
> MAKE_FLAGS= LIBLuminaUtils_VERSION=${LIBLuminaUtils_VERSION}
>
> FAKE_FLAGS= INSTALL_ROOT=${DESTDIR}/
>
>
>
> +NO_TEST= Yes
>
> +
>
> pre-configure:
>
> sed -i -e "s,!!LOCALBASE!!,${LOCALBASE}," \
>
> -e "s,!!SYSCONFDIR!!,${SYSCONFDIR}," \
>
> ${WRKSRC}/src-qt5/OS-detect.pri
>
>
>
> do-configure:
>
> - cd ${WRKSRC} && ${LOCALBASE}/bin/qmake-qt5 CONFIG+="configure
> WITH_I18N"
>
> + cd ${WRKSRC} && ${LOCALBASE}/bin/qmake-qt5 \
>
> + CONFIG+="configure WITH_I18N NO_XINPUT"
>
>
>
> post-install:
>
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/lumina
>
> Index: distinfo
>
> ===================================================================
>
> RCS file: /cvs/ports/x11/lumina/distinfo,v
>
> retrieving revision 1.15
>
> diff -u -p -r1.15 distinfo
>
> --- distinfo 31 Oct 2016 17:49:30 -0000 1.15
>
> +++ distinfo 8 Jan 2017 00:20:58 -0000
>
> @@ -1,2 +1,2 @@
>
> -SHA256 (lumina-1.1.0.tar.gz) =
> trTrnGcfDu+XYLD72T69mSJIrGGcxwJRhfw/gtagA3M=
>
> -SIZE (lumina-1.1.0.tar.gz) = 55828227
>
> +SHA256 (lumina-1.2.0-p1.tar.gz) =
> +DZiEv4/KQOcX+vvW03pepLrckg+LZf1wIbt+PxlvUk=
>
> +SIZE (lumina-1.2.0-p1.tar.gz) = 56032695
>
> Index: pkg/PLIST
>
> ===================================================================
>
> RCS file: /cvs/ports/x11/lumina/pkg/PLIST,v
>
> retrieving revision 1.12
>
> diff -u -p -r1.12 PLIST
>
> --- pkg/PLIST 31 Oct 2016 17:49:30 -0000 1.12
>
> +++ pkg/PLIST 8 Jan 2017 00:20:58 -0000
>
> @@ -2,6 +2,7 @@
>
> @pkgpath x11/lumina/i18n
>
> @pkgpath x11/lumina/lumina
>
> bin/lte
>
> +@bin bin/lumina-archiver
>
> @bin bin/lumina-calculator
>
> @bin bin/lumina-config
>
> @bin bin/lumina-desktop
>
> @@ -14,13 +15,7 @@ bin/lte
>
> @bin bin/lumina-textedit
>
> @bin bin/lumina-xconfig
>
> @bin bin/start-lumina-desktop
>
> -include/LuminaOS.h
>
> -include/LuminaSingleApplication.h
>
> -include/LuminaThemes.h
>
> -include/LuminaUtils.h
>
> -include/LuminaX11.h
>
> -include/LuminaXDG.h
>
> -@lib lib/libLuminaUtils.so.${LIBLuminaUtils_VERSION}
>
> +share/applications/lumina-archiver.desktop
>
> share/applications/lumina-calculator.desktop
>
> share/applications/lumina-config.desktop
>
> share/applications/lumina-fileinfo.desktop
>
> @@ -55,6 +50,68 @@ share/lumina-desktop/fluxbox-init-rc
>
> share/lumina-desktop/fluxbox-keys
>
> share/lumina-desktop/globs2
>
> share/lumina-desktop/i18n/
>
> +share/lumina-desktop/i18n/l-archiver_af.qm
>
> +share/lumina-desktop/i18n/l-archiver_ar.qm
>
> +share/lumina-desktop/i18n/l-archiver_az.qm
>
> +share/lumina-desktop/i18n/l-archiver_bg.qm
>
> +share/lumina-desktop/i18n/l-archiver_bn.qm
>
> +share/lumina-desktop/i18n/l-archiver_bs.qm
>
> +share/lumina-desktop/i18n/l-archiver_ca.qm
>
> +share/lumina-desktop/i18n/l-archiver_cs.qm
>
> +share/lumina-desktop/i18n/l-archiver_cy.qm
>
> +share/lumina-desktop/i18n/l-archiver_da.qm
>
> +share/lumina-desktop/i18n/l-archiver_de.qm
>
> +share/lumina-desktop/i18n/l-archiver_el.qm
>
> +share/lumina-desktop/i18n/l-archiver_en_GB.qm
>
> +share/lumina-desktop/i18n/l-archiver_en_ZA.qm
>
> +share/lumina-desktop/i18n/l-archiver_es.qm
>
> +share/lumina-desktop/i18n/l-archiver_et.qm
>
> +share/lumina-desktop/i18n/l-archiver_eu.qm
>
> +share/lumina-desktop/i18n/l-archiver_fa.qm
>
> +share/lumina-desktop/i18n/l-archiver_fi.qm
>
> +share/lumina-desktop/i18n/l-archiver_fr.qm
>
> +share/lumina-desktop/i18n/l-archiver_fr_CA.qm
>
> +share/lumina-desktop/i18n/l-archiver_gl.qm
>
> +share/lumina-desktop/i18n/l-archiver_he.qm
>
> +share/lumina-desktop/i18n/l-archiver_hi.qm
>
> +share/lumina-desktop/i18n/l-archiver_hr.qm
>
> +share/lumina-desktop/i18n/l-archiver_hu.qm
>
> +share/lumina-desktop/i18n/l-archiver_id.qm
>
> +share/lumina-desktop/i18n/l-archiver_is.qm
>
> +share/lumina-desktop/i18n/l-archiver_it.qm
>
> +share/lumina-desktop/i18n/l-archiver_ja.qm
>
> +share/lumina-desktop/i18n/l-archiver_ka.qm
>
> +share/lumina-desktop/i18n/l-archiver_ko.qm
>
> +share/lumina-desktop/i18n/l-archiver_lt.qm
>
> +share/lumina-desktop/i18n/l-archiver_lv.qm
>
> +share/lumina-desktop/i18n/l-archiver_mk.qm
>
> +share/lumina-desktop/i18n/l-archiver_mn.qm
>
> +share/lumina-desktop/i18n/l-archiver_ms.qm
>
> +share/lumina-desktop/i18n/l-archiver_mt.qm
>
> +share/lumina-desktop/i18n/l-archiver_nb.qm
>
> +share/lumina-desktop/i18n/l-archiver_nl.qm
>
> +share/lumina-desktop/i18n/l-archiver_pa.qm
>
> +share/lumina-desktop/i18n/l-archiver_pl.qm
>
> +share/lumina-desktop/i18n/l-archiver_pt.qm
>
> +share/lumina-desktop/i18n/l-archiver_pt_BR.qm
>
> +share/lumina-desktop/i18n/l-archiver_ro.qm
>
> +share/lumina-desktop/i18n/l-archiver_ru.qm
>
> +share/lumina-desktop/i18n/l-archiver_sk.qm
>
> +share/lumina-desktop/i18n/l-archiver_sl.qm
>
> +share/lumina-desktop/i18n/l-archiver_sr.qm
>
> +share/lumina-desktop/i18n/l-archiver_sv.qm
>
> +share/lumina-desktop/i18n/l-archiver_sw.qm
>
> +share/lumina-desktop/i18n/l-archiver_ta.qm
>
> +share/lumina-desktop/i18n/l-archiver_tg.qm
>
> +share/lumina-desktop/i18n/l-archiver_th.qm
>
> +share/lumina-desktop/i18n/l-archiver_tr.qm
>
> +share/lumina-desktop/i18n/l-archiver_uk.qm
>
> +share/lumina-desktop/i18n/l-archiver_uz.qm
>
> +share/lumina-desktop/i18n/l-archiver_vi.qm
>
> +share/lumina-desktop/i18n/l-archiver_zh_CN.qm
>
> +share/lumina-desktop/i18n/l-archiver_zh_HK.qm
>
> +share/lumina-desktop/i18n/l-archiver_zh_TW.qm
>
> +share/lumina-desktop/i18n/l-archiver_zu.qm
>
> share/lumina-desktop/i18n/l-calc_af.qm
>
> share/lumina-desktop/i18n/l-calc_ar.qm
>
> share/lumina-desktop/i18n/l-calc_az.qm
>
>
>
>
