diff options
| -rw-r--r-- | MOVED | 2 | ||||
| -rw-r--r-- | Mk/Uses/kde.mk | 8 | ||||
| -rw-r--r-- | graphics/libkexiv2/Makefile | 18 | ||||
| -rw-r--r-- | graphics/libkexiv2/pkg-plist | 36 | ||||
| -rw-r--r-- | graphics/libkexiv2/pkg-plist.qt5 | 18 | ||||
| -rw-r--r-- | graphics/libkexiv2/pkg-plist.qt6 | 18 |
6 files changed, 28 insertions, 72 deletions
@@ -4711,3 +4711,5 @@ databases/pear-DoctrineDBAL||2025-08-04|Has expired: Upstream no longer serves t www/py-wsaccel||2025-08-04|Has expired: Upstream ceased development databases/pear-DoctrineCommon||2025-08-05|Has expired: Upstream no longer serves through PEAR channel and has been moved to Composer devel/tclthread|devel/tcl8-thread|2025-08-07|Use tcl8-thread with Tcl8 and tcl9-thread Tcl9 +graphics/libkexiv2@qt5||2025-08-08|Unflavorize; Qt5 flavor is not needed anymore +graphics/libkexiv2@qt6|graphics/libkexiv2|2025-08-08|Unflavorize; Qt5 flavor is not needed anymore diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk index 71980d8f867e..0a9a9e70a8b4 100644 --- a/Mk/Uses/kde.mk +++ b/Mk/Uses/kde.mk @@ -331,7 +331,7 @@ _USE_PLASMA6_ALL= activities activities-stats activitymanagerd \ _USE_PLASMA_ALL= ${_USE_PLASMA${_KDE_VERSION}_ALL} # List of frequently used components of the KDE Gears distribution. -_USE_GEAR5_ALL= libkdcraw libkexiv2 +_USE_GEAR5_ALL= libkdcraw _USE_GEAR6_ALL= baloo-widgets kate kosm kpublictransport \ libkcddb libkcompactdisc libkdcraw \ libkdegames libkeduvocdocument libkexiv2 \ @@ -982,10 +982,8 @@ kde-libkdegames_LIB= libKDEGames${_KDE_VERSION}.so kde-libkeduvocdocument_PORT= misc/libkeduvocdocument kde-libkeduvocdocument_LIB= libKEduVocDocument.so -kde-libkexiv2_PORT= graphics/libkexiv2@qt${_KDE_VERSION} -kde-libkexiv2_LIB5= libKF${_KDE_VERSION}KExiv2.so -kde-libkexiv2_LIB6= libKExiv2Qt${_KDE_VERSION}.so -kde-libkexiv2_LIB= ${kde-libkexiv2_LIB${_KDE_VERSION}} +kde-libkexiv2_PORT= graphics/libkexiv2 +kde-libkexiv2_LIB= libKExiv2Qt6.so kde-libksane_PORT= graphics/libksane kde-libksane_LIB= libKSaneWidgets${_KDE_VERSION}.so diff --git a/graphics/libkexiv2/Makefile b/graphics/libkexiv2/Makefile index 25aa8d185c2b..79294e16212a 100644 --- a/graphics/libkexiv2/Makefile +++ b/graphics/libkexiv2/Makefile @@ -1,26 +1,18 @@ PORTNAME= libkexiv2 DISTVERSION= ${KDE_APPLICATIONS_VERSION} CATEGORIES= graphics kde kde-applications -PKGNAMESUFFIX= -${FLAVOR} +PKGNAMESUFFIX= -qt6 MAINTAINER= kde@FreeBSD.org COMMENT= Exiv2 library interface for KDE -WWW= https://www.digikam.org/ - -FLAVORS= qt6 qt5 -FLAVOR?= qt6 +WWW= https://invent.kde.org/graphics/libkexiv2 LIB_DEPENDS= libexiv2.so:graphics/exiv2 -USES= cmake compiler:c++11-lang kde:${FLAVOR:S/qt//} pkgconfig \ - qt:${FLAVOR:S/qt//} tar:xz +USES= cmake compiler:c++11-lang kde:6 pkgconfig \ + qt:6 tar:xz USE_KDE= ecm:build -_USE_QT_qt5= core gui buildtools:build qmake:build -_USE_QT_qt6= base -USE_QT= ${_USE_QT_${FLAVOR}} - +USE_QT= base USE_LDCONFIG= yes -PLIST= pkg-plist.${FLAVOR} - .include <bsd.port.mk> diff --git a/graphics/libkexiv2/pkg-plist b/graphics/libkexiv2/pkg-plist index 05ea91de27d0..ce7acb0b7b5d 100644 --- a/graphics/libkexiv2/pkg-plist +++ b/graphics/libkexiv2/pkg-plist @@ -1,18 +1,18 @@ -include/KF5/KExiv2/KExiv2/KExiv2 -include/KF5/KExiv2/KExiv2/KExiv2Data -include/KF5/KExiv2/KExiv2/KExiv2Previews -include/KF5/KExiv2/KExiv2/RotationMatrix -include/KF5/KExiv2/kexiv2/kexiv2.h -include/KF5/KExiv2/kexiv2/kexiv2data.h -include/KF5/KExiv2/kexiv2/kexiv2previews.h -include/KF5/KExiv2/kexiv2/libkexiv2_export.h -include/KF5/KExiv2/kexiv2/rotationmatrix.h -include/KF5/KExiv2/libkexiv2_version.h -lib/cmake/KF5KExiv2/KF5KExiv2Config.cmake -lib/cmake/KF5KExiv2/KF5KExiv2ConfigVersion.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets.cmake -lib/libKF5KExiv2.so -lib/libKF5KExiv2.so.15.0.0 -lib/libKF5KExiv2.so.5.0.0 -share/qlogging-categories5/libkexiv2.categories +include/KExiv2Qt6/KExiv2/KExiv2 +include/KExiv2Qt6/KExiv2/KExiv2Data +include/KExiv2Qt6/KExiv2/KExiv2Previews +include/KExiv2Qt6/KExiv2/RotationMatrix +include/KExiv2Qt6/kexiv2/kexiv2.h +include/KExiv2Qt6/kexiv2/kexiv2data.h +include/KExiv2Qt6/kexiv2/kexiv2previews.h +include/KExiv2Qt6/kexiv2/libkexiv2_export.h +include/KExiv2Qt6/kexiv2/rotationmatrix.h +include/KExiv2Qt6/libkexiv2_version.h +lib/cmake/KExiv2Qt6/KExiv2Qt6Config.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6ConfigVersion.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/KExiv2Qt6/KExiv2Qt6Targets.cmake +lib/libKExiv2Qt6.so +lib/libKExiv2Qt6.so.0 +lib/libKExiv2Qt6.so.5.1.0 +share/qlogging-categories6/libkexiv2.categories diff --git a/graphics/libkexiv2/pkg-plist.qt5 b/graphics/libkexiv2/pkg-plist.qt5 deleted file mode 100644 index 3d9431d398ef..000000000000 --- a/graphics/libkexiv2/pkg-plist.qt5 +++ /dev/null @@ -1,18 +0,0 @@ -include/KF5/KExiv2/KExiv2/KExiv2 -include/KF5/KExiv2/KExiv2/KExiv2Data -include/KF5/KExiv2/KExiv2/KExiv2Previews -include/KF5/KExiv2/KExiv2/RotationMatrix -include/KF5/KExiv2/kexiv2/kexiv2.h -include/KF5/KExiv2/kexiv2/kexiv2data.h -include/KF5/KExiv2/kexiv2/kexiv2previews.h -include/KF5/KExiv2/kexiv2/libkexiv2_export.h -include/KF5/KExiv2/kexiv2/rotationmatrix.h -include/KF5/KExiv2/libkexiv2_version.h -lib/cmake/KF5KExiv2/KF5KExiv2Config.cmake -lib/cmake/KF5KExiv2/KF5KExiv2ConfigVersion.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KF5KExiv2/KF5KExiv2Targets.cmake -lib/libKF5KExiv2.so -lib/libKF5KExiv2.so.15.0.0 -lib/libKF5KExiv2.so.5.1.0 -share/qlogging-categories5/libkexiv2.categories diff --git a/graphics/libkexiv2/pkg-plist.qt6 b/graphics/libkexiv2/pkg-plist.qt6 deleted file mode 100644 index ce7acb0b7b5d..000000000000 --- a/graphics/libkexiv2/pkg-plist.qt6 +++ /dev/null @@ -1,18 +0,0 @@ -include/KExiv2Qt6/KExiv2/KExiv2 -include/KExiv2Qt6/KExiv2/KExiv2Data -include/KExiv2Qt6/KExiv2/KExiv2Previews -include/KExiv2Qt6/KExiv2/RotationMatrix -include/KExiv2Qt6/kexiv2/kexiv2.h -include/KExiv2Qt6/kexiv2/kexiv2data.h -include/KExiv2Qt6/kexiv2/kexiv2previews.h -include/KExiv2Qt6/kexiv2/libkexiv2_export.h -include/KExiv2Qt6/kexiv2/rotationmatrix.h -include/KExiv2Qt6/libkexiv2_version.h -lib/cmake/KExiv2Qt6/KExiv2Qt6Config.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6ConfigVersion.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/KExiv2Qt6/KExiv2Qt6Targets.cmake -lib/libKExiv2Qt6.so -lib/libKExiv2Qt6.so.0 -lib/libKExiv2Qt6.so.5.1.0 -share/qlogging-categories6/libkexiv2.categories |