On Sat Feb 20, 2021 at 07:23:10AM +0100, Rafael Sadowski wrote: > I would like to bring back a meta package for KDE. This is more or less > a straightforward package which categorized the KDE applications in: > > COMMENT-accessibility = KDE accessibility applications > COMMENT-admin = KDE system administrator tools > COMMENT-akonadi = KDE Akonadi cross-desktop storage service > COMMENT-education = KDE education applications > COMMENT-games = KDE games > COMMENT-graphics = KDE graphics applications > COMMENT-main = KDE meta-package (full installation) > COMMENT-multimedia = KDE multimedia applications > COMMENT-network = KDE network applications > COMMENT-pim = KDE PIM personal information managemen applications > COMMENT-sdk = KDE software development kit (SDK) > COMMENT-development = KDE development applications > COMMENT-utils = KDE utilities > > For this package we need to share the KDE version. So I would like to > bring back the kde-application module. > > A short review and an OK for the plan would be great.
Is anyone willing to OK to this? > > Rafael > > > Index: Makefile.inc > =================================================================== > RCS file: /cvs/ports/x11/kde-applications/Makefile.inc,v > retrieving revision 1.14 > diff -u -p -r1.14 Makefile.inc > --- Makefile.inc 8 Feb 2021 20:00:39 -0000 1.14 > +++ Makefile.inc 20 Feb 2021 06:18:16 -0000 > @@ -9,10 +9,6 @@ CATEGORIES += x11/kde-applications > > MAINTAINER ?= Rafael Sadowski <rsadow...@openbsd.org> > > -# usual KDE rules: > -# LGPLv2.1+, GPLv2+, GPLv3 > -PERMIT_PACKAGE ?= Yes > - > # Do not rely on devel/cmake here: additional modules that are > # set up in ports may have, say, lang/python before devel/cmake, > # thus making lang/python evaluating first. And when lang/python > @@ -20,32 +16,17 @@ PERMIT_PACKAGE ?= Yes > # module port, and breaks build. > CONFIGURE_STYLE = cmake > > -MODULES := devel/kf5 ${MODULES} > - > -VERSION ?= 20.12.2 > - > -MASTER_SITES ?= > ${MASTER_SITE_KDE:=stable/release-service/${VERSION}/src/} > - > -# Set to 'yes' if there are .desktop files under share/release-service/. > -.if defined(MODKDE5_DESKTOP_FILE) && ${MODKDE5_DESKTOP_FILE:L} == "yes" > -MODKDE5_RUN_DEPENDS += devel/desktop-file-utils > -.endif > +MODULES := x11/kde-applications \ > + devel/kf5 \ > + ${MODULES} > > -# Set to 'yes' if there are icon files under share/icons/. > -.if defined(MODKDE5_ICON_CACHE) && ${MODKDE5_ICON_CACHE:L} == "yes" > -MODKDE5_RUN_DEPENDS += x11/gtk+3,-guic > -.endif > +# usual KDE rules: > +# LGPLv2.1+, GPLv2+, GPLv3 > +PERMIT_PACKAGE ?= Yes > > -# Set to 'yes' if there are icon files under share/locale/. > -.if defined(MODKDE5_TRANSLATIONS) && ${MODKDE5_TRANSLATIONS:L} == "yes" > -MODKDE5_BUILD_DEPENDS += devel/gettext,-tools > -.endif > +VERSION ?= ${MODKDE_VERSION} > > -# Set to 'yes' if there are icon files under share/doc/. > -.if defined(MODKDE5_DOCS) && ${MODKDE5_DOCS:L} == "yes" > -MODKDE5_BUILD_DEPENDS += devel/kf5/kdoctools > -MODKDE5_RUN_DEPENDS += devel/kf5/kdoctools > -.endif > +MASTER_SITES ?= > ${MASTER_SITE_KDE:=stable/release-service/${VERSION}/src/} > > RUN_DEPENDS += ${MODKDE5_RUN_DEPENDS} > BUILD_DEPENDS += ${MODKDE5_BUILD_DEPENDS} > Index: kde-applications.port.mk > =================================================================== > RCS file: kde-applications.port.mk > diff -N kde-applications.port.mk > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ kde-applications.port.mk 20 Feb 2021 06:18:16 -0000 > @@ -0,0 +1,24 @@ > +# $OpenBSD: Makefile.inc,v 1.14 2021/02/08 20:00:39 rsadowski Exp $ > + > +MODKDE_VERSION ?= 20.12.2 > + > +# Set to 'yes' if there are .desktop files under share/release-service/. > +.if defined(MODKDE5_DESKTOP_FILE) && ${MODKDE5_DESKTOP_FILE:L} == "yes" > +MODKDE5_RUN_DEPENDS += devel/desktop-file-utils > +.endif > + > +# Set to 'yes' if there are icon files under share/icons/. > +.if defined(MODKDE5_ICON_CACHE) && ${MODKDE5_ICON_CACHE:L} == "yes" > +MODKDE5_RUN_DEPENDS += x11/gtk+3,-guic > +.endif > + > +# Set to 'yes' if there are icon files under share/locale/. > +.if defined(MODKDE5_TRANSLATIONS) && ${MODKDE5_TRANSLATIONS:L} == "yes" > +MODKDE5_BUILD_DEPENDS += devel/gettext,-tools > +.endif > + > +# Set to 'yes' if there are icon files under share/doc/. > +.if defined(MODKDE5_DOCS) && ${MODKDE5_DOCS:L} == "yes" > +MODKDE5_BUILD_DEPENDS += devel/kf5/kdoctools > +MODKDE5_RUN_DEPENDS += devel/kf5/kdoctools > +.endif