Index: head/Mk/Uses/kde.mk =================================================================== --- head/Mk/Uses/kde.mk (revision 437223) +++ head/Mk/Uses/kde.mk (revision 437224) @@ -1,655 +1,655 @@ # $FreeBSD$ # # Provides support for KDE and KF5-based ports. # # Feature: kde # Valid ARGS: 4 5 # # 4: Depend on KDE4 components and variables. # 5: Depend on KDE Frameworks 5 components and variables. # # Variables that can be set by a port: # # USE_KDE List of KDE4/KF5/Plasma5 components (other ports) that this # port depends on. # * foo_build Add a build-time dependency (BUILD_DEPENDS) # * foo_run Add a run-time dependency (RUN_DEPENDS) # * foo (default) Add both dependencies on component , or # a LIB_DEPENDS if applicable. # # To simplify the ports, also: # CATEGORIES If the port is part of one of the KDE Software distribution, # it can add, in addition to 'kde' one of the following: # kde-frameworks: part of frameworks release # kde-kde4: part of kde4 release # this will then set default values for MASTER_SITES and DIST_SUBDIR # as well as CPE_VENDOR and LICENSE. # # MAINTAINER: kde@FreeBSD.org .if !defined(_INCLUDE_USES_KDE_MK) _INCLUDE_USES_KDE_MK= yes _KDE_SUPPORTED= 4 5 . if empty(kde_ARGS) IGNORE= kde needs a version (${_KDE_SUPPORTED}) . endif . for ver in ${_KDE_SUPPORTED:O:u} . if ${kde_ARGS:M${ver}} . if !defined(_KDE_VERSION) _KDE_VERSION= ${ver} . else IGNORE?= cannot be installed: different KDE versions specified via kde:[${_KDE_SUPPORTED:S/ //g}] #' . endif . endif . endfor . if empty(_KDE_VERSION) IGNORE?= kde:[${_KDE_SUPPORTED:S/ //g}] needs an argument #' . endif _KDE_RELNAME= KDE${_KDE_VERSION} # === VERSIONS OF THE DIFFERENT COMPONENTS ===================================== # Old KDE desktop. KDE4_VERSION?= 4.14.3 KDE4_KDELIBS_VERSION= 4.14.30 KDE4_ACTIVITIES_VERSION= 4.13.3 -KDE4_WORKSPACE_VERSION= 4.11.21 +KDE4_WORKSPACE_VERSION= 4.11.22 KDE4_KDEPIM_VERSION?= 4.14.10 # Applications version for the kde4-applications. KDE4_APPLICATIONS_BRANCH?= Attic KDE4_APPLICATIONS_VERSION?= 15.04.3 KDE4_BRANCH?= stable # Current KDE desktop. KDE_FRAMEWORKS_VERSION?= 5.32.0 KDE_FRAMEWORKS_BRANCH?= stable # Current KDE applications. KDE_APPLICATIONS_VERSION?= 16.12.3 KDE_APPLICATIONS_BRANCH?= stable # Upstream moves old software to Attic/. Specify the newest applications release there. # Only the major version is used for the comparison. _KDE_APPLICATIONS_ATTIC_VERSION= 15.12.3 # Extended KDE universe applications. CALLIGRA_VERSION?= 2.9.11 CALLIGRA_BRANCH?= stable KDEVELOP_VERSION?= 4.7.4 KDEVELOP_BRANCH?= stable KTP_VERSION?= 0.9.0 KTP_BRANCH?= stable # ============================================================================== # === INSTALLATION PREFIXES AND HEADER LOCATION ================================ # Define unversioned prefix variable. KDE_PREFIX= ${LOCALBASE} # ============================================================================== # === CATEGORIES HANDLING -- SETTING DEFAULT VALUES ============================ # Doing MASTER_SITES magic based on the category of the port _KDE_CATEGORIES_SUPPORTED= kde-applications kde-frameworks kde-kde4 . for cat in ${_KDE_CATEGORIES_SUPPORTED} . if ${CATEGORIES:M${cat}} . if !defined(_KDE_CATEGORY) _KDE_CATEGORY= ${cat} . else IGNORE?= cannot be installed: multiple kde-<...> categories specified via CATEGORIES=${CATEGORIES} #' . endif . endif . endfor . if defined(_KDE_CATEGORY) # KDE is normally licensed under the LGPL 2.0. LICENSE?= LGPL20 # Set CPE Vendor Information # As _KDE_CATEGORY is set we can assume it is port release by KDE and the # vendor is therefore kde. CPE_VENDOR?= kde . if ${_KDE_CATEGORY:Mkde-kde4} PORTVERSION?= ${KDE4_VERSION} MASTER_SITES?= KDE/${KDE4_BRANCH}/${KDE4_VERSION}/src DIST_SUBDIR?= KDE/${KDE4_VERSION} . elif ${_KDE_CATEGORY:Mkde-applications} PORTVERSION?= ${KDE_APPLICATIONS_VERSION} . if ${_KDE_VERSION:M4} CONFLICTS_INSTALL?= ${PORTNAME}-kf5-* . else CONFLICTS_INSTALL?= kde4-${PORTNAME}-* ${PORTNAME}-kde4-* . endif # Decide where the file lies on KDE's servers: Check whether the file lies in Attic . if ${KDE_APPLICATIONS_VERSION:R:R} <= ${_KDE_APPLICATIONS_ATTIC_VERSION:R:R} MASTER_SITES?= KDE/Attic/applications/${KDE_APPLICATIONS_VERSION}/src . else MASTER_SITES?= KDE/${KDE_APPLICATIONS_BRANCH}/applications/${KDE_APPLICATIONS_VERSION}/src . endif DIST_SUBDIR?= KDE/applications/${KDE_APPLICATIONS_VERSION} . elif ${_KDE_CATEGORY:Mkde-frameworks} PORTVERSION?= ${KDE_FRAMEWORKS_VERSION} PKGNAMEPREFIX?= kf5- # This is a slight duplication of _USE_FRAMEWORKS_PORTING -- it maybe would be # better to rely on ${_USE_FRAMEWORKS_PORTING:S/^/k/g} _PORTINGAIDS= kjs kjsembed kdelibs4support khtml kmediaplayer kross . if ${_PORTINGAIDS:M*${PORTNAME}*} MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION:R}/portingAids . else MASTER_SITES?= KDE/${KDE_FRAMEWORKS_BRANCH}/frameworks/${KDE_FRAMEWORKS_VERSION:R} . endif DIST_SUBDIR?= KDE/frameworks/${KDE_FRAMEWORKS_VERSION} . else IGNORE?= unknown CATEGORY value '${_KDE_CATEGORY}' #' . endif . endif #defined(_KDE_CATEGORY) # ============================================================================== # ==== SETUP CMAKE ENVIRONMENT ================================================= # Help cmake to find files when testing ports with non-default PREFIX. CMAKE_ARGS+= -DCMAKE_PREFIX_PATH="${LOCALBASE}" . if ${_KDE_VERSION:M*4*} CMAKE_ARGS+= -DKDE4_BUILD_TESTS:BOOL=OFF . elif ${_KDE_VERSION:M*5*} # We set KDE_INSTALL_USE_QT_SYS_PATHS to install mkspecs files, plugins and # imports to the Qt 5 install directory. CMAKE_ARGS+= -DBUILD_TESTING:BOOL=OFF \ -DCMAKE_MODULE_PATH="${LOCALBASE};${KDE_PREFIX}" \ -DCMAKE_INSTALL_PREFIX="${KDE_PREFIX}" \ -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=TRUE . endif # Set man-page installation prefix. CMAKE_ARGS+= -DKDE_INSTALL_MANDIR:PATH="${KDE_PREFIX}/man" \ -DMAN_INSTALL_DIR:PATH="${KDE_PREFIX}/man" # ============================================================================== # === SET-UP PLIST_SUB ========================================================= # Prefix and include directory. PLIST_SUB+= KDE_PREFIX="${KDE_PREFIX}" # KDE Applications version. PLIST_SUB+= KDE_APPLICATIONS_VERSION="${KDE_APPLICATIONS_VERSION}" # For KDE4 applications provide KDE4 version numbers. . if ${_KDE_VERSION:M*4*} PLIST_SUB+= KDE4_VERSION="${KDE4_VERSION}" \ KDE4_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION} \ KDE4_NON_GENERIC_LIB_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} \ KDE4_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION} \ KDE4_NG_KDELIBS_VERSION=${KDE4_KDELIBS_VERSION:S,^4,5,} . elif ${_KDE_VERSION:M*5*} PLIST_SUB+= KDE_FRAMEWORKS_VERSION="${KDE_FRAMEWORKS_VERSION}" . endif # ============================================================================== # === HANDLE PYTHON ============================================================ # TODO: Keep in sync with cmake/modules/PythonMacros.cmake _PYTHON_SHORT_VER= ${PYTHON_VERSION:S/^python//:S/.//} . if ${_PYTHON_SHORT_VER} > 31 PLIST_SUB+= PYCACHE="__pycache__/" \ PYC_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyc \ PYO_SUFFIX=cpython-${_PYTHON_SHORT_VER}.pyo . else PLIST_SUB+= PYCACHE="" \ PYC_SUFFIX=pyc \ PYO_SUFFIX=pyo . endif # ============================================================================== _USE_KDE4_ALL= baloo baloo-widgets baseapps kactivities kate kdelibs \ kfilemetadata korundum libkcddb libkcompactdisc \ libkdcraw libkdeedu libkdegames libkexiv2 libkipi \ libkonq libksane marble nepomuk-core nepomuk-widgets \ okular oxygen-icons4 perlkde perlqt pimlibs pykde4 \ pykdeuic4 qtruby runtime smokegen smokekde smokeqt \ workspace # These components are not part of the Software Compilation. _USE_KDE4_ALL+= akonadi attica automoc4 ontologies qimageblitz soprano \ strigi # List of components of the KDE Frameworks distribution. # The *_TIER variables are internal, primarily for checking # that our list of frameworks matches the structure offered upstream. _USE_FRAMEWORKS_TIER1= apidox archive attica5 breeze-icons codecs config \ coreaddons dbusaddons dnssd i18n idletime itemmodels \ itemviews oxygen-icons5 plotting prison solid sonnet \ syntaxhighlighting threadweaver wayland widgetsaddons \ windowsystem # NOT LISTED TIER1: modemmanagerqt networkmanagerqt (not applicable) _USE_FRAMEWORKS_TIER2= auth completion crash doctools filemetadata5 \ kimageformats jobwidgets notifications package \ pty unitconversion # NOT LISTED TIER2: activities-stats (runtime requires x11/plasma5-kactivitymanagerd) _USE_FRAMEWORKS_TIER3= activities baloo5 bookmarks configwidgets \ designerplugin emoticons globalaccel guiaddons \ iconthemes init kcmutils kdeclarative \ kded kdesu kdewebkit kio newstuff notifyconfig parts \ people plasma-framework runner service texteditor \ textwidgets wallet xmlgui xmlrpcclient _USE_FRAMEWORKS_TIER4= frameworkintegration # Porting Aids frameworks provide code and utilities to ease the transition from # kdelibs 4 to KDE Frameworks 5. Code should aim to port away from this framework, # new projects should avoid using these libraries. _USE_FRAMEWORKS_PORTING=js jsembed kdelibs4support khtml mediaplayer kross # These are weird items: not officially released as Frameworks, but # required by them (and from KDE). # - kirigami https://dot.kde.org/2016/03/30/kde-proudly-presents-kirigami-ui _USE_FRAMEWORKS_EXTRA= kirigami kirigami2 _USE_FRAMEWORKS_ALL= ecm \ ${_USE_FRAMEWORKS_TIER1} \ ${_USE_FRAMEWORKS_TIER2} \ ${_USE_FRAMEWORKS_TIER3} \ ${_USE_FRAMEWORKS_TIER4} \ ${_USE_FRAMEWORKS_PORTING} \ ${_USE_FRAMEWORKS_EXTRA} _USE_KDE5_ALL= ${_USE_FRAMEWORKS_ALL} # ====================== kde4 components ======================================= baloo_PORT= sysutils/baloo baloo_LIB= libbaloocore.so baloo-widgets_PORT= sysutils/baloo-widgets baloo-widgets_LIB= libbaloowidgets.so baseapps_PORT= x11/kde4-baseapps baseapps_PATH= ${KDE_PREFIX}/bin/kfmclient baseapps_TYPE= run kactivities_PORT= x11/kactivities kactivities_LIB= libkactivities.so kate_PORT= editors/kate kate_LIB= libkateinterfaces.so kdelibs_PORT= x11/kdelibs4 kdelibs_LIB= libkdecore.so kfilemetadata_PORT= sysutils/kfilemetadata kfilemetadata_LIB= libkfilemetadata.so korundum_PORT= devel/ruby-korundum korundum_PATH= ${KDE_PREFIX}/lib/kde4/krubypluginfactory.so korundum_TYPE= run libkcddb_PORT= audio/libkcddb libkcddb_LIB= libkcddb.so libkcompactdisc_PORT= audio/libkcompactdisc libkcompactdisc_LIB= libkcompactdisc.so libkdcraw_PORT= graphics/libkdcraw-kde4 libkdcraw_LIB= libkdcraw.so libkdeedu_PORT= misc/libkdeedu libkdeedu_LIB= libkeduvocdocument.so libkdegames_PORT= games/libkdegames libkdegames_LIB= libkdegames.so libkexiv2_PORT= graphics/libkexiv2-kde4 libkexiv2_LIB= libkexiv2.so libkipi_PORT= graphics/libkipi-kde4 libkipi_LIB= libkipi.so libkonq_PORT= x11/libkonq libkonq_LIB= libkonq.so libksane_PORT= graphics/libksane libksane_LIB= libksane.so marble_PORT= astro/marble marble_LIB= libmarblewidget.so nepomuk-core_PORT= sysutils/nepomuk-core nepomuk-core_LIB= libnepomukcore.so nepomuk-widgets_PORT= sysutils/nepomuk-widgets nepomuk-widgets_LIB= libnepomukwidgets.so okular_PORT= graphics/okular okular_LIB= libokularcore.so oxygen-icons4_PORT= x11-themes/kde4-icons-oxygen oxygen-icons4_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme oxygen-icons4_TYPE= run perlkde_PORT= devel/p5-perlkde perlkde_PATH= ${KDE_PREFIX}/lib/kde4/kperlpluginfactory.so perlkde_TYPE= run perlqt_PORT= devel/p5-perlqt perlqt_PATH= ${KDE_PREFIX}/bin/puic4 pimlibs_PORT= deskutils/kdepimlibs4 pimlibs_LIB= libkpimutils.so pykde4_PORT= devel/py-pykde4 pykde4_PATH= ${KDE_PREFIX}/lib/kde4/kpythonpluginfactory.so pykde4_TYPE= run pykdeuic4_PORT= devel/py-pykdeuic4 pykdeuic4_PATH= ${LOCALBASE}/bin/pykdeuic4 pykdeuic4_TYPE= run qtruby_PORT= devel/ruby-qtruby qtruby_LIB= libqtruby4shared.so runtime_PORT= x11/kde4-runtime runtime_PATH= ${KDE_PREFIX}/bin/knotify4 runtime_TYPE= run smokegen_PORT= devel/smokegen smokegen_LIB= libsmokebase.so smokekde_PORT= devel/smokekde smokekde_LIB= libsmokekdecore.so smokeqt_PORT= devel/smokeqt smokeqt_LIB= libsmokeqtcore.so workspace_PORT= x11/kde4-workspace workspace_LIB= libkworkspace.so # Non-Software Compilation components akonadi_PORT= databases/akonadi akonadi_LIB= libakonadiprotocolinternals.so attica_PORT= x11-toolkits/attica attica_LIB= libattica.so automoc4_PORT= devel/automoc4 automoc4_PATH= ${LOCALBASE}/bin/automoc4 automoc4_TYPE= build ontologies_PORT= x11-toolkits/shared-desktop-ontologies ontologies_PATH= ${LOCALBASE}/share/ontology/core/rdf.ontology qimageblitz_PORT= x11/qimageblitz qimageblitz_LIB= libqimageblitz.so soprano_PORT= textproc/soprano soprano_LIB= libsoprano.so strigi_PORT= deskutils/libstreamanalyzer strigi_LIB= libstreamanalyzer.so.0 # ====================== end of kde4 components ================================ # ====================== frameworks components ================================= activities_PORT= x11/kf5-kactivities activities_LIB= libKF5Activities.so apidox_PORT= devel/kf5-kapidox apidox_PATH= ${KDE_PREFIX}/bin/kapidox_generate apidox_TYPE= run archive_PORT= archivers/kf5-karchive archive_LIB= libKF5Archive.so attica5_PORT= x11-toolkits/kf5-attica attica5_LIB= libKF5Attica.so auth_PORT= devel/kf5-kauth auth_LIB= libKF5Auth.so baloo5_PORT= sysutils/kf5-baloo baloo5_LIB= libKF5Baloo.so bookmarks_PORT= devel/kf5-kbookmarks bookmarks_LIB= libKF5Bookmarks.so breeze-icons_PORT= x11-themes/kf5-breeze-icons breeze-icons_PATH= ${KDE_PREFIX}/share/icons/breeze/index.theme breeze-icons_TYPE= run codecs_PORT= textproc/kf5-kcodecs codecs_LIB= libKF5Codecs.so completion_PORT= x11-toolkits/kf5-kcompletion completion_LIB= libKF5Completion.so config_PORT= devel/kf5-kconfig config_LIB= libKF5ConfigCore.so configwidgets_PORT= x11-toolkits/kf5-kconfigwidgets configwidgets_LIB= libKF5ConfigWidgets.so coreaddons_PORT= devel/kf5-kcoreaddons coreaddons_LIB= libKF5CoreAddons.so crash_PORT= devel/kf5-kcrash crash_LIB= libKF5Crash.so dbusaddons_PORT= devel/kf5-kdbusaddons dbusaddons_LIB= libKF5DBusAddons.so designerplugin_PORT= x11-toolkits/kf5-kdesignerplugin designerplugin_PATH= ${QT_PLUGINDIR}/designer/kf5widgets.so designerplugin_TYPE= run dnssd_PORT= dns/kf5-kdnssd dnssd_LIB= libKF5DNSSD.so doctools_PORT= devel/kf5-kdoctools doctools_PATH= ${KDE_PREFIX}/bin/meinproc5 ecm_PORT= devel/kf5-extra-cmake-modules ecm_PATH= ${LOCALBASE}/share/ECM/cmake/ECMConfig.cmake emoticons_PORT= x11-themes/kf5-kemoticons emoticons_LIB= libKF5Emoticons.so filemetadata5_PORT= devel/kf5-kfilemetadata filemetadata5_LIB= libKF5FileMetaData.so frameworkintegration_PORT= x11/kf5-frameworkintegration frameworkintegration_LIB= libKF5Style.so globalaccel_PORT= x11/kf5-kglobalaccel globalaccel_LIB= libKF5GlobalAccel.so guiaddons_PORT= x11-toolkits/kf5-kguiaddons guiaddons_LIB= libKF5GuiAddons.so i18n_PORT= devel/kf5-ki18n i18n_LIB= libKF5I18n.so iconthemes_PORT= x11-themes/kf5-kiconthemes iconthemes_LIB= libKF5IconThemes.so idletime_PORT= devel/kf5-kidletime idletime_LIB= libKF5IdleTime.so init_PORT= x11/kf5-kinit init_PATH= ${KDE_PREFIX}/bin/kdeinit5 itemmodels_PORT= devel/kf5-kitemmodels itemmodels_LIB= libKF5ItemModels.so itemviews_PORT= x11-toolkits/kf5-kitemviews itemviews_LIB= libKF5ItemViews.so jobwidgets_PORT= x11-toolkits/kf5-kjobwidgets jobwidgets_LIB= libKF5JobWidgets.so js_PORT= www/kf5-kjs js_LIB= libKF5JS.so jsembed_PORT= www/kf5-kjsembed jsembed_LIB= libKF5JsEmbed.so kcmutils_PORT= devel/kf5-kcmutils kcmutils_LIB= libKF5KCMUtils.so kdeclarative_PORT= devel/kf5-kdeclarative kdeclarative_LIB= libKF5Declarative.so kded_PORT= x11/kf5-kded kded_LIB= libkdeinit5_kded5.so kdelibs4support_PORT= x11/kf5-kdelibs4support kdelibs4support_LIB= libKF5KDELibs4Support.so kdesu_PORT= security/kf5-kdesu kdesu_LIB= libKF5Su.so kdewebkit_PORT= www/kf5-kdewebkit kdewebkit_LIB= libKF5WebKit.so khtml_PORT= www/kf5-khtml khtml_LIB= libKF5KHtml.so kimageformats_PORT= graphics/kf5-kimageformats kimageformats_PATH= ${QT_PLUGINDIR}/imageformats/kimg_xcf.so kimageformats_TYPE= run kio_PORT= devel/kf5-kio kio_LIB= libKF5KIOCore.so kirigami_PORT= x11-toolkits/kirigami kirigami_PATH= ${QT_QMLDIR}/org/kde/kirigami/libkirigamiplugin.so kirigami2_PORT= x11-toolkits/kirigami2 kirigami2_PATH= ${QT_QMLDIR}/org/kde/kirigami.2/libkirigamiplugin.so kross_PORT= lang/kf5-kross kross_LIB= libKF5KrossCore.so mediaplayer_PORT= multimedia/kf5-kmediaplayer mediaplayer_LIB= libKF5MediaPlayer.so.5 newstuff_PORT= devel/kf5-knewstuff newstuff_LIB= libKF5NewStuff.so notifications_PORT= devel/kf5-knotifications notifications_LIB= libKF5Notifications.so notifyconfig_PORT= devel/kf5-knotifyconfig notifyconfig_LIB= libKF5NotifyConfig.so oxygen-icons5_PORT= x11-themes/kf5-oxygen-icons5 oxygen-icons5_PATH= ${KDE_PREFIX}/share/icons/oxygen/index.theme oxygen-icons5_TYPE= run package_PORT= devel/kf5-kpackage package_LIB= libKF5Package.so parts_PORT= devel/kf5-kparts parts_LIB= libKF5Parts.so people_PORT= devel/kf5-kpeople people_LIB= libKF5People.so plasma-framework_PORT= x11/kf5-plasma-framework plasma-framework_LIB= libKF5Plasma.so plotting_PORT= graphics/kf5-kplotting plotting_LIB= libKF5Plotting.so prison_PORT= graphics/kf5-prison prison_LIB= libKF5Prison.so pty_PORT= devel/kf5-kpty pty_LIB= libKF5Pty.so runner_PORT= x11/kf5-krunner runner_LIB= libKF5Runner.so service_PORT= devel/kf5-kservice service_PATH= ${KDE_PREFIX}/bin/kbuildsycoca5 solid_PORT= devel/kf5-solid solid_LIB= libKF5Solid.so sonnet_PORT= textproc/kf5-sonnet sonnet_LIB= libKF5SonnetCore.so syntaxhighlighting_PORT= textproc/kf5-syntax-highlighting syntaxhighlighting_LIB= libKF5SyntaxHighlighting.so texteditor_PORT= devel/kf5-ktexteditor texteditor_LIB= libKF5TextEditor.so textwidgets_PORT= x11-toolkits/kf5-ktextwidgets textwidgets_LIB= libKF5TextWidgets.so threadweaver_PORT= devel/kf5-threadweaver threadweaver_LIB= libKF5ThreadWeaver.so unitconversion_PORT= devel/kf5-kunitconversion unitconversion_LIB= libKF5UnitConversion.so wallet_PORT= sysutils/kf5-kwallet wallet_LIB= libKF5Wallet.so wayland_PORT= x11/kf5-kwayland wayland_LIB= libKF5WaylandClient.so widgetsaddons_PORT= x11-toolkits/kf5-kwidgetsaddons widgetsaddons_LIB= libKF5WidgetsAddons.so windowsystem_PORT= x11/kf5-kwindowsystem windowsystem_LIB= libKF5WindowSystem.so xmlgui_PORT= x11-toolkits/kf5-kxmlgui xmlgui_LIB= libKF5XmlGui.so xmlrpcclient_PORT= net/kf5-kxmlrpcclient xmlrpcclient_LIB= libKF5XmlRpcClient.so # ====================== end of frameworks components ========================== # end of component list ######################################################## _USE_KDE_ALL= ${_USE_${_KDE_RELNAME}_ALL} # Iterate through components deprived of suffix. . for component in ${USE_KDE:O:u:C/_.+//} # Check that the component is valid. . if ${_USE_KDE_ALL:M${component}} != "" # Skip meta-components (currently none). . if defined(${component}_PORT) && (defined(${component}_PATH) || defined(${component}_LIB)) # Check if a dependency type is explicitly requested. . if ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" ${component}_TYPE= # empty . if ${USE_KDE:M${component}_build} != "" ${component}_TYPE+= build . endif . if ${USE_KDE:M${component}_run} != "" ${component}_TYPE+= run . endif . endif # ${USE_KDE:M${component}_*} != "" && ${USE_KDE:M${component}} == "" # If no dependency type is set, default to full dependency. . if !defined(${component}_TYPE) ${component}_TYPE= build run . endif # Set real dependencies. . if defined(${component}_LIB) && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} LIB_DEPENDS+= ${${component}_LIB}:${${component}_PORT} . else ${component}_PATH?= ${KDE_PREFIX}/lib/${${component}_LIB} ${component}_DEPENDS= ${${component}_PATH}:${${component}_PORT} . if ${${component}_TYPE:Mbuild} != "" BUILD_DEPENDS+= ${${component}_DEPENDS} . endif . if ${${component}_TYPE:Mrun} != "" RUN_DEPENDS+= ${${component}_DEPENDS} . endif . endif # ${${component}_LIB} && ${${component}_TYPE:Mbuild} && ${${component}_TYPE:Mrun} . endif # defined(${component}_PORT) && defined(${component}_PATH) . else # ! ${_USE_KDE_ALL:M${component}} != "" IGNORE= cannot be installed: unknown USE_KDE component '${component}' . endif # ${_USE_KDE_ALL:M${component}} != "" . endfor .endif Index: head/sysutils/ksysguardd/Makefile =================================================================== --- head/sysutils/ksysguardd/Makefile (revision 437223) +++ head/sysutils/ksysguardd/Makefile (revision 437224) @@ -1,31 +1,31 @@ # $FreeBSD$ PORTNAME= ksysguardd PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= sysutils kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= sysutils kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= KDE System Guard Daemon DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo USES= cmake kde:4 tar:xz CMAKE_ARGS+= -DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \ -DSYSCONF_INSTALL_DIR:STRING="${PREFIX}/etc" +KDE_APPLICATIONS_VERSION= 15.08.0 + EXTRACT_AFTER_ARGS= '${DISTNAME}/ksysguard/${PORTNAME}' \ '${DISTNAME}/ksysguard/example/${PORTNAME}rc' \ '${DISTNAME}/ksysguard/gui/SignalIDs.h' -WRKSRC= ${WRKDIR}/${DISTNAME}/ksysguard/${PORTNAME} +WRKSRC_SUBDIR= ksysguard/${PORTNAME} PLIST_FILES= bin/${PORTNAME} \ etc/${PORTNAME}rc pre-build: ${REINPLACE_CMD} -e 's//"config-${PORTNAME}.h"/' \ ${WRKSRC}/${PORTNAME}.c .include Index: head/sysutils/ksysguardd/files/patch-modules.h =================================================================== --- head/sysutils/ksysguardd/files/patch-modules.h (nonexistent) +++ head/sysutils/ksysguardd/files/patch-modules.h (revision 437224) @@ -0,0 +1,13 @@ +* Silence a syntax warning + +--- modules.h.orig 2015-08-12 07:03:15 UTC ++++ modules.h +@@ -144,7 +144,7 @@ struct SensorModul SensorModulList[] = { + { "Uptime", initUptime, exitUptime, NULLIVFUNC, NULLVVFUNC, 0, NULLTIME }, + #endif /* OSTYPE_Linux */ + +-#if defined OSTYPE_FreeBSD || defined OSTYPE_DragonFly ++#if defined(OSTYPE_FreeBSD) || defined(OSTYPE_DragonFly) + { "Acpi", initACPI, exitACPI, updateACPI, NULLVVFUNC, 0, NULLTIME }, + #ifdef __i386__ + { "Apm", initApm, exitApm, updateApm, NULLVVFUNC, 0, NULLTIME }, Property changes on: head/sysutils/ksysguardd/files/patch-modules.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/kde4-workspace/Makefile =================================================================== --- head/x11/kde4-workspace/Makefile (revision 437223) +++ head/x11/kde4-workspace/Makefile (revision 437224) @@ -1,138 +1,139 @@ # $FreeBSD$ PORTNAME= kde-workspace PORTVERSION= ${KDE4_WORKSPACE_VERSION} -PORTREVISION= 7 -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src -DIST_SUBDIR= KDE/${PORTVERSION} +CATEGORIES= x11 kde kde-applications MAINTAINER= kde@FreeBSD.org COMMENT= KDE Plasma Desktop LIB_DEPENDS= libdbus-1.so:devel/dbus \ libck-connector.so:sysutils/consolekit \ libpci.so:devel/libpci \ libhal.so:sysutils/hal \ + libqjson.so:devel/qjson \ + libcln.so:math/cln \ libqalculate.so:math/libqalculate \ libprison.so:graphics/prison \ libboost_thread.so:devel/boost-libs \ libdbusmenu-qt.so:devel/libdbusmenu-qt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libpng.so:graphics/png \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms BUILD_DEPENDS= xrdb:x11/xrdb RUN_DEPENDS= ${KDE_PREFIX}/env/xdg-env.sh:misc/kde4-xdg-env \ ${LOCALBASE}/share/icons/hicolor/index.theme:misc/hicolor-icon-theme \ xprop:x11/xprop \ xsetroot:x11/xsetroot \ xmessage:x11/xmessage \ xrdb:x11/xrdb \ mkfontdir:x11-fonts/mkfontdir \ xset:x11/xset \ setxkbmap:x11/setxkbmap \ ${KDE_PREFIX}/bin/ksysguardd:sysutils/ksysguardd \ ${KDE_PREFIX}/lib/kde4/libexec/polkit-kde-authentication-agent-1:sysutils/polkit-kde \ ${KDE_PREFIX}/lib/kde4/libexec/polkitkde1helper:sysutils/kcm-polkit-kde \ ${LOCALBASE}/etc/pam.d/kde:security/pam_kde \ ${KDE_PREFIX}/share/apps/ksplash/Themes/Default/Theme.rc:x11-themes/kde4-base-artwork USES= cmake:outsource compiler:c++11-lib gettext gmake jpeg kde:4 \ pkgconfig shebangfix tar:xz -USE_GL= glu -USE_GNOME= glib20 +USE_GL= gl glu +USE_GNOME= glib20 libxml2 USE_KDE= kactivities kdelibs nepomuk-core oxygen-icons4 \ pimlibs akonadi automoc4 ontologies qimageblitz soprano strigi USE_QT4= corelib dbus declarative designer_build gui network \ - opengl phonon qtestlib script sql webkit xml \ + opengl phonon qtestlib script sql svg webkit xml \ moc_build qmake_build rcc_build uic_build -USE_XORG= kbproto x11 xau xcomposite xcursor xdamage xdmcp xfixes \ - xft xi xinerama xkbfile xrandr xrender xres xscrnsaver xtst +USE_XORG= ice sm kbproto x11 xau xcb xcomposite xcursor xdamage xdmcp xext xfixes \ + xft xi xinerama xkbfile xpm xrandr xrender xres xscrnsaver xtst xxf86vm SHEBANG_FILES= kwin/clients/oxygen/data/update_oxygen.pl USE_LDCONFIG= yes + +KDE_APPLICATIONS_VERSION= 15.08.0 CMAKE_ARGS= -DCMAKE_REQUIRED_FLAGS:STRING="-L${LOCALBASE}/lib" \ -DBUILD_python:BOOL=OFF \ -DBUILD_ruby:BOOL=OFF \ -DWITH_Xmms:BOOL=OFF \ -DWITH_UDev:BOOL=OFF SUB_FILES= pkg-message USE_RC_SUBR= kdm4 USERS= kdm GROUPS= kdm OPTIONS_DEFINE= GLES GPS KACTIVITY UPOWER WALLPAPERS OPTIONS_GROUP= PHONON PLASMA OPTIONS_GROUP_PHONON= GSTREAMER VLC OPTIONS_GROUP_PLASMA= PYTHON RUBY OPTIONS_DEFAULT= GLES GPS KACTIVITY UPOWER VLC WALLPAPERS OPTIONS_SUB= yes # GPS GLES GLES_DESC= OpenGL ES 2.0 support in kwin and kinfocenter GLES_USE= GL=egl,glesv2 GLES_CMAKE_OFF= -DWITH_OpenGLES=off GPS_DESC= GPS geolocation via gpsd GPS_LIB_DEPENDS= libgps.so:astro/gpsd GPS_CMAKE_ON= -DWITH_libgps:BOOL=ON GPS_CMAKE_OFF= -DWITH_libgps:BOOL=OFF GSTREAMER_DESC= Multimedia via Phonon-GStreamer GSTREAMER_USE= QT4=phonon-gst_run KACTIVITY_DESC= Activity Manager daemon KACTIVITY_RUN_DEPENDS= ${KDE_PREFIX}/bin/kactivitymanagerd:x11/kactivitymanagerd PYTHON_DESC= Python plasmoids support PYTHON_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_python/plasma_importer.py:x11/plasma-scriptengine-python RUBY_DESC= Ruby plasmoids support RUBY_RUN_DEPENDS= ${KDE_PREFIX}/share/apps/plasma_scriptengine_ruby/applet.rb:x11/plasma-scriptengine-ruby UPOWER_DESC= Power management via UPower UPOWER_RUN_DEPENDS= ${LOCALBASE}/libexec/upowerd:sysutils/upower VLC_DESC= Multimedia via Phonon-VLC VLC_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/plugins/phonon_backend/phonon_vlc.so:multimedia/phonon-vlc WALLPAPERS_DESC= Install official KDE wallpapers WALLPAPERS_RUN_DEPENDS= ${KDE_PREFIX}/share/wallpapers/Horos/metadata.desktop:x11-themes/kde4-wallpapers \ ${KDE_PREFIX}/share/wallpapers/stripes-freebsd-blue/metadata.desktop:x11-themes/kde4-wallpapers-freebsd .if !exists(/usr/lib/libutempter.so) LIB_DEPENDS+= libutempter.so:sysutils/libutempter .endif post-patch: @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${PATCH_WRKSRC}/startkde.cmake \ ${PATCH_WRKSRC}/kcontrol/kfontinst/lib/KfiConstants.h \ ${PATCH_WRKSRC}/kcontrol/kfontinst/kio/KioFonts.cpp \ ${PATCH_WRKSRC}/kcontrol/keyboard/x11_helper.cpp \ ${PATCH_WRKSRC}/kdm/backend/client.c \ ${PATCH_WRKSRC}/kdm/kfrontend/genkdmconf.c \ ${PATCH_WRKSRC}/CMakeLists.txt pre-configure: ${REINPLACE_CMD} -e '/ksysguardd/ d' \ ${PATCH_WRKSRC}/ksysguard/CMakeLists.txt \ ${PATCH_WRKSRC}/ksysguard/example/CMakeLists.txt ${REINPLACE_CMD} -e '/PolicyKit/ d' \ ${PATCH_WRKSRC}/doc/CMakeLists.txt post-install: ${LN} -sf ${PREFIX}/bin/startkde ${STAGEDIR}${PREFIX}/bin/startkde4 post-install-GSTREAMER-on: @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} post-install-GSTREAMER-off: @${CAT} ${FILESDIR}/pkg-message.gstreamer >> ${PKGMESSAGE} @${HEAD} -1 ${PKGMESSAGE} >> ${PKGMESSAGE} .include Index: head/x11/kde4-workspace/distinfo =================================================================== --- head/x11/kde4-workspace/distinfo (revision 437223) +++ head/x11/kde4-workspace/distinfo (revision 437224) @@ -1,3 +1,3 @@ -TIMESTAMP = 1466144753 -SHA256 (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 7196c68802af335b15a3b8e14c55a15ed7c2c0e9145a047dc6d4a281fe7f7c8f -SIZE (KDE/4.11.21/kde-workspace-4.11.21.tar.xz) = 13550508 +TIMESTAMP = 1490623839 +SHA256 (KDE/applications/15.08.0/kde-workspace-4.11.22.tar.xz) = f035334e843d67ee88551ae9e6c5f64bf7b1edfe311b12501575fe74be0b03b7 +SIZE (KDE/applications/15.08.0/kde-workspace-4.11.22.tar.xz) = 13553668 Index: head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt =================================================================== --- head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt (revision 437223) +++ head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt (nonexistent) @@ -1,12 +0,0 @@ ---- kdm/kfrontend/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC -+++ kdm/kfrontend/CMakeLists.txt -@@ -111,6 +111,6 @@ install(TARGETS kdmctl ${INSTALL_TARGETS - - - # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) --install(CODE " --exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) --") -+#install(CODE " -+#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) -+#") Property changes on: head/x11/kde4-workspace/files/patch-kdm-kfrontend-CMakeLists.txt ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kdm__backend__client.c =================================================================== --- head/x11/kde4-workspace/files/patch-kdm__backend__client.c (revision 437223) +++ head/x11/kde4-workspace/files/patch-kdm__backend__client.c (nonexistent) @@ -1,35 +0,0 @@ ---- kdm/backend/client.c.orig 2015-06-26 03:17:21 UTC -+++ kdm/backend/client.c -@@ -1322,6 +1322,9 @@ startClient(volatile int *pid) - char ckDeviceBuf[20] = ""; - const char *ckDevice = ckDeviceBuf; - dbus_bool_t isLocal; -+# ifdef BSD -+ FILE *proc; -+# endif - #endif - char *failsafeArgv[2]; - char *buf, *buf2; -@@ -1353,6 +1356,13 @@ startClient(volatile int *pid) - # ifdef HAVE_VTS - if (td->serverVT > 0) - sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT); -+# elif defined(BSD) -+ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) { -+ fscanf( proc, "%s", ckDeviceBuf ); -+ pclose(proc); -+ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0) -+ ckDeviceBuf[0] = '\0'; -+ } - # endif - isLocal = ((td->displayType & d_location) == dLocal); - # ifdef XDMCP -@@ -1532,7 +1542,7 @@ startClient(volatile int *pid) - environ = pam_env; - # endif - removeCreds = True; /* set it first - i don't trust PAM's rollback */ -- pretc = pam_setcred(pamh, 0); -+ pretc = pam_setcred(pamh, PAM_ESTABLISH_CRED); - reInitErrorLog(); - # ifndef HAVE_PAM_GETENVLIST - pam_env = environ; Property changes on: head/x11/kde4-workspace/files/patch-kdm__backend__client.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-git_0f43493 =================================================================== --- head/x11/kde4-workspace/files/patch-git_0f43493 (revision 437223) +++ head/x11/kde4-workspace/files/patch-git_0f43493 (nonexistent) @@ -1,34 +0,0 @@ -Fixes the build with kdelibs 4.14.30. - -commit 0f4349389875fa7452ec0a9d0a468be1e14cda33 -Author: Kevin Ottens -Date: Mon Jul 20 19:56:53 2015 +0200 - - Link to proper targets - -diff --git a/plasma/generic/dataengines/akonadi/CMakeLists.txt b/plasma/generic/dataengines/akonadi/CMakeLists.txt -index 7f0dd346a4..091e76bd00 100644 ---- plasma/generic/dataengines/akonadi/CMakeLists.txt -+++ plasma/generic/dataengines/akonadi/CMakeLists.txt -@@ -21,7 +21,7 @@ target_link_libraries( - ${KDE4_AKONADI_KMIME_LIBS} - ${KDE4_KABC_LIBS} - ${QT_QTXML_LIBRARY} -- microblog -+ ${KDE4_MICROBLOG_LIBS} - ) - - install(TARGETS plasma_engine_akonadi DESTINATION ${PLUGIN_INSTALL_DIR}) -diff --git a/plasma/generic/dataengines/calendar/CMakeLists.txt b/plasma/generic/dataengines/calendar/CMakeLists.txt -index 6ad3b61046..fb0893da0e 100644 ---- plasma/generic/dataengines/calendar/CMakeLists.txt -+++ plasma/generic/dataengines/calendar/CMakeLists.txt -@@ -33,7 +33,7 @@ target_link_libraries( - if(Akonadi_FOUND) - target_link_libraries( - plasma_engine_calendar -- akonadi-calendar -+ ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} - ${KDE4_AKONADI_LIBS} - ${KDEPIMLIBS_AKONADI_KCAL_LIBS} - ) Property changes on: head/x11/kde4-workspace/files/patch-git_0f43493 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-git_68a4d76 =================================================================== --- head/x11/kde4-workspace/files/patch-git_68a4d76 (revision 437223) +++ head/x11/kde4-workspace/files/patch-git_68a4d76 (nonexistent) @@ -1,28 +0,0 @@ -Fixes the build with x11/kdelibs4 4.14.30. - -commit 68a4d76ceb7e9b8aa9f15f2231f806e74c91ec6d -Author: Kevin Ottens -Date: Mon Jul 20 19:11:37 2015 +0200 - - Avoid target name clash - -diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt -index d472fd7e0a..2269b18ee1 100644 ---- libs/ksysguard/tests/CMakeLists.txt -+++ libs/ksysguard/tests/CMakeLists.txt -@@ -12,13 +12,13 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB - - # KSignalPlotter benchmark - set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp) --kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} ) -+kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplotterbenchmark ${signalplotterbenchmark_SRCS} ) - target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) - - - # KGraphicsSignalPlotter benchmark - set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp) --kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} ) -+kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-graphicssignalplotterbenchmark ${graphicssignalplotterbenchmark_SRCS} ) - target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} ) - - Property changes on: head/x11/kde4-workspace/files/patch-git_68a4d76 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp (revision 437223) +++ head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp (nonexistent) @@ -1,21 +0,0 @@ ---- powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2015-06-26 03:17:21 UTC -+++ powerdevil/daemon/backends/upower/xrandrbrightness.cpp -@@ -62,6 +62,9 @@ XRandrBrightness::XRandrBrightness() - qWarning("No available Randr resources"); - return; - } -+ -+ if (brightness() == -1) -+ m_resources = 0; - } - - XRandrBrightness::~XRandrBrightness() -@@ -89,7 +92,7 @@ bool XRandrBrightness::isSupported() con - - float XRandrBrightness::brightness() const - { -- float result = 0; -+ float result = -1; - - if (!m_resources) - return result; Property changes on: head/x11/kde4-workspace/files/patch-powerdevil__daemon__backends__upower__xrandrbrightness.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kdm_backend_client.c =================================================================== --- head/x11/kde4-workspace/files/patch-kdm_backend_client.c (nonexistent) +++ head/x11/kde4-workspace/files/patch-kdm_backend_client.c (revision 437224) @@ -0,0 +1,35 @@ +--- kdm/backend/client.c.orig 2015-06-26 03:17:21 UTC ++++ kdm/backend/client.c +@@ -1322,6 +1322,9 @@ startClient(volatile int *pid) + char ckDeviceBuf[20] = ""; + const char *ckDevice = ckDeviceBuf; + dbus_bool_t isLocal; ++# ifdef BSD ++ FILE *proc; ++# endif + #endif + char *failsafeArgv[2]; + char *buf, *buf2; +@@ -1353,6 +1356,13 @@ startClient(volatile int *pid) + # ifdef HAVE_VTS + if (td->serverVT > 0) + sprintf(ckDeviceBuf, "/dev/tty%d", td->serverVT); ++# elif defined(BSD) ++ if ((proc = popen( "/usr/local/libexec/ck-get-x11-display-device", "r" ))) { ++ fscanf( proc, "%s", ckDeviceBuf ); ++ pclose(proc); ++ if (strcmp( ckDeviceBuf, "usage" ) == 0 || strcmp( ckDeviceBuf, "ERROR:" ) == 0) ++ ckDeviceBuf[0] = '\0'; ++ } + # endif + isLocal = ((td->displayType & d_location) == dLocal); + # ifdef XDMCP +@@ -1532,7 +1542,7 @@ startClient(volatile int *pid) + environ = pam_env; + # endif + removeCreds = True; /* set it first - i don't trust PAM's rollback */ +- pretc = pam_setcred(pamh, 0); ++ pretc = pam_setcred(pamh, PAM_ESTABLISH_CRED); + reInitErrorLog(); + # ifndef HAVE_PAM_GETENVLIST + pam_env = environ; Property changes on: head/x11/kde4-workspace/files/patch-kdm_backend_client.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt =================================================================== --- head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt (nonexistent) +++ head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt (revision 437224) @@ -0,0 +1,12 @@ +--- kdm/kfrontend/CMakeLists.txt.orig 2015-06-26 03:17:21 UTC ++++ kdm/kfrontend/CMakeLists.txt +@@ -111,6 +111,6 @@ install(TARGETS kdmctl ${INSTALL_TARGETS + + + # use 'GENKDMCONF_FLAGS=... make install' to add flags to the config generation (try genkdmconf -h) +-install(CODE " +-exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) +-") ++#install(CODE " ++#exec_program(\"${CMAKE_CURRENT_BINARY_DIR}/genkdmconf\" ARGS --in \\\"\\\$DESTDIR${CONFIG_INSTALL_DIR}/kdm\\\" --no-in-notice --face-src \\\"${CMAKE_CURRENT_SOURCE_DIR}/pics\\\" \\\$GENKDMCONF_FLAGS) ++#") Property changes on: head/x11/kde4-workspace/files/patch-kdm_kfrontend_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp =================================================================== --- head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp (nonexistent) +++ head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp (revision 437224) @@ -0,0 +1,21 @@ +--- powerdevil/daemon/backends/upower/xrandrbrightness.cpp.orig 2015-06-26 03:17:21 UTC ++++ powerdevil/daemon/backends/upower/xrandrbrightness.cpp +@@ -62,6 +62,9 @@ XRandrBrightness::XRandrBrightness() + qWarning("No available Randr resources"); + return; + } ++ ++ if (brightness() == -1) ++ m_resources = 0; + } + + XRandrBrightness::~XRandrBrightness() +@@ -89,7 +92,7 @@ bool XRandrBrightness::isSupported() con + + float XRandrBrightness::brightness() const + { +- float result = 0; ++ float result = -1; + + if (!m_resources) + return result; Property changes on: head/x11/kde4-workspace/files/patch-powerdevil_daemon_backends_upower_xrandrbrightness.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/plasma-scriptengine-python/Makefile =================================================================== --- head/x11/plasma-scriptengine-python/Makefile (revision 437223) +++ head/x11/plasma-scriptengine-python/Makefile (revision 437224) @@ -1,25 +1,25 @@ # $FreeBSD$ PORTNAME= plasma-scriptengine-python PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= x11 kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Python NO_ARCH= yes USES= cmake:outsource kde:4 python:2 tar:xz USE_KDE= kdelibs pykde4 automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo + +KDE_APPLICATIONS_VERSION= 15.08.0 CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python pre-configure: ${REINPLACE_CMD} -e 's,$${PYTHON_SITE_PACKAGES_DIR},${PYTHONPREFIX_SITELIBDIR},g' \ ${CMAKE_SOURCE_PATH}/CMakeLists.txt .include Index: head/x11/plasma-scriptengine-ruby/Makefile =================================================================== --- head/x11/plasma-scriptengine-ruby/Makefile (revision 437223) +++ head/x11/plasma-scriptengine-ruby/Makefile (revision 437224) @@ -1,22 +1,22 @@ # $FreeBSD$ PORTNAME= plasma-scriptengine-ruby PORTVERSION= ${KDE4_WORKSPACE_VERSION} -CATEGORIES= x11 kde -MASTER_SITES= KDE/${KDE4_APPLICATIONS_BRANCH}/applications/${KDE4_APPLICATIONS_VERSION}/src +CATEGORIES= x11 kde kde-applications DISTNAME= kde-workspace-${PORTVERSION} -DIST_SUBDIR= KDE/${PORTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= Plasma scriptengine for Ruby NO_ARCH= yes USES= cmake:outsource kde:4 tar:xz USE_KDE= kdelibs korundum automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build USE_RUBY= yes DISTINFO_FILE= ${.CURDIR:H:H}/x11/kde4-workspace/distinfo + +KDE_APPLICATIONS_VERSION= 15.08.0 CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby .include