Page MenuHomeFreeBSD
Files F147821982

D15224.id41961.diff
No OneTemporary
Actions

D15224.id41961.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -952,7 +952,6 @@
databases/pear-Doctrine2||2010-01-20|Removed
audio/dino||2010-01-20|Has expired: has been broken for 7 months
devel/asis-gpl||2010-01-20|Has expired: has been broken for 3 months
-devel/kdesvn||2010-01-20|Has expired: has been broken for 4 months
devel/radrails||2010-01-20|Has expired: has been broken for 3 months
devel/rubygem-rtags||2010-01-20|Has expired: has been broken for 5 months
games/hattrickorganizer||2010-01-20|Has expired: Has been broken for a while
Index: devel/Makefile
===================================================================
--- devel/Makefile
+++ devel/Makefile
@@ -1266,6 +1266,7 @@
SUBDIR += kdesdk-strigi-analyzers-kde4
SUBDIR += kdesdk-thumbnailers
SUBDIR += kdesdk-thumbnailers-kde4
+ SUBDIR += kdesvn
SUBDIR += kdesvn-kde4
SUBDIR += kdev-php
SUBDIR += kdev-python
Index: devel/kdesvn-kde4/Makefile
===================================================================
--- devel/kdesvn-kde4/Makefile
+++ devel/kdesvn-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdesvn
DISTVERSION= 1.7.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel kde
MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/
@@ -18,7 +18,8 @@
libgdbm.so:databases/gdbm \
libexpat.so:textproc/expat2
-CONFLICTS= qsvn-[0-9]*
+CONFLICTS= kdesvn-2.* \
+ qsvn-[0-9]*
CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
-DMAN_INSTALL_DIR=${MANPREFIX}/man
Index: devel/kdesvn/Makefile
===================================================================
--- devel/kdesvn/Makefile
+++ devel/kdesvn/Makefile
@@ -1,45 +1,34 @@
-# Created by: Yuan Jue <yuanjue@yuanjue.net>
# $FreeBSD$
PORTNAME= kdesvn
-DISTVERSION= 1.7.0
-PORTREVISION= 8
+DISTVERSION= 2.0.0
CATEGORIES= devel kde
-MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/
+MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION}/
-MAINTAINER= dbn@FreeBSD.org
+MAINTAINER= kde@FreeBSD.org
COMMENT= KDE frontend for Subversion
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libsvn_client-1.so:devel/subversion \
- libapr-1.so:devel/apr1 \
+LIB_DEPENDS= libapr-1.so:devel/apr1 \
+ libexpat.so:textproc/expat2 \
libgdbm.so:databases/gdbm \
- libexpat.so:textproc/expat2
+ libsvn_client-1.so:devel/subversion
-CONFLICTS= qsvn-[0-9]*
+CONFLICTS_INSTALL= kdesvn-kde4 \
+ qsvn-[0-9]*
-CMAKE_ARGS+= -DSUBVERSION_INCLUDE_DIR=${LOCALBASE}/include/subversion-1 \
- -DMAN_INSTALL_DIR=${MANPREFIX}/man
+USES= bdb cmake:outsource kde:5 tar:xz
+USE_KDE= auth bookmarks codecs completion config configwidgets \
+ coreaddons dbusaddons ecm i18n iconthemes itemviews jobwidgets \
+ kio notifications parts service sonnet texteditor textwidgets \
+ wallet widgetsaddons xmlgui
+USE_QT5= concurrent core dbus gui network sql widgets xml \
+ buildtools_build qmake_build
-USES= cmake:outsource compiler:c11 bdb kde:4 tar:xz
-USE_KDE= automoc4 kdelibs soprano baseapps_run
-USE_LDCONFIG= yes
-USE_QT4= corelib gui xml network dbus svg sql \
- qmake_build moc_build rcc_build uic_build linguist_build
-
-OPTIONS_DEFINE= DOCS NLS
-OPTIONS_SUB= yes
-
-NLS_CMAKE_OFF= -DBUILD_po=OFF
-NLS_USES= gettext
-
post-patch:
- ${RM} ${WRKSRC}/src/kiosvn/svn*.protocol
-
-post-patch-DOCS-off:
- ${FIND} ${WRKSRC}/docs -name CMakeLists.txt | \
- ${XARGS} ${REINPLACE_CMD} -n '/kde4_create_manpage/p'
+ ${REINPLACE_CMD} -e 's#%%EXECINFO%%#${EXECINFO_LDFLAGS} -lexecinfo#' \
+ ${PATCH_WRKSRC}/src/svnqt/cmake/FindSubversion.cmake
.include <bsd.port.mk>
Index: devel/kdesvn/distinfo
===================================================================
--- devel/kdesvn/distinfo
+++ devel/kdesvn/distinfo
@@ -1,2 +1,3 @@
-SHA256 (kdesvn-1.7.0.tar.xz) = b3a9dc01e1730c880478aecd5c8d832a4b218468f791083985d325c0ef8a6ece
-SIZE (kdesvn-1.7.0.tar.xz) = 1965064
+TIMESTAMP = 1524953001
+SHA256 (kdesvn-2.0.0.tar.xz) = d58d3a895461633718dad580d1590fe99c9d6e44ca64544784a0e9421eb8f8db
+SIZE (kdesvn-2.0.0.tar.xz) = 2014660
Index: devel/kdesvn/files/patch-git_fcf613
===================================================================
--- /dev/null
+++ devel/kdesvn/files/patch-git_fcf613
@@ -0,0 +1,64 @@
+From fcf613ddf3492ead5810276809f0db4ba597a045 Mon Sep 17 00:00:00 2001
+From: "Tobias C. Berner" <tcberner@gmail.com>
+Date: Thu, 15 Dec 2016 20:03:01 +0100
+Subject: [PATCH] Rename method Path::isset() to Path::isSet()
+
+FreeBSD defines a marco `isset()` in `sys/param.h`:
+
+```
+kdesvn-2.0.0/src/svnqt/../svnqt/path.h:100:16:
+ error: too few arguments provided to function-like macro invocation
+ bool isset() const;
+ ^
+/usr/include/sys/param.h:284:9: note: macro 'isset' defined here
+ ^
+```
+
+to circumvent this issue, rename the method.
+---
+ src/svnfrontend/svnactions.cpp | 2 +-
+ src/svnqt/path.cpp | 2 +-
+ src/svnqt/path.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
+index 0f27fed..72f0958 100644
+--- src/svnfrontend/svnactions.cpp
++++ src/svnfrontend/svnactions.cpp
+@@ -2200,7 +2200,7 @@ void SvnActions::slotMerge(const QString &src1, const QString &src2, const QStri
+ .dry_run(dry).record_only(recordOnly).reintegrate(reintegrate).allow_mixed_rev(allow_mixed_rev)
+ .localPath(svn::Path(target)).merge_options(svn::StringArray());
+
+- if (!reintegrate && (!p2.isset() || src1 == src2)) {
++ if (!reintegrate && (!p2.isSet() || src1 == src2)) {
+ // pegged merge
+ pegged_merge = true;
+ if (peg == svn::Revision::UNDEFINED) {
+diff --git a/src/svnqt/path.cpp b/src/svnqt/path.cpp
+index 50b1787..1c2b12c 100644
+--- src/svnqt/path.cpp
++++ src/svnqt/path.cpp
+@@ -139,7 +139,7 @@ Path::operator=(const Path &path)
+ }
+
+ bool
+-Path::isset() const
++Path::isSet() const
+ {
+ return !m_path.isEmpty();
+ }
+diff --git a/src/svnqt/path.h b/src/svnqt/path.h
+index d3633dc..2e5b0b2 100644
+--- src/svnqt/path.h
++++ src/svnqt/path.h
+@@ -97,7 +97,7 @@ public:
+ *
+ * @return true if there is a path set
+ */
+- bool isset() const;
++ bool isSet() const;
+
+ /**
+ * adds a new URL component to the path
+--
+2.10.1
Index: devel/kdesvn/files/patch-src_svnqt_cmake_FindSubversion.cmake
===================================================================
--- /dev/null
+++ devel/kdesvn/files/patch-src_svnqt_cmake_FindSubversion.cmake
@@ -0,0 +1,11 @@
+--- src/svnqt/cmake/FindSubversion.cmake.orig 2016-05-21 09:13:40 UTC
++++ src/svnqt/cmake/FindSubversion.cmake
+@@ -109,6 +109,7 @@ if(UNIX)
+ check_include_files(execinfo.h HAS_BACKTRACE_H)
+ if(HAS_BACKTRACE_H)
+ option(USE_BACKTRACE "Generate a backtrace when a svnclient exception is thrown" OFF)
++ set(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} %%EXECINFO%%)
+ endif()
+
+ endif()
+
Index: devel/kdesvn/pkg-plist
===================================================================
--- devel/kdesvn/pkg-plist
+++ devel/kdesvn/pkg-plist
@@ -1,59 +1,31 @@
bin/kdesvn
bin/kdesvnaskpass
-lib/kde4/kded_kdesvnd.so
-lib/kde4/kdesvnpart.so
-lib/kde4/kio_ksvn.so
-lib/libsvnqt.a
-man/man1/kdesvn.1.gz
-man/man1/kdesvnaskpass.1.gz
-man/nl/man1/kdesvn.1.gz
-man/nl/man1/kdesvnaskpass.1.gz
-man/pt_BR/man1/kdesvn.1.gz
-man/pt_BR/man1/kdesvnaskpass.1.gz
-man/sv/man1/kdesvn.1.gz
-man/sv/man1/kdesvnaskpass.1.gz
-man/uk/man1/kdesvn.1.gz
-man/uk/man1/kdesvnaskpass.1.gz
-share/applications/kde4/kdesvn.desktop
-share/apps/kconf_update/kdesvn-use-external-update.sh
-share/apps/kconf_update/kdesvnpartrc-use-external.upd
-share/apps/kdesvn/kdesvn.notifyrc
-share/apps/kdesvn/kdesvnui.rc
-share/apps/kdesvnpart/kdesvn_part.rc
+%%QT_PLUGINDIR%%/kdesvnpart.so
+%%QT_PLUGINDIR%%/kf5/kded/kdesvnd.so
+%%QT_PLUGINDIR%%/kio_ksvn.so
+share/applications/org.kde.kdesvn.desktop
share/config.kcfg/kdesvn_part.kcfg
-share/dbus-1/interfaces/org.kde.kdesvnd.xml
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/common
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnconflicted.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvndeleted.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnlocked.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnmodified.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnneedlock.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnupdates.png
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/index.docbook
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/man-kdesvn.1.docbook
-%%PORTDOCS%%share/doc/HTML/en/kdesvn/man-kdesvnaskpass.1.docbook
-%%PORTDOCS%%share/doc/HTML/nl/kdesvn/common
-%%PORTDOCS%%share/doc/HTML/nl/kdesvn/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/nl/kdesvn/index.docbook
-%%PORTDOCS%%share/doc/HTML/nl/kdesvn/man-kdesvn.1.docbook
-%%PORTDOCS%%share/doc/HTML/nl/kdesvn/man-kdesvnaskpass.1.docbook
-%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/common
-%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/index.docbook
-%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/man-kdesvn.1.docbook
-%%PORTDOCS%%share/doc/HTML/pt_BR/kdesvn/man-kdesvnaskpass.1.docbook
-%%PORTDOCS%%share/doc/HTML/sv/kdesvn/common
-%%PORTDOCS%%share/doc/HTML/sv/kdesvn/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/sv/kdesvn/index.docbook
-%%PORTDOCS%%share/doc/HTML/sv/kdesvn/man-kdesvn.1.docbook
-%%PORTDOCS%%share/doc/HTML/sv/kdesvn/man-kdesvnaskpass.1.docbook
-%%PORTDOCS%%share/doc/HTML/uk/kdesvn/common
-%%PORTDOCS%%share/doc/HTML/uk/kdesvn/index.cache.bz2
-%%PORTDOCS%%share/doc/HTML/uk/kdesvn/index.docbook
-%%PORTDOCS%%share/doc/HTML/uk/kdesvn/man-kdesvn.1.docbook
-%%PORTDOCS%%share/doc/HTML/uk/kdesvn/man-kdesvnaskpass.1.docbook
+share/dbus-1/interfaces/kf5_org.kde.kdesvnd.xml
+share/dbus-1/services/org.kde.kdesvnd.service
+share/doc/HTML/de/kdesvn/index.cache.bz2
+share/doc/HTML/de/kdesvn/index.docbook
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnadded.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnconflicted.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvndeleted.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnlocked.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnmodified.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnneedlock.png
+share/doc/HTML/en/kdesvn/hi128-filesys-kdesvnupdates.png
+share/doc/HTML/en/kdesvn/index.cache.bz2
+share/doc/HTML/en/kdesvn/index.docbook
+share/doc/HTML/nl/kdesvn/index.cache.bz2
+share/doc/HTML/nl/kdesvn/index.docbook
+share/doc/HTML/pt_BR/kdesvn/index.cache.bz2
+share/doc/HTML/pt_BR/kdesvn/index.docbook
+share/doc/HTML/sv/kdesvn/index.cache.bz2
+share/doc/HTML/sv/kdesvn/index.docbook
+share/doc/HTML/uk/kdesvn/index.cache.bz2
+share/doc/HTML/uk/kdesvn/index.docbook
share/icons/hicolor/128x128/actions/kdesvnadd.png
share/icons/hicolor/128x128/actions/kdesvnaddrecursive.png
share/icons/hicolor/128x128/actions/kdesvnblame.png
@@ -305,8 +277,8 @@
share/icons/hicolor/scalable/actions/kdesvncheckout.svgz
share/icons/hicolor/scalable/actions/kdesvncheckupdates.svgz
share/icons/hicolor/scalable/actions/kdesvncleanup.svgz
-share/icons/hicolor/scalable/actions/kdesvncolors.svgz
share/icons/hicolor/scalable/actions/kdesvnclock.svgz
+share/icons/hicolor/scalable/actions/kdesvncolors.svgz
share/icons/hicolor/scalable/actions/kdesvncommit.svgz
share/icons/hicolor/scalable/actions/kdesvncopy.svgz
share/icons/hicolor/scalable/actions/kdesvndelete.svgz
@@ -339,40 +311,51 @@
share/icons/hicolor/scalable/places/kdesvnmodified.svgz
share/icons/hicolor/scalable/places/kdesvnneedlock.svgz
share/icons/hicolor/scalable/places/kdesvnupdates.svgz
-share/kde4/services/ServiceMenus/kdesvn_subversion.desktop
-share/kde4/services/ServiceMenus/kdesvn_subversion_toplevel.desktop
-share/kde4/services/kded/kdesvnd.desktop
-share/kde4/services/kdesvnpart.desktop
-share/kde4/services/ksvn+file.protocol
-share/kde4/services/ksvn+http.protocol
-share/kde4/services/ksvn+https.protocol
-share/kde4/services/ksvn+ssh.protocol
-share/kde4/services/ksvn.protocol
-%%NLS%%share/locale/ast/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/bs/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/de/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/el/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/es/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/it/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/kdesvn.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/kdesvn.mo
-share/svnqt/i18n/svnqt_de.qm
-share/svnqt/i18n/svnqt_en_GB.qm
+share/kconf_update/kdesvn-use-external-update.sh
+share/kconf_update/kdesvnpartrc-use-external.upd
+%%DATADIR%%/kdesvn.notifyrc
+share/kservices5/ServiceMenus/kdesvn_subversion.desktop
+share/kservices5/ServiceMenus/kdesvn_subversion_toplevel.desktop
+share/kservices5/kdesvnpart.desktop
+share/kservices5/ksvn+file.protocol
+share/kservices5/ksvn+http.protocol
+share/kservices5/ksvn+https.protocol
+share/kservices5/ksvn+ssh.protocol
+share/kservices5/ksvn.protocol
+share/kservices5/svn+file.protocol
+share/kservices5/svn+http.protocol
+share/kservices5/svn+https.protocol
+share/kservices5/svn+ssh.protocol
+share/kservices5/svn.protocol
+share/kxmlgui5/kdesvn/kdesvn_part.rc
+share/kxmlgui5/kdesvn/kdesvnui.rc
+share/locale/ast/LC_MESSAGES/kdesvn.mo
+share/locale/bs/LC_MESSAGES/kdesvn.mo
+share/locale/ca/LC_MESSAGES/kdesvn.mo
+share/locale/ca@valencia/LC_MESSAGES/kdesvn.mo
+share/locale/cs/LC_MESSAGES/kdesvn.mo
+share/locale/de/LC_MESSAGES/kdesvn.mo
+share/locale/el/LC_MESSAGES/kdesvn.mo
+share/locale/en_GB/LC_MESSAGES/kdesvn.mo
+share/locale/es/LC_MESSAGES/kdesvn.mo
+share/locale/fi/LC_MESSAGES/kdesvn.mo
+share/locale/fr/LC_MESSAGES/kdesvn.mo
+share/locale/gl/LC_MESSAGES/kdesvn.mo
+share/locale/hu/LC_MESSAGES/kdesvn.mo
+share/locale/it/LC_MESSAGES/kdesvn.mo
+share/locale/ja/LC_MESSAGES/kdesvn.mo
+share/locale/lt/LC_MESSAGES/kdesvn.mo
+share/locale/nl/LC_MESSAGES/kdesvn.mo
+share/locale/nn/LC_MESSAGES/kdesvn.mo
+share/locale/pl/LC_MESSAGES/kdesvn.mo
+share/locale/pt/LC_MESSAGES/kdesvn.mo
+share/locale/pt_BR/LC_MESSAGES/kdesvn.mo
+share/locale/ro/LC_MESSAGES/kdesvn.mo
+share/locale/ru/LC_MESSAGES/kdesvn.mo
+share/locale/sk/LC_MESSAGES/kdesvn.mo
+share/locale/sl/LC_MESSAGES/kdesvn.mo
+share/locale/sv/LC_MESSAGES/kdesvn.mo
+share/locale/ug/LC_MESSAGES/kdesvn.mo
+share/locale/uk/LC_MESSAGES/kdesvn.mo
+share/locale/zh_CN/LC_MESSAGES/kdesvn.mo
+share/locale/zh_TW/LC_MESSAGES/kdesvn.mo

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 14, 10:31 PM (11 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29690066
Default Alt Text
D15224.id41961.diff (15 KB)

Event Timeline