From owner-svn-ports-all@freebsd.org Sat Apr 14 13:30:13 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEB65FA07E2; Sat, 14 Apr 2018 13:30:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 72E917D2CF; Sat, 14 Apr 2018 13:30:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6DE7628D1D; Sat, 14 Apr 2018 13:30:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3EDUDL4064219; Sat, 14 Apr 2018 13:30:13 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3EDUCs7064212; Sat, 14 Apr 2018 13:30:12 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201804141330.w3EDUCs7064212@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 14 Apr 2018 13:30:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467318 - in head: . devel/kf5-kauth sysutils sysutils/kcm-polkit-kde sysutils/polkit-kde sysutils/polkit-qt sysutils/polkit-qt5 x11/kdelibs-kde4 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: . devel/kf5-kauth sysutils sysutils/kcm-polkit-kde sysutils/polkit-kde sysutils/polkit-qt sysutils/polkit-qt5 x11/kdelibs-kde4 X-SVN-Commit-Revision: 467318 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2018 13:30:14 -0000 Author: tcberner Date: Sat Apr 14 13:30:12 2018 New Revision: 467318 URL: https://svnweb.freebsd.org/changeset/ports/467318 Log: sysutils/polkit-qt, sysutils/polkit-qt5: convert to flavor Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D14642 Deleted: head/sysutils/polkit-qt5/ Modified: head/MOVED head/devel/kf5-kauth/Makefile head/sysutils/Makefile head/sysutils/kcm-polkit-kde/Makefile head/sysutils/polkit-kde/Makefile head/sysutils/polkit-qt/Makefile head/x11/kdelibs-kde4/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sat Apr 14 13:16:32 2018 (r467317) +++ head/MOVED Sat Apr 14 13:30:12 2018 (r467318) @@ -10147,3 +10147,4 @@ security/py-zxcvbn-python|security/py-zxcvbn|2018-04-1 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 Modified: head/devel/kf5-kauth/Makefile ============================================================================== --- head/devel/kf5-kauth/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/devel/kf5-kauth/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -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 Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/sysutils/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -891,7 +891,6 @@ SUBDIR += polkit-gnome SUBDIR += polkit-kde SUBDIR += polkit-qt - SUBDIR += polkit-qt5 SUBDIR += pot SUBDIR += powerdxx SUBDIR += powerman Modified: head/sysutils/kcm-polkit-kde/Makefile ============================================================================== --- head/sysutils/kcm-polkit-kde/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/sysutils/kcm-polkit-kde/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -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 @@ DISTNAME= ${PORTNAME}-kcmodules-1-${PORTDATE} 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 Modified: head/sysutils/polkit-kde/Makefile ============================================================================== --- head/sysutils/polkit-kde/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/sysutils/polkit-kde/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -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 @@ COMMENT= Polkit authentication UI for KDE Workspaces 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 Modified: head/sysutils/polkit-qt/Makefile ============================================================================== --- head/sysutils/polkit-qt/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/sysutils/polkit-qt/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -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|' \ Modified: head/x11/kdelibs-kde4/Makefile ============================================================================== --- head/x11/kdelibs-kde4/Makefile Sat Apr 14 13:16:32 2018 (r467317) +++ head/x11/kdelibs-kde4/Makefile Sat Apr 14 13:30:12 2018 (r467318) @@ -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 @@ LIB_DEPENDS= libImath-2_2.so:graphics/ilmbase \ 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