Page MenuHomeFreeBSD
Files F167651026

D14642.diff
No OneTemporary
Actions

D14642.diff
View Options

Index: head/MOVED
===================================================================
--- head/MOVED
+++ head/MOVED
@@ -10147,3 +10147,4 @@
devel/py-libusb115|devel/py-libusb1|2018-04-14|Unused and unmaintained upstream
devel/qca-qt5|devel/qca@qt5|2018-04-14|Moved to a flavoured version
devel/qjson-qt5|devel/qjson@qt5|2018-04-14|Moved to a flavoured version
+sysutils/polkit-qt5|sysutils/polkit-qt@qt5|2018-04-14|Moved to flavoured version
Index: head/devel/kf5-kauth/Makefile
===================================================================
--- head/devel/kf5-kauth/Makefile
+++ head/devel/kf5-kauth/Makefile
@@ -2,12 +2,13 @@
PORTNAME= kauth
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
COMMENT= KF5 abstraction to system policy and authentication features
-LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt5
+LIB_DEPENDS= libpolkit-qt5-core-1.so:sysutils/polkit-qt@qt5
USES= cmake:outsource compiler:c++11-lib kde:5 tar:xz
USE_KDE= coreaddons ecm
Index: head/sysutils/Makefile
===================================================================
--- head/sysutils/Makefile
+++ head/sysutils/Makefile
@@ -891,7 +891,6 @@
SUBDIR += polkit-gnome
SUBDIR += polkit-kde
SUBDIR += polkit-qt
- SUBDIR += polkit-qt5
SUBDIR += pot
SUBDIR += powerdxx
SUBDIR += powerman
Index: head/sysutils/kcm-polkit-kde/Makefile
===================================================================
--- head/sysutils/kcm-polkit-kde/Makefile
+++ head/sysutils/kcm-polkit-kde/Makefile
@@ -2,7 +2,7 @@
PORTNAME= polkit-kde
DISTVERSION= 0.0-${PORTDATE}
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= LOCAL/avilla
PKGNAMEPREFIX= kcm-
@@ -11,7 +11,7 @@
MAINTAINER= kde@FreeBSD.org
COMMENT= Polkit-KDE configuration module
-LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt
+LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt@qt4
RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde
USES= cmake kde:4 pkgconfig tar:bzip2
Index: head/sysutils/polkit-kde/Makefile
===================================================================
--- head/sysutils/polkit-kde/Makefile
+++ head/sysutils/polkit-kde/Makefile
@@ -3,7 +3,7 @@
PORTNAME= polkit-kde
PORTVERSION= 0.99.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils kde
MASTER_SITES= KDE/stable/apps/KDE4.x/admin/
DISTNAME= ${PORTNAME}-agent-1-${PORTVERSION:C/1$/0/}
@@ -13,7 +13,7 @@
LICENSE= GPLv2
-LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt
+LIB_DEPENDS= libpolkit-qt-agent-1.so:sysutils/polkit-qt@qt4
USES= cmake kde:4 tar:bzip2
USE_KDE= kdelibs automoc4
Index: head/sysutils/polkit-qt/Makefile
===================================================================
--- head/sysutils/polkit-qt/Makefile
+++ head/sysutils/polkit-qt/Makefile
@@ -2,40 +2,47 @@
# $FreeBSD$
PORTNAME= polkit-qt
-PORTVERSION= 0.112.0
DISTVERSIONPREFIX= 1-
+DISTVERSION= 0.112.0
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= KDE/stable/apps/KDE4.x/admin/
+PKGNAMESUFFIX= ${FLAVOR:C/qt//}
MAINTAINER= kde@FreeBSD.org
-COMMENT?= Qt4 wrapper around Polkit libraries
+COMMENT= Qt${FLAVOR:C/qt//} wrapper around Polkit libraries
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit
+FLAVORS= qt4 qt5
+FLAVOR?= ${FLAVORS:[1]}
+
USES= cmake:outsource pkgconfig tar:bzip2
USE_GNOME= glib20
-CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF \
- -DBUILD_TEST:BOOL=OFF
+CMAKE_OFF= BUILD_EXAMPLES \
+ BUILD_TEST
-.if empty(PKGNAMESUFFIX)
+. if ${FLAVOR} == qt4
USES+= kde:4
USE_KDE= automoc4
USE_QT4= corelib dbus gui \
qmake_build moc_build rcc_build uic_build
-CMAKE_ARGS+= -DUSE_QT4:BOOL=ON \
- -DUSE_QT5:BOOL=OFF
-.else
+CMAKE_ON+= USE_QT4
+CMAKE_OFF+= USE_QT5
+QTVER_SUFFIX= # empty
+. else
USE_QT5= core dbus gui widgets buildtools_build qmake_build
-CMAKE_ARGS+= -DUSE_QT4:BOOL=OFF \
- -DUSE_QT5:BOOL=ON
-.endif
+CMAKE_ON+= USE_QT5
+CMAKE_OFF+= USE_QT4
+QTVER_SUFFIX= 5
+. endif
USE_LDCONFIG= yes
-PLIST_SUB= QTVER_SUFFIX="${PKGNAMESUFFIX}"
+PLIST_SUB= QTVER_SUFFIX="${QTVER_SUFFIX}"
post-patch:
${REINPLACE_CMD} -e 's|$${LIB_DESTINATION}/pkgconfig|libdata/pkgconfig|' \
Index: head/sysutils/polkit-qt5/Makefile
===================================================================
--- head/sysutils/polkit-qt5/Makefile
+++ head/sysutils/polkit-qt5/Makefile
@@ -1,11 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= polkit-qt
-PORTREVISION= 0
-PKGNAMESUFFIX= 5
-
-COMMENT= Qt5 wrapper around Polkit libraries
-
-MASTERDIR= ${.CURDIR:H}/polkit-qt
-
-.include "${MASTERDIR}/Makefile"
Index: head/x11/kdelibs-kde4/Makefile
===================================================================
--- head/x11/kdelibs-kde4/Makefile
+++ head/x11/kdelibs-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_KDELIBS_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11 kde kde-applications
PKGNAMESUFFIX= -kde4
@@ -18,7 +18,7 @@
libpng.so:graphics/png \
libhal.so:sysutils/hal \
libqca.so:devel/qca \
- libpolkit-qt-core-1.so:sysutils/polkit-qt \
+ libpolkit-qt-core-1.so:sysutils/polkit-qt@qt4 \
libdbusmenu-qt.so:devel/libdbusmenu-qt@qt4 \
libstreams.so:deskutils/libstreams

File Metadata

Mime Type
text/plain
Expires
Mon, Aug 24, 12:52 PM (16 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37184433
Default Alt Text
D14642.diff (5 KB)

Event Timeline