Skip to content

Commit

Permalink
Mk/Uses: Move man to share/man for kde framework
Browse files Browse the repository at this point in the history 
All ports utilizing USES=kde has been tested. If there are breakage on
other parts of the tree buzz me.

Approved by:	portmgr (blanket)
  • Loading branch information
@5u623l20
5u623l20 committed Jan 30, 2024
1 parent ee96af0 commit 39c1f7c
Show file tree
Hide file tree
Showing 31 changed files with 124 additions and 133 deletions.
9 changes: 1 addition & 8 deletions Mk/Uses/kde.mk
View file
Expand Up @@ -197,7 +197,6 @@ DOCSDIR= ${PREFIX}/share/doc
PORTDOCS?= HTML/*
USE_KDE+= doctools:build
. endif
KDE_MAN_PREFIX?= ${KDE_PREFIX}/share/man
# 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}"
Expand All @@ -206,7 +205,6 @@ DIST_SUBDIR?= KDE/release-service/${KDE_APPLICATIONS_VERSION}
PORTVERSION?= ${KDE_PLASMA_VERSION}
PKGNAMEPREFIX?= plasma${_KDE_VERSION}-
MASTER_SITES?= KDE/${KDE_PLASMA_BRANCH}/plasma/${KDE_PLASMA_VERSION}
KDE_MAN_PREFIX?= ${KDE_PREFIX}/share/man
DIST_SUBDIR?= KDE/plasma/${KDE_PLASMA_VERSION}
. if ${_KDE_VERSION:M6}
DESCR= ${.CURDIR:H:H}/x11/plasma6-plasma/pkg-descr
Expand All @@ -231,7 +229,6 @@ DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION}
. if ${_KDE_VERSION:M6}
DESCR= ${.CURDIR:H:H}/x11/kf6-frameworks/pkg-descr
. endif
KDE_MAN_PREFIX?= ${KDE_PREFIX}/share/man
. else
IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #'
. endif
Expand All @@ -251,11 +248,7 @@ CMAKE_ARGS+= -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \
-DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \
-DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=true

# Set man-page installation prefix.
# TODO: Remove the KDE_MAN_PREFIX knob once all kde ports are switched to use share/man
KDE_MAN_PREFIX?= ${KDE_PREFIX}/man
CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_MAN_PREFIX}" \
-DMAN_INSTALL_DIR:PATH="${KDE_MAN_PREFIX}"
KDE_MAN_PREFIX?= ${KDE_PREFIX}/share/man

This comment has been minimized.

Sign in to view

Copy link
@arrowd

arrowd Feb 18, 2024

Contributor

This variable is unused now?

# Disable autotests unless TEST_TARGET is defined.
. if !defined(TEST_TARGET)
Expand Down
4 changes: 3 additions & 1 deletion databases/kbibtex/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kbibtex
DISTVERSION= 0.10.0
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/KBibTeX/${DISTVERSION}

Expand Down Expand Up @@ -28,6 +28,8 @@ USE_QT= concurrent core dbus gui location network networkauth \
USE_XORG= x11
USE_LDCONFIG= yes

CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH=${PREFIX}/share/man

OPTIONS_DEFINE= WEBENGINE
OPTIONS_DEFAULT_aarch64= WEBENGINE
OPTIONS_DEFAULT_amd64= WEBENGINE
Expand Down
20 changes: 10 additions & 10 deletions databases/kbibtex/pkg-plist
View file
Expand Up @@ -263,16 +263,16 @@ lib/libkbibtexnetworking.so.0.10
lib/libkbibtexprocessing.so.0
lib/libkbibtexprocessing.so.0.10
%%QT_PLUGINDIR%%/kbibtexpart.so
man/ca/man1/kbibtex.1.gz
man/de/man1/kbibtex.1.gz
man/es/man1/kbibtex.1.gz
man/it/man1/kbibtex.1.gz
man/man1/kbibtex.1.gz
man/nl/man1/kbibtex.1.gz
man/pt_BR/man1/kbibtex.1.gz
man/ru/man1/kbibtex.1.gz
man/sv/man1/kbibtex.1.gz
man/uk/man1/kbibtex.1.gz
share/man/ca/man1/kbibtex.1.gz
share/man/de/man1/kbibtex.1.gz
share/man/es/man1/kbibtex.1.gz
share/man/it/man1/kbibtex.1.gz
share/man/man1/kbibtex.1.gz
share/man/nl/man1/kbibtex.1.gz
share/man/pt_BR/man1/kbibtex.1.gz
share/man/ru/man1/kbibtex.1.gz
share/man/sv/man1/kbibtex.1.gz
share/man/uk/man1/kbibtex.1.gz
share/applications/org.kde.kbibtex.desktop
share/doc/HTML/ca/kbibtex/add-macro-source.png
share/doc/HTML/ca/kbibtex/add-macro.png
Expand Down
2 changes: 1 addition & 1 deletion deskutils/kronometer/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kronometer
DISTVERSION= 2.3.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= deskutils kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/src/
DISTNAME= ${PORTNAME}-${DISTVERSION}
Expand Down
20 changes: 10 additions & 10 deletions deskutils/kronometer/pkg-plist
View file
@@ -1,14 +1,4 @@
bin/kronometer
man/ca/man1/kronometer.1.gz
man/de/man1/kronometer.1.gz
man/es/man1/kronometer.1.gz
man/it/man1/kronometer.1.gz
man/man1/kronometer.1.gz
man/nl/man1/kronometer.1.gz
man/pt/man1/kronometer.1.gz
man/pt_BR/man1/kronometer.1.gz
man/sv/man1/kronometer.1.gz
man/uk/man1/kronometer.1.gz
share/applications/org.kde.kronometer.desktop
share/config.kcfg/kronometer.kcfg
share/doc/HTML/ca/kronometer/index.cache.bz2
Expand Down Expand Up @@ -68,4 +58,14 @@ share/locale/sv/LC_MESSAGES/kronometer.mo
share/locale/tr/LC_MESSAGES/kronometer.mo
share/locale/uk/LC_MESSAGES/kronometer.mo
share/locale/zh_CN/LC_MESSAGES/kronometer.mo
share/man/ca/man1/kronometer.1.gz
share/man/de/man1/kronometer.1.gz
share/man/es/man1/kronometer.1.gz
share/man/it/man1/kronometer.1.gz
share/man/man1/kronometer.1.gz
share/man/nl/man1/kronometer.1.gz
share/man/pt/man1/kronometer.1.gz
share/man/pt_BR/man1/kronometer.1.gz
share/man/sv/man1/kronometer.1.gz
share/man/uk/man1/kronometer.1.gz
share/metainfo/org.kde.kronometer.appdata.xml
2 changes: 1 addition & 1 deletion devel/kdesvn/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kdesvn
DISTVERSION= 2.1.0
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/

Expand Down
36 changes: 18 additions & 18 deletions devel/kdesvn/pkg-plist
View file
Expand Up @@ -3,24 +3,6 @@ bin/kdesvnaskpass
%%QT_PLUGINDIR%%/kdesvnpart.so
%%QT_PLUGINDIR%%/kf5/kded/kdesvnd.so
%%QT_PLUGINDIR%%/kio_ksvn.so
man/ca/man1/kdesvn.1.gz
man/ca/man1/kdesvnaskpass.1.gz
man/de/man1/kdesvn.1.gz
man/de/man1/kdesvnaskpass.1.gz
man/it/man1/kdesvn.1.gz
man/it/man1/kdesvnaskpass.1.gz
man/man1/kdesvn.1.gz
man/man1/kdesvnaskpass.1.gz
man/nl/man1/kdesvn.1.gz
man/nl/man1/kdesvnaskpass.1.gz
man/pt/man1/kdesvn.1.gz
man/pt/man1/kdesvnaskpass.1.gz
man/pt_BR/man1/kdesvn.1.gz
man/pt_BR/man1/kdesvnaskpass.1.gz
man/sv/man1/kdesvn.1.gz
man/sv/man1/kdesvnaskpass.1.gz
man/uk/man1/kdesvn.1.gz
man/uk/man1/kdesvnaskpass.1.gz
share/applications/org.kde.kdesvn.desktop
share/config.kcfg/kdesvn_part.kcfg
share/dbus-1/interfaces/kf5_org.kde.kdesvnd.xml
Expand Down Expand Up @@ -392,4 +374,22 @@ share/locale/ug/LC_MESSAGES/kdesvn.mo
share/locale/uk/LC_MESSAGES/kdesvn.mo
share/locale/zh_CN/LC_MESSAGES/kdesvn.mo
share/locale/zh_TW/LC_MESSAGES/kdesvn.mo
share/man/ca/man1/kdesvn.1.gz
share/man/ca/man1/kdesvnaskpass.1.gz
share/man/de/man1/kdesvn.1.gz
share/man/de/man1/kdesvnaskpass.1.gz
share/man/it/man1/kdesvn.1.gz
share/man/it/man1/kdesvnaskpass.1.gz
share/man/man1/kdesvn.1.gz
share/man/man1/kdesvnaskpass.1.gz
share/man/nl/man1/kdesvn.1.gz
share/man/nl/man1/kdesvnaskpass.1.gz
share/man/pt/man1/kdesvn.1.gz
share/man/pt/man1/kdesvnaskpass.1.gz
share/man/pt_BR/man1/kdesvn.1.gz
share/man/pt_BR/man1/kdesvnaskpass.1.gz
share/man/sv/man1/kdesvn.1.gz
share/man/sv/man1/kdesvnaskpass.1.gz
share/man/uk/man1/kdesvn.1.gz
share/man/uk/man1/kdesvnaskpass.1.gz
share/metainfo/org.kde.kdesvn.appdata.xml
10 changes: 2 additions & 8 deletions devel/kf5-extra-cmake-modules/files/patch-CMakeLists.txt
View file
@@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2016-09-15 12:44:43 UTC
--- CMakeLists.txt.orig 2023-12-23 00:45:39 UTC
+++ CMakeLists.txt
@@ -76,12 +76,12 @@ set(KDE_MODULES_INSTALL_DIR ${SHAR
@@ -44,7 +44,7 @@ set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}
set(MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/modules/)
set(TOOLCHAIN_MODULES_INSTALL_DIR ${SHARE_INSTALL_DIR}/ECM/toolchain/)

Expand All @@ -9,9 +9,3 @@
CACHE
PATH
"HTML and QtHelp documentation"
)
-set(MAN_INSTALL_DIR ${SHARE_INSTALL_DIR}/man
+set(MAN_INSTALL_DIR man
CACHE
PATH
"man pages"
10 changes: 5 additions & 5 deletions devel/kf5-extra-cmake-modules/files/patch-find-modules_FindOpenEXR.cmake
View file
@@ -1,6 +1,6 @@
--- find-modules/FindOpenEXR.cmake.orig 2021-02-26 21:48:38 UTC
--- find-modules/FindOpenEXR.cmake.orig 2023-12-23 00:45:39 UTC
+++ find-modules/FindOpenEXR.cmake
@@ -44,6 +44,13 @@ pkg_check_modules(PC_OpenEXR QUIET OpenEXR)
@@ -43,6 +43,13 @@ set(OpenEXR_DEFINITIONS ${PC_OpenEXR_CFLAGS_OTHER})

set(OpenEXR_DEFINITIONS ${PC_OpenEXR_CFLAGS_OTHER})

Expand All @@ -14,7 +14,7 @@
find_path(OpenEXR_INCLUDE_DIR ImfRgbaFile.h
PATHS
${PC_OpenEXR_INCLUDEDIR}
@@ -52,7 +59,7 @@ find_path(OpenEXR_INCLUDE_DIR ImfRgbaFile.h
@@ -51,7 +58,7 @@ find_path(OpenEXR_INCLUDE_DIR ImfRgbaFile.h
)

# Required libraries for OpenEXR
Expand All @@ -23,7 +23,7 @@
PATHS
${PC_OpenEXR_LIBDIR}
${PC_OpenEXR_LIBRARY_DIRS}
@@ -73,7 +80,7 @@ find_library(OpenEXR_ILMTHREAD_LIBRARY NAMES IlmThread
@@ -72,7 +79,7 @@ find_library(OpenEXR_ILMTHREAD_LIBRARY NAMES IlmThread
${PC_OpenEXR_LIBRARY_DIRS}
)
# This is the actual OpenEXR library
Expand All @@ -32,7 +32,7 @@
PATHS
${PC_OpenEXR_LIBDIR}
${PC_OpenEXR_LIBRARY_DIRS}
@@ -109,9 +116,10 @@ find_package_handle_standard_args(OpenEXR
@@ -108,9 +115,10 @@ find_package_handle_standard_args(OpenEXR
OpenEXR_IMATH_LIBRARY
OpenEXR_ILMTHREAD_LIBRARY
OpenEXR_INCLUDE_DIR
Expand Down
2 changes: 1 addition & 1 deletion finance/kmymoney/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kmymoney
PORTVERSION= 5.1.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= finance kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src

Expand Down
20 changes: 10 additions & 10 deletions finance/kmymoney/pkg-plist
View file
Expand Up @@ -159,16 +159,6 @@ lib/libkmm_widgets.so.5.1.3
%%WOOB%%%%QT_PLUGINDIR%%/kmymoney/woob.so
%%QT_PLUGINDIR%%/kmymoney/xmlstorage.so
%%SQLCIPHER%%%%QT_PLUGINDIR%%/sqldrivers/qsqlcipher.so
man/ca/man1/kmymoney.1.gz
man/de/man1/kmymoney.1.gz
man/it/man1/kmymoney.1.gz
man/man1/kmymoney.1.gz
man/nl/man1/kmymoney.1.gz
man/pt/man1/kmymoney.1.gz
man/pt_BR/man1/kmymoney.1.gz
man/ru/man1/kmymoney.1.gz
man/sv/man1/kmymoney.1.gz
man/uk/man1/kmymoney.1.gz
share/applications/org.kde.kmymoney.desktop
share/checkprinting/check_template.html
share/checkprinting/check_template_green_linen.html
Expand Down Expand Up @@ -1686,5 +1676,15 @@ share/locale/ug/LC_MESSAGES/kmymoney.mo
share/locale/uk/LC_MESSAGES/kmymoney.mo
share/locale/zh_CN/LC_MESSAGES/kmymoney.mo
share/locale/zh_TW/LC_MESSAGES/kmymoney.mo
share/man/ca/man1/kmymoney.1.gz
share/man/de/man1/kmymoney.1.gz
share/man/it/man1/kmymoney.1.gz
share/man/man1/kmymoney.1.gz
share/man/nl/man1/kmymoney.1.gz
share/man/pt/man1/kmymoney.1.gz
share/man/pt_BR/man1/kmymoney.1.gz
share/man/ru/man1/kmymoney.1.gz
share/man/sv/man1/kmymoney.1.gz
share/man/uk/man1/kmymoney.1.gz
share/metainfo/org.kde.kmymoney.appdata.xml
share/mime/packages/x-kmymoney.xml
2 changes: 1 addition & 1 deletion graphics/digikam/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= digikam
DISTVERSION= 8.2.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= graphics kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} \
https://files.kde.org/digikam/%SUBDIR%/:aesthetic,face,shape \
Expand Down
4 changes: 2 additions & 2 deletions graphics/digikam/pkg-plist
View file
Expand Up @@ -264,8 +264,8 @@ lib/libdigikamgui.so.%%SHLIB_VER%%
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_Native_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_RawTherapee_Plugin.so
%%QT_PLUGINDIR%%/digikam/rawimport/RawImport_UFRaw_Plugin.so
man/man1/cleanup_digikamdb.1.gz
man/man1/digitaglinktree.1.gz
share/man/man1/cleanup_digikamdb.1.gz
share/man/man1/digitaglinktree.1.gz
share/applications/org.kde.digikam.desktop
share/applications/org.kde.showfoto.desktop
%%DATADIR%%/about/css/bootstrap-theme.min.css
Expand Down
2 changes: 1 addition & 1 deletion graphics/kamerka/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kamerka
DISTVERSION= 0.20
PORTREVISION= 5
PORTREVISION= 6
CATEGORIES= graphics

MAINTAINER= yuri@FreeBSD.org
Expand Down
2 changes: 1 addition & 1 deletion graphics/kamerka/pkg-plist
View file
@@ -1,5 +1,4 @@
bin/kamerka
man/man1/kamerka.1.gz
share/applications/kamerka.desktop
share/config.kcfg/kamerka.kcfg
%%DATADIR%%/camera_click.ogg
Expand All @@ -19,4 +18,5 @@ share/knotifications5/kamerka.notifyrc
%%NLS%%share/locale/uk/LC_MESSAGES/kamerka.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/kamerka.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/kamerka.mo
share/man/man1/kamerka.1.gz
share/pixmaps/kamerka.png
2 changes: 1 addition & 1 deletion graphics/kxstitch/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kxstitch
DISTVERSION= 2.2.0
PORTREVISION= 5
PORTREVISION= 6
MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}
CATEGORIES= graphics kde

Expand Down
16 changes: 8 additions & 8 deletions graphics/kxstitch/pkg-plist
View file
@@ -1,12 +1,4 @@
bin/kxstitch
man/ca/man1/kxstitch.1.gz
man/et/man1/kxstitch.1.gz
man/man1/kxstitch.1.gz
man/nl/man1/kxstitch.1.gz
man/pt/man1/kxstitch.1.gz
man/pt_BR/man1/kxstitch.1.gz
man/sv/man1/kxstitch.1.gz
man/uk/man1/kxstitch.1.gz
share/applications/org.kde.kxstitch.desktop
share/config.kcfg/kxstitch.kcfg
share/doc/HTML/en/kxstitch/add-page-icon.png
Expand Down Expand Up @@ -203,4 +195,12 @@ share/locale/sv/LC_MESSAGES/kxstitch.mo
share/locale/uk/LC_MESSAGES/kxstitch.mo
share/locale/zh_CN/LC_MESSAGES/kxstitch.mo
share/locale/zh_TW/LC_MESSAGES/kxstitch.mo
share/man/ca/man1/kxstitch.1.gz
share/man/et/man1/kxstitch.1.gz
share/man/man1/kxstitch.1.gz
share/man/nl/man1/kxstitch.1.gz
share/man/pt/man1/kxstitch.1.gz
share/man/pt_BR/man1/kxstitch.1.gz
share/man/sv/man1/kxstitch.1.gz
share/man/uk/man1/kxstitch.1.gz
share/metainfo/org.kde.kxstitch.appdata.xml
2 changes: 1 addition & 1 deletion math/labplot/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= labplot
DISTVERSION= 2.10.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math kde
MASTER_SITES= KDE/stable/${PORTNAME}/

Expand Down
16 changes: 8 additions & 8 deletions math/labplot/pkg-plist
View file
@@ -1,12 +1,4 @@
bin/labplot2
man/ca/man1/labplot2.1.gz
man/es/man1/labplot2.1.gz
man/it/man1/labplot2.1.gz
man/man1/labplot2.1.gz
man/nl/man1/labplot2.1.gz
man/pt_BR/man1/labplot2.1.gz
man/sv/man1/labplot2.1.gz
man/uk/man1/labplot2.1.gz
share/applications/org.kde.labplot2.desktop
share/doc/HTML/ca/labplot2/index.cache.bz2
share/doc/HTML/ca/labplot2/index.docbook
Expand Down Expand Up @@ -388,4 +380,12 @@ share/locale/uk/LC_MESSAGES/labplot2.mo
share/locale/zh_CN/LC_MESSAGES/labplot2.mo
share/locale/zh_TW/LC_MESSAGES/labplot2.mo
share/metainfo/org.kde.labplot2.appdata.xml
share/man/ca/man1/labplot2.1.gz
share/man/es/man1/labplot2.1.gz
share/man/it/man1/labplot2.1.gz
share/man/man1/labplot2.1.gz
share/man/nl/man1/labplot2.1.gz
share/man/pt_BR/man1/labplot2.1.gz
share/man/sv/man1/labplot2.1.gz
share/man/uk/man1/labplot2.1.gz
share/mime/packages/labplot2.xml
2 changes: 1 addition & 1 deletion math/rkward/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= rkward
PORTVERSION= 0.7.5
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= math
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/

Expand Down

0 comments on commit 39c1f7c

Please sign in to comment.