aboutsummaryrefslogtreecommitdiff
path: root/devel/kdesvn-kde4
diff options
context:
space:
mode:
Diffstat (limited to 'devel/kdesvn-kde4')
-rw-r--r--devel/kdesvn-kde4/Makefile16
-rw-r--r--devel/kdesvn-kde4/distinfo6
-rw-r--r--devel/kdesvn-kde4/files/patch-CMakeLists.txt11
-rw-r--r--devel/kdesvn-kde4/files/patch-src-svnqt-path.cpp108
-rw-r--r--devel/kdesvn-kde4/pkg-plist3
5 files changed, 8 insertions, 136 deletions
diff --git a/devel/kdesvn-kde4/Makefile b/devel/kdesvn-kde4/Makefile
index 3c8910dc4a67..523965826157 100644
--- a/devel/kdesvn-kde4/Makefile
+++ b/devel/kdesvn-kde4/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= kdesvn
-PORTVERSION= 0.10.0
+PORTVERSION= 0.11.0
CATEGORIES= devel kde
MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/ \
http://www.yuanjue.net/download/
@@ -21,7 +21,8 @@ PATCH_WRKSRC= ${WRKDIR}/${DISTNAME}
CMAKE_ARGS= -DCMAKE_BUILD_TYPE:STRING=Release \
-DCMAKE_C_COMPILER:STRING='${CC}' \
-DCMAKE_CXX_COMPILER:STRING=${CXX} \
- -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}"
+ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
+ -DCMAKE_INSTALL_PREFIX=${PREFIX}
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn \
svn_client-1:${PORTSDIR}/devel/subversion \
@@ -33,8 +34,6 @@ USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GETTEXT= yes
-CXXFLAGS+= -lc
-
MAN1= kdesvn.1 kdesvnaskpass.1
.include <bsd.port.pre.mk>
@@ -50,13 +49,4 @@ do-configure:
@(cd ${WRKSRC}; \
${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
-pre-build:
- @${ECHO_CMD} "*************************************************************************"
- @${ECHO_CMD} " NOTE "
- @${ECHO_CMD} "If you cannot build kdesvn successfully, please *pkg_delete* the existing"
- @${ECHO_CMD} "kdesvn on your machine first and then try again. This issue should be "
- @${ECHO_CMD} "fixed in the next release version of kdesvn, hopefully. "
- @${ECHO_CMD} "*************************************************************************"
- @sleep 3
-
.include <bsd.port.post.mk>
diff --git a/devel/kdesvn-kde4/distinfo b/devel/kdesvn-kde4/distinfo
index bf2bfb4b5911..503294d05424 100644
--- a/devel/kdesvn-kde4/distinfo
+++ b/devel/kdesvn-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.10.0.tar.bz2) = 896d62ac8687236f05e984ba6cd69e6b
-SHA256 (kdesvn-0.10.0.tar.bz2) = af453638b263bcfaf8060f9270a5ddddcc76f7beae7958908499f6e9cfa3129c
-SIZE (kdesvn-0.10.0.tar.bz2) = 1179156
+MD5 (kdesvn-0.11.0.tar.bz2) = 466ea28e5e66d0536ff57b9da4cc95bd
+SHA256 (kdesvn-0.11.0.tar.bz2) = 2888bc65cdd9dcc17094152f35a9b4fedf36bece4a25e351ef169889df0db8f3
+SIZE (kdesvn-0.11.0.tar.bz2) = 1183637
diff --git a/devel/kdesvn-kde4/files/patch-CMakeLists.txt b/devel/kdesvn-kde4/files/patch-CMakeLists.txt
deleted file mode 100644
index 2471e06f7cd8..000000000000
--- a/devel/kdesvn-kde4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig Sat Sep 30 05:45:15 2006
-+++ CMakeLists.txt Sun Oct 8 23:18:36 2006
-@@ -30,7 +30,7 @@
- ${CMAKE_BINARY_DIR}/src/svnfrontend
- ${CMAKE_BINARY_DIR})
-
--ADD_DEFINITIONS(${KDE3_DEFINITIONS} ${APR_CPP_FLAGS} ${QT_DEFINITIONS})
-+ADD_DEFINITIONS(${KDE3_DEFINITIONS} ${QT_DEFINITIONS} ${APR_CPP_FLAGS})
- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
- SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib/kde3)
-
diff --git a/devel/kdesvn-kde4/files/patch-src-svnqt-path.cpp b/devel/kdesvn-kde4/files/patch-src-svnqt-path.cpp
deleted file mode 100644
index 680c6829458c..000000000000
--- a/devel/kdesvn-kde4/files/patch-src-svnqt-path.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
---- src/svnqt/path.cpp.orig Tue Sep 26 05:32:24 2006
-+++ src/svnqt/path.cpp Mon Oct 9 00:05:26 2006
-@@ -186,105 +186,6 @@
- }
- }
-
-- /* ===================================================================
-- * The next two Fixed_* functions are copies of the APR
-- * apr_temp_dir_get functionality with a fix applied.
-- * This should turn up in APR release 0.9.5 or 1.0, but
-- * for now is reproduced here.
-- *
-- * TODO: Remove this section!
-- */
--#include "apr_env.h"
--
--#define test_tempdir Fixed_test_tempdir
--#define apr_temp_dir_get Fixed_apr_temp_dir_get
--
-- static char global_temp_dir[APR_PATH_MAX+1] = { 0 };
--
-- /* Try to open a temporary file in the temporary dir, write to it,
-- and then close it. */
-- static int Fixed_test_tempdir(const char *temp_dir, apr_pool_t *p)
-- {
-- apr_file_t *dummy_file;
-- // This is the only actual fix - adding the ".XXXXXX"!
-- const char *path = apr_pstrcat(p, temp_dir, "/apr-tmp.XXXXXX", NULL);
--
-- if (apr_file_mktemp(&dummy_file, (char *)path, 0, p) == APR_SUCCESS) {
-- if (apr_file_putc('!', dummy_file) == APR_SUCCESS) {
-- if (apr_file_close(dummy_file) == APR_SUCCESS) {
-- apr_file_remove(path, p);
-- return 1;
-- }
-- }
-- }
-- return 0;
-- }
--
-- static apr_status_t Fixed_apr_temp_dir_get(const char **temp_dir, apr_pool_t *p)
-- {
-- apr_status_t apr_err;
-- const char *try_dirs[] = { "/tmp", "/usr/tmp", "/var/tmp" };
-- const char *try_envs[] = { "TMP", "TEMP", "TMPDIR" };
-- char *cwd;
-- size_t i;
--
-- /* Our goal is to find a temporary directory suitable for writing
-- into. We'll only pay the price once if we're successful -- we
-- cache our successful find. Here's the order in which we'll try
-- various paths:
--
-- $TMP
-- $TEMP
-- $TMPDIR
-- "/tmp"
-- "/var/tmp"
-- "/usr/tmp"
-- `pwd`
--
-- NOTE: This algorithm is basically the same one used by Python
-- 2.2's tempfile.py module. */
--
-- /* Try the environment first. */
-- for (i = 0; i < (sizeof(try_envs) / sizeof(const char *)); i++) {
-- char *value;
-- apr_err = apr_env_get(&value, try_envs[i], p);
-- if ((apr_err == APR_SUCCESS) && value) {
-- apr_size_t len = strlen(value);
-- if (len && (len < APR_PATH_MAX) && test_tempdir(value, p)) {
-- memcpy(global_temp_dir, value, len + 1);
-- goto end;
-- }
-- }
-- }
--
-- /* Next, try a set of hard-coded paths. */
-- for (i = 0; i < (sizeof(try_dirs) / sizeof(const char *)); i++) {
-- if (test_tempdir(try_dirs[i], p)) {
-- memcpy(global_temp_dir, try_dirs[i], strlen(try_dirs[i]) + 1);
-- goto end;
-- }
-- }
--
-- /* Finally, try the current working directory. */
-- if (APR_SUCCESS == apr_filepath_get(&cwd, APR_FILEPATH_NATIVE, p)) {
-- if (test_tempdir(cwd, p)) {
-- memcpy(global_temp_dir, cwd, strlen(cwd) + 1);
-- goto end;
-- }
-- }
--
--end:
-- if (global_temp_dir[0]) {
-- *temp_dir = apr_pstrdup(p, global_temp_dir);
-- return APR_SUCCESS;
-- }
-- return APR_EGENERAL;
-- }
--
-- /* ===================================================================
-- * End of inserted fixed APR code
-- */
--
- Path
- Path::getTempDir ()
- {
diff --git a/devel/kdesvn-kde4/pkg-plist b/devel/kdesvn-kde4/pkg-plist
index 5a2f16d44c1e..e98fcf8b46a2 100644
--- a/devel/kdesvn-kde4/pkg-plist
+++ b/devel/kdesvn-kde4/pkg-plist
@@ -19,6 +19,7 @@ include/svnqt/pool.hpp
include/svnqt/repository.hpp
include/svnqt/repositorylistener.hpp
include/svnqt/revision.hpp
+include/svnqt/shared_pointer.hpp
include/svnqt/smart_pointer.hpp
include/svnqt/status.hpp
include/svnqt/svnfilestream.hpp
@@ -37,7 +38,7 @@ lib/kde3/libkdesvnpart.so
lib/libsvnqt.la
lib/libsvnqt.so
lib/libsvnqt.so.3
-lib/libsvnqt.so.3.0.0
+lib/libsvnqt.so.3.1.0
share/applications/kde/kdesvn.desktop
share/apps/kdesvn/kdesvnui.rc
share/apps/kdesvnpart/kdesvn_part.rc
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 00:42:36 +0000