ports/104196: [maintainer update] devel/kdesvn 0.9.1 -> 0.10.0
Yuan Jue
yuanjue at yuanjue.net
Mon Oct 9 05:20:17 UTC 2006
>Number: 104196
>Category: ports
>Synopsis: [maintainer update] devel/kdesvn 0.9.1 -> 0.10.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: Mon Oct 09 05:20:15 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 at maver-freebsd.net:/usr/obj/usr/src/sys/MYKERNEL_6_1 i386
>Description:
/devel/kdesvn port upgrade: 0.9.1 -> 0.10.0
author of kdesvn has changed its make system to CMake, which results in a huge change in port this time. :-)
>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 Tue Jul 25 01:01:16 2006
+++ /usr/home/maver/Develop/test/kdesvn/Makefile Mon Oct 9 12:30:51 2006
@@ -2,10 +2,10 @@
# Date created: 08 April 2006
# Whom: Yuan Jue <yuanjue at yuanjue.net>
#
-# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.8 2006/07/24 17:01:16 rafan Exp $
+# $FreeBSD: ports/devel/kdesvn/Makefile,v 1.2 2006/04/15 02:53:53 markus Exp $
PORTNAME= kdesvn
-PORTVERSION= 0.9.1
+PORTVERSION= 0.10.0
CATEGORIES= devel kde
MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/ \
http://www.yuanjue.net/download/
@@ -13,19 +13,28 @@
MAINTAINER= yuanjue at yuanjue.net
COMMENT= KDE frontend for Subversion
-EXTRA_PATCHES= ${PORTSDIR}/x11/kde3/files/extrapatch-old_configure
+BUILD_DEPENDS= cmake:${PORTSDIR}/devel/cmake
+
+WRKSRC= ${WRKDIR}/${DISTNAME}-build
+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}"
LIB_DEPENDS+= apr-1:${PORTSDIR}/devel/apr-svn \
svn_client-1:${PORTSDIR}/devel/subversion \
neon:${PORTSDIR}/www/neon
+USE_BZIP2= yes
USE_KDELIBS_VER=3
USE_GMAKE= yes
-USE_AUTOTOOLS= libtool:15
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
-CONFIGURE_ARGS+=--with-apr-config=apr-1-config \
- --with-apu-config=apu-1-config
+CXXFLAGS+= -lc
+
+MAN1= kdesvn.1 kdesvnaskpass.1
.include <bsd.port.pre.mk>
@@ -33,7 +42,15 @@
BROKEN= Does not compile on 4.x
.endif
-post-patch:
- @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+post-extract:
+ ${MKDIR} ${WRKSRC}
+
+do-configure:
+ @(cd ${WRKSRC}; \
+ ${LOCALBASE}/bin/cmake ${CMAKE_ARGS} ${PATCH_WRKSRC})
+
+post-install:
+ @${MV} ${PREFIX}/share/man/man1/kdesvn.1 ${PREFIX}/man/man1/kdesvn.1
+ @${MV} ${PREFIX}/share/man/man1/kdesvnaskpass.1 ${PREFIX}/man/man1/kdesvnaskpass.1
.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 Jul 25 01:01:16 2006
+++ /usr/home/maver/Develop/test/kdesvn/distinfo Thu Oct 5 22:53:58 2006
@@ -1,3 +1,3 @@
-MD5 (kdesvn-0.9.1.tar.gz) = 5ae31df56b853976db56400b1fd1b4fa
-SHA256 (kdesvn-0.9.1.tar.gz) = 79c4d369ebdc52924f641a14ca58a2dabc50804677e10d6132b218b9e0f99018
-SIZE (kdesvn-0.9.1.tar.gz) = 2027518
+MD5 (kdesvn-0.10.0.tar.bz2) = 896d62ac8687236f05e984ba6cd69e6b
+SHA256 (kdesvn-0.10.0.tar.bz2) = af453638b263bcfaf8060f9270a5ddddcc76f7beae7958908499f6e9cfa3129c
+SIZE (kdesvn-0.10.0.tar.bz2) = 1179156
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 Thu Jan 1 08:00:00 1970
+++ /usr/home/maver/Develop/test/kdesvn/files/patch-CMakeLists.txt Sun Oct 8 23:19:45 2006
@@ -0,0 +1,11 @@
+--- 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 Thu Jan 1 08:00:00 1970
+++ /usr/home/maver/Develop/test/kdesvn/files/patch-src-svnqt-path.cpp Mon Oct 9 00:06:26 2006
@@ -0,0 +1,108 @@
+--- 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 Sun Jul 23 11:43:54 2006
+++ /usr/home/maver/Develop/test/kdesvn/pkg-plist Mon Oct 9 12:45:49 2006
@@ -19,6 +19,7 @@
include/svnqt/repository.hpp
include/svnqt/repositorylistener.hpp
include/svnqt/revision.hpp
+include/svnqt/smart_pointer.hpp
include/svnqt/status.hpp
include/svnqt/svnfilestream.hpp
include/svnqt/svnqt_defines.hpp
@@ -27,19 +28,16 @@
include/svnqt/url.hpp
include/svnqt/version_check.hpp
include/svnqt/wc.hpp
-lib/kde3/kded_kdesvnd.a
lib/kde3/kded_kdesvnd.la
lib/kde3/kded_kdesvnd.so
-lib/kde3/kio_ksvn.a
lib/kde3/kio_ksvn.la
lib/kde3/kio_ksvn.so
-lib/kde3/libkdesvnpart.a
lib/kde3/libkdesvnpart.la
lib/kde3/libkdesvnpart.so
-lib/libsvnqt.a
lib/libsvnqt.la
lib/libsvnqt.so
-lib/libsvnqt.so.4
+lib/libsvnqt.so.3
+lib/libsvnqt.so.3.0.0
share/applications/kde/kdesvn.desktop
share/apps/kdesvn/kdesvnui.rc
share/apps/kdesvnpart/kdesvn_part.rc
@@ -47,6 +45,7 @@
share/config.kcfg/kdesvn_part.kcfg
share/doc/HTML/en/kdesvn/common
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
@@ -251,12 +250,14 @@
share/icons/hicolor/scalable/filesystems/kdesvnneedlock.svgz
share/icons/hicolor/scalable/filesystems/kdesvnupdates.svgz
share/locale/ca/LC_MESSAGES/kdesvn.mo
+share/locale/cs/LC_MESSAGES/kdesvn.mo
share/locale/de/LC_MESSAGES/kdesvn.mo
share/locale/es/LC_MESSAGES/kdesvn.mo
share/locale/fr/LC_MESSAGES/kdesvn.mo
share/locale/it/LC_MESSAGES/kdesvn.mo
share/locale/nl/LC_MESSAGES/kdesvn.mo
share/locale/pa/LC_MESSAGES/kdesvn.mo
+share/locale/ru/LC_MESSAGES/kdesvn.mo
share/locale/sv/LC_MESSAGES/kdesvn.mo
share/services/kded/kdesvnd.desktop
share/services/ksvn+file.protocol
===> Done
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list