Date: Fri, 3 Nov 2006 08:01:24 GMT From: Yuan Jue<yuanjue@yuanjue.net> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/105101: [maintainer update] devel/kdesvn 0.10.0 -> 0.11.0 Message-ID: <200611030801.kA381OMK068387@www.freebsd.org> Resent-Message-ID: <200611030810.kA38ARU6053478@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 105101 >Category: ports >Synopsis: [maintainer update] devel/kdesvn 0.10.0 -> 0.11.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Nov 03 08:10:27 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Yuan Jue >Release: FreeBSD 6.1-RELEASE >Organization: Institute of Computing Technology, CAS, China >Environment: FreeBSD maver-freebsd.net 6.1-RELEASE FreeBSD 6.1-RELEASE #4: Mon Jul 31 12:14:40 CST 2006 maver@maver-freebsd.net:/usr/obj/usr/src/sys/MYKERNEL_6_1 i386 >Description: upgrade to 0.11.0 * fix the PREFIX issue * "uninstall before install" problem should not happen again (untested) >How-To-Repeat: >Fix: ===> Generating patch ===> Viewing diff with more diff -ruN --exclude=CVS /usr/ports/devel/kdesvn/Makefile /usr/home/maver/Develop/test/kdesvn/Makefile --- /usr/ports/devel/kdesvn/Makefile Sun Oct 29 00:35:52 2006 +++ /usr/home/maver/Develop/test/kdesvn/Makefile Fri Nov 3 15:24:35 2006 @@ -2,10 +2,10 @@ # Date created: 08 April 2006 # Whom: Yuan Jue <yuanjue@yuanjue.net> # -# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.12 2006/10/28 16:35:52 rafan Exp $ +# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.2 2006/04/15 02:53:53 markus Exp $ 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 @@ 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_LDCONFIG= yes USE_GETTEXT= yes -CXXFLAGS+= -lc - MAN1= kdesvn.1 kdesvnaskpass.1 .include <bsd.port.pre.mk> @@ -49,14 +48,5 @@ 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 -ruN --exclude=CVS /usr/ports/devel/kdesvn/distinfo /usr/home/maver/Develop/test/kdesvn/distinfo --- /usr/ports/devel/kdesvn/distinfo Tue Oct 10 00:48:41 2006 +++ /usr/home/maver/Develop/test/kdesvn/distinfo Fri Nov 3 12:12:26 2006 @@ -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 -ruN --exclude=CVS /usr/ports/devel/kdesvn/files/patch-CMakeLists.txt /usr/home/maver/Develop/test/kdesvn/files/patch-CMakeLists.txt --- /usr/ports/devel/kdesvn/files/patch-CMakeLists.txt Tue Oct 10 00:50:28 2006 +++ /usr/home/maver/Develop/test/kdesvn/files/patch-CMakeLists.txt Thu Jan 1 08:00:00 1970 @@ -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 -ruN --exclude=CVS /usr/ports/devel/kdesvn/files/patch-src-svnqt-path.cpp /usr/home/maver/Develop/test/kdesvn/files/patch-src-svnqt-path.cpp --- /usr/ports/devel/kdesvn/files/patch-src-svnqt-path.cpp Tue Oct 10 00:50:28 2006 +++ /usr/home/maver/Develop/test/kdesvn/files/patch-src-svnqt-path.cpp Thu Jan 1 08:00:00 1970 @@ -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 -ruN --exclude=CVS /usr/ports/devel/kdesvn/pkg-plist /usr/home/maver/Develop/test/kdesvn/pkg-plist --- /usr/ports/devel/kdesvn/pkg-plist Tue Oct 10 00:48:41 2006 +++ /usr/home/maver/Develop/test/kdesvn/pkg-plist Fri Nov 3 15:36:18 2006 @@ -19,6 +19,7 @@ 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/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 ===> Done >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611030801.kA381OMK068387>