Date: Tue, 20 Apr 2021 10:25:19 GMT From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 620d7678c819 - main - kde.mk: Support KDE ports with no DOCS Message-ID: <202104201025.13KAPJNQ005558@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=620d7678c819d85f9236d2e307009a5aca088970 commit 620d7678c819d85f9236d2e307009a5aca088970 Author: Adriaan de Groot <adridg@FreeBSD.org> AuthorDate: 2021-04-20 10:22:00 +0000 Commit: Adriaan de Groot <adridg@FreeBSD.org> CommitDate: 2021-04-20 10:25:17 +0000 kde.mk: Support KDE ports with no DOCS The kde.mk framework automatically does DOCS for KDE ports -- but not all of them have documentation, so then you get a weird situation of OPTIONS_DEFINE=DOCS in a port that has no documentation (e.g. sysutils/baloo-widgets) where the option has no effect at all. Massage the machinery a little so that the bogus option can be dropped; KDE ports with no docs should not define a DOCS option any more. PR: 252363 --- Mk/Uses/kde.mk | 7 ++++++- sysutils/baloo-widgets/Makefile | 2 -- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 8556bb1d5cca..5ddeeccd61f7 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -155,9 +155,14 @@ MASTER_SITES?= KDE/${KDE_APPLICATIONS_BRANCH}/applications/${KDE_APPLICATIONS_V MASTER_SITES?= KDE/${KDE_APPLICATIONS_BRANCH}/release-service/${KDE_APPLICATIONS_VERSION}/src # Let bsd.port.mk create the plist-entries for the documentation. # KDE Applications ports install their documentation to -# ${PREFIX}/share/doc. +# ${PREFIX}/share/doc. This is only done if the port +# defines OPTION DOCS -- the _KDE_OPTIONS here is to +# avoid make errors when there are no options defined at all. +_KDE_OPTIONS= bogus ${OPTIONS_DEFINE} +. if ${_KDE_OPTIONS:MDOCS} DOCSDIR= ${PREFIX}/share/doc PORTDOCS?= HTML/* +. endif # Further pass along a SHLIB_VER PLIST_SUB PLIST_SUB+= KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_SHLIB_VER} \ KDE_APPLICATIONS_VERSION_SHORT="${KDE_APPLICATIONS_VERSION:R:R}" diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile index 56a2bb97a391..916b6ddc7c77 100644 --- a/sysutils/baloo-widgets/Makefile +++ b/sysutils/baloo-widgets/Makefile @@ -13,8 +13,6 @@ USE_QT= concurrent core dbus gui network testlib widgets xml \ buildtools_build qmake_build USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS - # Override shared library version KDE_APPLICATIONS_SHLIB_VER=${KDE_APPLICATIONS_VERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104201025.13KAPJNQ005558>