Index: head/sysutils/polkit-qt/Makefile =================================================================== --- head/sysutils/polkit-qt/Makefile +++ head/sysutils/polkit-qt/Makefile @@ -8,24 +8,36 @@ MASTER_SITES= KDE/stable/apps/KDE4.x/admin/ MAINTAINER= kde@FreeBSD.org -COMMENT= Qt wrapper around Polkit libraries +COMMENT?= Qt4 wrapper around Polkit libraries LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit +USES= cmake:outsource pkgconfig tar:bzip2 +USE_GNOME= glib20 CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TEST:BOOL=OFF \ - -DUSE_QT4:BOOL=ON + -DBUILD_TEST:BOOL=OFF -USES= cmake:outsource kde:4 pkgconfig tar:bzip2 -USE_GNOME= glib20 + +.if empty(PKGNAMESUFFIX) +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 +USE_QT5= core dbus gui widgets buildtools_build qmake_build +CMAKE_ARGS+= -DUSE_QT4:BOOL=OFF \ + -DUSE_QT5:BOOL=ON +.endif + USE_LDCONFIG= yes +PLIST_SUB= QTVER_SUFFIX="${PKGNAMESUFFIX}" + post-patch: ${REINPLACE_CMD} -e 's|$${LIB_DESTINATION}/pkgconfig|libdata/pkgconfig|' \ ${WRKSRC}/CMakeLists.txt Index: head/sysutils/polkit-qt/pkg-plist =================================================================== --- head/sysutils/polkit-qt/pkg-plist +++ head/sysutils/polkit-qt/pkg-plist @@ -1,41 +1,41 @@ -include/polkit-qt-1/PolkitQt1/ActionDescription -include/polkit-qt-1/PolkitQt1/Agent/Listener -include/polkit-qt-1/PolkitQt1/Agent/Session -include/polkit-qt-1/PolkitQt1/Authority -include/polkit-qt-1/PolkitQt1/Details -include/polkit-qt-1/PolkitQt1/Gui/Action -include/polkit-qt-1/PolkitQt1/Gui/ActionButton -include/polkit-qt-1/PolkitQt1/Gui/ActionButtons -include/polkit-qt-1/PolkitQt1/Identity -include/polkit-qt-1/PolkitQt1/Subject -include/polkit-qt-1/PolkitQt1/TemporaryAuthorization -include/polkit-qt-1/polkitqt1-actiondescription.h -include/polkit-qt-1/polkitqt1-agent-listener.h -include/polkit-qt-1/polkitqt1-agent-session.h -include/polkit-qt-1/polkitqt1-authority.h -include/polkit-qt-1/polkitqt1-details.h -include/polkit-qt-1/polkitqt1-export.h -include/polkit-qt-1/polkitqt1-gui-action.h -include/polkit-qt-1/polkitqt1-gui-actionbutton.h -include/polkit-qt-1/polkitqt1-gui-actionbuttons.h -include/polkit-qt-1/polkitqt1-identity.h -include/polkit-qt-1/polkitqt1-subject.h -include/polkit-qt-1/polkitqt1-temporaryauthorization.h -include/polkit-qt-1/polkitqt1-version.h -lib/cmake/PolkitQt-1/PolkitQt-1Config.cmake -lib/cmake/PolkitQt-1/PolkitQt-1ConfigVersion.cmake -lib/cmake/PolkitQt-1/PolkitQt-1Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/PolkitQt-1/PolkitQt-1Targets.cmake -lib/libpolkit-qt-agent-1.so -lib/libpolkit-qt-agent-1.so.1 -lib/libpolkit-qt-agent-1.so.1.112.0 -lib/libpolkit-qt-core-1.so -lib/libpolkit-qt-core-1.so.1 -lib/libpolkit-qt-core-1.so.1.112.0 -lib/libpolkit-qt-gui-1.so -lib/libpolkit-qt-gui-1.so.1 -lib/libpolkit-qt-gui-1.so.1.112.0 -libdata/pkgconfig/polkit-qt-1.pc -libdata/pkgconfig/polkit-qt-agent-1.pc -libdata/pkgconfig/polkit-qt-core-1.pc -libdata/pkgconfig/polkit-qt-gui-1.pc +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/ActionDescription +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Agent/Listener +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Agent/Session +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Authority +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Details +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Gui/Action +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Gui/ActionButton +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Gui/ActionButtons +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Identity +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/Subject +include/polkit-qt%%QTVER_SUFFIX%%-1/PolkitQt1/TemporaryAuthorization +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-actiondescription.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-agent-listener.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-agent-session.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-authority.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-details.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-export.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-gui-action.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-gui-actionbutton.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-gui-actionbuttons.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-identity.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-subject.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-temporaryauthorization.h +include/polkit-qt%%QTVER_SUFFIX%%-1/polkitqt1-version.h +lib/cmake/PolkitQt%%QTVER_SUFFIX%%-1/PolkitQt%%QTVER_SUFFIX%%-1Config.cmake +lib/cmake/PolkitQt%%QTVER_SUFFIX%%-1/PolkitQt%%QTVER_SUFFIX%%-1ConfigVersion.cmake +lib/cmake/PolkitQt%%QTVER_SUFFIX%%-1/PolkitQt%%QTVER_SUFFIX%%-1Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/PolkitQt%%QTVER_SUFFIX%%-1/PolkitQt%%QTVER_SUFFIX%%-1Targets.cmake +lib/libpolkit-qt%%QTVER_SUFFIX%%-agent-1.so +lib/libpolkit-qt%%QTVER_SUFFIX%%-agent-1.so.1 +lib/libpolkit-qt%%QTVER_SUFFIX%%-agent-1.so.1.112.0 +lib/libpolkit-qt%%QTVER_SUFFIX%%-core-1.so +lib/libpolkit-qt%%QTVER_SUFFIX%%-core-1.so.1 +lib/libpolkit-qt%%QTVER_SUFFIX%%-core-1.so.1.112.0 +lib/libpolkit-qt%%QTVER_SUFFIX%%-gui-1.so +lib/libpolkit-qt%%QTVER_SUFFIX%%-gui-1.so.1 +lib/libpolkit-qt%%QTVER_SUFFIX%%-gui-1.so.1.112.0 +libdata/pkgconfig/polkit-qt%%QTVER_SUFFIX%%-1.pc +libdata/pkgconfig/polkit-qt%%QTVER_SUFFIX%%-agent-1.pc +libdata/pkgconfig/polkit-qt%%QTVER_SUFFIX%%-core-1.pc +libdata/pkgconfig/polkit-qt%%QTVER_SUFFIX%%-gui-1.pc Index: head/sysutils/polkit-qt5/Makefile =================================================================== --- head/sysutils/polkit-qt5/Makefile +++ head/sysutils/polkit-qt5/Makefile @@ -1,31 +1,11 @@ # $FreeBSD$ -PORTNAME= polkit-qt5 -DISTNAME= polkit-qt-1-${PORTVERSION} -PORTVERSION= 0.112.0 -CATEGORIES= sysutils -MASTER_SITES= KDE/stable/apps/KDE4.x/admin/ +PORTNAME= polkit-qt +PORTREVISION= 0 +PKGNAMESUFFIX= 5 -MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 wrapper around Polkit libraries -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +MASTERDIR= ${.CURDIR:H}/polkit-qt -LIB_DEPENDS= libpolkit-agent-1.so:sysutils/polkit - -CMAKE_ARGS= -DBUILD_EXAMPLES:BOOL=OFF \ - -DBUILD_TEST:BOOL=OFF \ - -DUSE_QT4:BOOL=OFF \ - -DUSE_QT5:BOOL=ON - -USE_GNOME= glib20 -USE_QT5= core dbus gui widgets buildtools_build qmake_build -USES= cmake:outsource tar:bzip2 -USE_LDCONFIG= yes - -post-patch: - ${REINPLACE_CMD} -e 's|$${LIB_DESTINATION}/pkgconfig|libdata/pkgconfig|' \ - ${WRKSRC}/CMakeLists.txt - -.include +.include "${MASTERDIR}/Makefile" Index: head/sysutils/polkit-qt5/distinfo =================================================================== --- head/sysutils/polkit-qt5/distinfo +++ head/sysutils/polkit-qt5/distinfo @@ -1,2 +0,0 @@ -SHA256 (polkit-qt-1-0.112.0.tar.bz2) = 67fb03bf6ca3e0bdbd98d374dfb5b1651a07d17ae6c23e11a81b4b084447e7c6 -SIZE (polkit-qt-1-0.112.0.tar.bz2) = 67725 Index: head/sysutils/polkit-qt5/pkg-descr =================================================================== --- head/sysutils/polkit-qt5/pkg-descr +++ head/sysutils/polkit-qt5/pkg-descr @@ -1,6 +0,0 @@ -Polkit-Qt is a library that lets developers use the Polkit API through -a nice Qt-styled API. It is mainly a wrapper around QAction and -QAbstractButton that lets you integrate those two component easily -with Polkit. - -WWW: http://projects.kde.org/projects/kdesupport/polkit-qt-1 Index: head/sysutils/polkit-qt5/pkg-plist =================================================================== --- head/sysutils/polkit-qt5/pkg-plist +++ head/sysutils/polkit-qt5/pkg-plist @@ -1,41 +0,0 @@ -include/polkit-qt5-1/PolkitQt1/ActionDescription -include/polkit-qt5-1/PolkitQt1/Agent/Listener -include/polkit-qt5-1/PolkitQt1/Agent/Session -include/polkit-qt5-1/PolkitQt1/Authority -include/polkit-qt5-1/PolkitQt1/Details -include/polkit-qt5-1/PolkitQt1/Gui/Action -include/polkit-qt5-1/PolkitQt1/Gui/ActionButton -include/polkit-qt5-1/PolkitQt1/Gui/ActionButtons -include/polkit-qt5-1/PolkitQt1/Identity -include/polkit-qt5-1/PolkitQt1/Subject -include/polkit-qt5-1/PolkitQt1/TemporaryAuthorization -include/polkit-qt5-1/polkitqt1-actiondescription.h -include/polkit-qt5-1/polkitqt1-agent-listener.h -include/polkit-qt5-1/polkitqt1-agent-session.h -include/polkit-qt5-1/polkitqt1-authority.h -include/polkit-qt5-1/polkitqt1-details.h -include/polkit-qt5-1/polkitqt1-export.h -include/polkit-qt5-1/polkitqt1-gui-action.h -include/polkit-qt5-1/polkitqt1-gui-actionbutton.h -include/polkit-qt5-1/polkitqt1-gui-actionbuttons.h -include/polkit-qt5-1/polkitqt1-identity.h -include/polkit-qt5-1/polkitqt1-subject.h -include/polkit-qt5-1/polkitqt1-temporaryauthorization.h -include/polkit-qt5-1/polkitqt1-version.h -lib/cmake/PolkitQt5-1/PolkitQt5-1Config.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1ConfigVersion.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1Targets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/PolkitQt5-1/PolkitQt5-1Targets.cmake -lib/libpolkit-qt5-agent-1.so -lib/libpolkit-qt5-agent-1.so.1 -lib/libpolkit-qt5-agent-1.so.1.112.0 -lib/libpolkit-qt5-core-1.so -lib/libpolkit-qt5-core-1.so.1 -lib/libpolkit-qt5-core-1.so.1.112.0 -lib/libpolkit-qt5-gui-1.so -lib/libpolkit-qt5-gui-1.so.1 -lib/libpolkit-qt5-gui-1.so.1.112.0 -libdata/pkgconfig/polkit-qt5-1.pc -libdata/pkgconfig/polkit-qt5-agent-1.pc -libdata/pkgconfig/polkit-qt5-core-1.pc -libdata/pkgconfig/polkit-qt5-gui-1.pc