Index: Mk/Uses/kde.mk =================================================================== --- Mk/Uses/kde.mk +++ Mk/Uses/kde.mk @@ -79,7 +79,7 @@ CALLIGRA_VERSION?= 2.9.11 CALLIGRA_BRANCH?= stable -KDEVELOP_VERSION?= 4.7.3 +KDEVELOP_VERSION?= 4.7.4 KDEVELOP_BRANCH?= stable KTP_VERSION?= 0.9.0 Index: devel/kdevelop-kde4/Makefile =================================================================== --- devel/kdevelop-kde4/Makefile +++ devel/kdevelop-kde4/Makefile @@ -4,7 +4,7 @@ PORTNAME= kdevelop DISTVERSION= ${KDEVELOP_VERSION} CATEGORIES= devel kde -MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION}/src +MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${DISTVERSION} DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} MAINTAINER= kde@FreeBSD.org @@ -14,7 +14,7 @@ RUN_DEPENDS= gmake:devel/gmake USES= cmake:outsource compiler:c++11-lib gmake kde:4 \ - shared-mime-info tar:bz2 + shared-mime-info tar:xz USE_KDE= kdelibs workspace automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib declarative gui help script webkit xml Index: devel/kdevelop-kde4/distinfo =================================================================== --- devel/kdevelop-kde4/distinfo +++ devel/kdevelop-kde4/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/kdevelop/4.7.3/kdevelop-4.7.3.tar.bz2) = 9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35 -SIZE (KDE/kdevelop/4.7.3/kdevelop-4.7.3.tar.bz2) = 4826588 +TIMESTAMP = 1483138930 +SHA256 (KDE/kdevelop/4.7.4/kdevelop-4.7.4.tar.xz) = cdef56196364eb97a4d9f15b6d47e12d893ef0bfa7100855f532ba7a9ff69130 +SIZE (KDE/kdevelop/4.7.4/kdevelop-4.7.4.tar.xz) = 4444352 Index: devel/kdevelop-php/Makefile =================================================================== --- devel/kdevelop-php/Makefile +++ devel/kdevelop-php/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdevelop-php PORTVERSION= ${KDEVELOP_VERSION:S/4./1./} CATEGORIES= devel kde -MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src +MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION} DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} MAINTAINER= kde@FreeBSD.org @@ -12,7 +12,7 @@ LIB_DEPENDS= libkdevplatforminterfaces.so:devel/kdevplatform BUILD_DEPENDS= ${KDE_PREFIX}/bin/kdev-pg-qt:devel/kdevelop-pg-qt -USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:bz2 +USES= cmake:outsource compiler:c++11-lib gmake kde:4 tar:xz USE_KDE= kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build MAKE_JOBS_UNSAFE= yes Index: devel/kdevelop-php/distinfo =================================================================== --- devel/kdevelop-php/distinfo +++ devel/kdevelop-php/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/kdevelop/4.7.3/kdevelop-php-1.7.3.tar.bz2) = 6b3583560dc9c339d74c51d9774a3ff342e260b285c8d9bd8f7f89f47a7dbf69 -SIZE (KDE/kdevelop/4.7.3/kdevelop-php-1.7.3.tar.bz2) = 691363 +TIMESTAMP = 1483143445 +SHA256 (KDE/kdevelop/4.7.4/kdevelop-php-1.7.4.tar.xz) = ff360e69cd9a125cf70d7613d26ac094865ffa7966fe6419220841474f39230e +SIZE (KDE/kdevelop/4.7.4/kdevelop-php-1.7.4.tar.xz) = 658488 Index: devel/kdevplatform/Makefile =================================================================== --- devel/kdevplatform/Makefile +++ devel/kdevplatform/Makefile @@ -5,7 +5,7 @@ PORTVERSION= ${KDEVELOP_VERSION:S/4./1./} PORTREVISION= 1 CATEGORIES= devel kde -MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src +MASTER_SITES= KDE/${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION} DIST_SUBDIR= KDE/kdevelop/${KDEVELOP_VERSION} MAINTAINER= kde@FreeBSD.org @@ -16,7 +16,7 @@ libqjson.so:devel/qjson USES= cmake:outsource compiler:c++11-lib grantlee:4 kde:4 shebangfix \ - tar:bz2 + tar:xz USE_KDE= kate_run kdelibs automoc4 USE_QT4= qmake_build moc_build uic_build rcc_build \ corelib designer_build gui webkit Index: devel/kdevplatform/distinfo =================================================================== --- devel/kdevplatform/distinfo +++ devel/kdevplatform/distinfo @@ -1,2 +1,3 @@ -SHA256 (KDE/kdevelop/4.7.3/kdevplatform-1.7.3.tar.bz2) = 195134bde11672de38838f4b341ed28c58042374ca12beedacca9d30e6ab4a2b -SIZE (KDE/kdevelop/4.7.3/kdevplatform-1.7.3.tar.bz2) = 2417125 +TIMESTAMP = 1483127996 +SHA256 (KDE/kdevelop/4.7.4/kdevplatform-1.7.4.tar.xz) = 21ea4a6c4e241e3b9d6f991ac98b2df8b9c45e17bdb416e836cefbde2d524574 +SIZE (KDE/kdevelop/4.7.4/kdevplatform-1.7.4.tar.xz) = 1934292 Index: devel/kdevplatform/files/patch-cmake__modules__KDevPlatformMacros_cmake.patch =================================================================== --- /dev/null +++ devel/kdevplatform/files/patch-cmake__modules__KDevPlatformMacros_cmake.patch @@ -0,0 +1,15 @@ +Assumes 'tar' is GNU tar, and passes inappropriate command-line options. + +--- cmake/modules/KDevPlatformMacros.cmake.orig 2016-12-31 01:03:07.457715000 +0100 ++++ cmake/modules/KDevPlatformMacros.cmake 2016-12-31 01:04:32.112215000 +0100 +@@ -52,8 +52,8 @@ + else(WIN32) + add_custom_command(OUTPUT ${_template} + COMMAND tar ARGS -c -C ${CMAKE_CURRENT_SOURCE_DIR}/${_templateName} +- --exclude .kdev_ignore --exclude .svn --mode=go=rX,u+rw,a-s --owner=root +- --group=root --numeric-owner -j -f ${_template} . ++ --exclude .kdev_ignore --exclude .svn --uname=root ++ --gname=root --numeric-owner -j -f ${_template} . + DEPENDS ${_deps} + ) + endif(WIN32) Index: devel/kdevplatform/files/patch-git_dd18e9a =================================================================== --- devel/kdevplatform/files/patch-git_dd18e9a +++ /dev/null @@ -1,27 +0,0 @@ -commit dd18e9a13558cbe519c382d3fe358ae97e39cd38 -Author: Raphael Kubo da Costa -Date: Thu Mar 17 15:32:21 2016 +0100 - - filetemplates plugin: Make testfiletemplates depend on kdevfiletemplates - - There is currently no dependency between both targets, however some of - the files built by both testfiletemplates and kdevfiletemplates (such as - classidentifierpage.cpp) depend on ui files that only the latter target - generates. This means that if one does make testfiletemplates the build - fails like this: - - /tmp/kdevplatform/plugins/filetemplates/classidentifierpage.cpp:23:25: - fatal error: ui_newclass.h: No such file or directory - - Differential Revision: https://phabricator.kde.org/D1160 - ---- plugins/filetemplates/CMakeLists.txt -+++ plugins/filetemplates/CMakeLists.txt -@@ -81,6 +81,7 @@ main.cpp - ) - - kde4_add_executable(testfiletemplates ${test_srcs}) -+add_dependencies(testfiletemplates kdevfiletemplates) - - target_link_libraries(testfiletemplates - ${KDE4_KDECORE_LIBS}