Date: Mon, 24 Dec 2007 01:39:19 +0300 (MSK) From: Maxim Samsonov <xors@mne.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/118978: [UPDATE]: devel/kdesvn Update to new release, 0.14.1 Message-ID: <200712232239.lBNMdJoX019869@xors.pg.org> Resent-Message-ID: <200712232310.lBNNA2aZ018523@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 118978 >Category: ports >Synopsis: [UPDATE]: devel/kdesvn Update to new release, 0.14.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Dec 23 23:10:02 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Maxim Samsonov >Release: FreeBSD 6.3-PRERELEASE i386 >Organization: >Environment: >Description: Update KDESvn to new release, 0.14.1. A patch to avoid conflicts with devel/kdesdk3 port. A patch to deal correctly with WITHOUT_NLS knob. >How-To-Repeat: >Fix: --- kdesvn.diff begins here --- diff -udrN kdesvn.orig/Makefile kdesvn/Makefile --- kdesvn.orig/Makefile 2007-12-24 01:16:14.000000000 +0300 +++ kdesvn/Makefile 2007-12-24 01:18:11.000000000 +0300 @@ -5,7 +5,7 @@ # $FreeBSD: ports/devel/kdesvn/Makefile,v 1.20 2007/08/20 05:28:28 delphij Exp $ PORTNAME= kdesvn -PORTVERSION= 0.13.0 +PORTVERSION= 0.14.1 CATEGORIES= devel kde MASTER_SITES= http://www.alwins-world.de/programs/download/${PORTNAME}/${PORTVERSION:R}.x/ @@ -29,8 +29,6 @@ USE_BZIP2= yes USE_KDELIBS_VER=3 -USE_GMAKE= yes -GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALLS_ICONS= yes @@ -38,8 +36,8 @@ USE_GETTEXT= yes PLIST_SUB+= NLS="" .else -CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " +EXTRA_PATCHES= ${FILESDIR}/nls-patch-CMakeLists.txt .endif DOCSDIR= ${PREFIX}/share/doc/HTML/en/${PORTNAME} diff -udrN kdesvn.orig/distinfo kdesvn/distinfo --- kdesvn.orig/distinfo 2007-12-24 01:16:14.000000000 +0300 +++ kdesvn/distinfo 2007-12-23 23:49:26.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (kdesvn-0.13.0.tar.bz2) = 8722253b4fe7789e2394d0f9f85dc52f -SHA256 (kdesvn-0.13.0.tar.bz2) = eac9b85d1f99c3048145bd46c3537870f92fb079e46c14b424ffb6c93642f249 -SIZE (kdesvn-0.13.0.tar.bz2) = 1243539 +MD5 (kdesvn-0.14.1.tar.bz2) = cdd1e2244e1aee3641e76124edd300f4 +SHA256 (kdesvn-0.14.1.tar.bz2) = 6e41794beb23c95542f807cbd93d05a734a0c1eb77544680f2842cc66111e8eb +SIZE (kdesvn-0.14.1.tar.bz2) = 1267828 diff -udrN kdesvn.orig/files/nls-patch-CMakeLists.txt kdesvn/files/nls-patch-CMakeLists.txt --- kdesvn.orig/files/nls-patch-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ kdesvn/files/nls-patch-CMakeLists.txt 2007-12-24 00:51:14.000000000 +0300 @@ -0,0 +1,23 @@ +--- CMakeLists.txt.orig 2007-12-24 00:50:18.000000000 +0300 ++++ CMakeLists.txt 2007-12-24 00:50:48.000000000 +0300 +@@ -90,20 +90,5 @@ + + + ADD_SUBDIRECTORY(src) +-ADD_SUBDIRECTORY(po) + ADD_SUBDIRECTORY(doc) + +-FILE(GLOB _POFILES po/*.po) +-FOREACH(_p ${_POFILES}) +- SET(POFILES "${_p} ${POFILES}") +-ENDFOREACH(_p) +- +-SET(MESSAGES_DIR ${CMAKE_SOURCE_DIR}/src) +-CONFIGURE_FILE( +- "${CMAKE_CURRENT_SOURCE_DIR}/cmakemodules/package_messages.sh.in" +- "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh" +- IMMEDIATE +- @ONLY) +-ADD_CUSTOM_TARGET(package-messages +- "${CMAKE_CURRENT_BINARY_DIR}/package_messages.sh") +- diff -udrN kdesvn.orig/files/patch-src-kiosvn-CMakeLists.txt kdesvn/files/patch-src-kiosvn-CMakeLists.txt --- kdesvn.orig/files/patch-src-kiosvn-CMakeLists.txt 1970-01-01 03:00:00.000000000 +0300 +++ kdesvn/files/patch-src-kiosvn-CMakeLists.txt 2007-12-23 23:54:19.000000000 +0300 @@ -0,0 +1,11 @@ +--- src/kiosvn/CMakeLists.txt.orig 2007-12-23 23:53:16.000000000 +0300 ++++ src/kiosvn/CMakeLists.txt 2007-12-23 23:53:30.000000000 +0300 +@@ -18,7 +18,7 @@ + INSTALL(TARGETS kio_ksvn + LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR}) + +-FILE(GLOB PROTFILES *.protocol) ++FILE(GLOB PROTFILES k*.protocol) + + INSTALL(FILES ${PROTFILES} + DESTINATION ${SERVICES_INSTALL_DIR}) diff -udrN kdesvn.orig/pkg-plist kdesvn/pkg-plist --- kdesvn.orig/pkg-plist 2007-12-24 01:16:14.000000000 +0300 +++ kdesvn/pkg-plist 2007-12-24 00:35:24.000000000 +0300 @@ -24,6 +24,7 @@ include/svnqt/status.hpp include/svnqt/svnfilestream.hpp include/svnqt/svnqt_defines.hpp +include/svnqt/svnqttypes.hpp include/svnqt/svnstream.hpp include/svnqt/targets.hpp include/svnqt/url.hpp @@ -35,11 +36,12 @@ lib/kde3/kio_ksvn.so lib/kde3/libkdesvnpart.la lib/kde3/libkdesvnpart.so -lib/libsvnqt.la lib/libsvnqt.so -lib/libsvnqt.so.3 -lib/libsvnqt.so.3.2.0 +lib/libsvnqt.so.4 +lib/libsvnqt.so.4.0.0 share/applications/kde/kdesvn.desktop +share/apps/kconf_update/kdesvn-use-external-update.sh +share/apps/kconf_update/kdesvnpartrc-use-external.upd share/apps/kdesvn/kdesvnui.rc share/apps/kdesvnpart/kdesvn_part.rc share/apps/konqueror/servicemenus/kdesvn_subversion.desktop @@ -268,11 +270,6 @@ share/services/ksvn+https.protocol share/services/ksvn+ssh.protocol share/services/ksvn.protocol -share/services/svn+file.protocol -share/services/svn+http.protocol -share/services/svn+https.protocol -share/services/svn+ssh.protocol -share/services/svn.protocol @dirrmtry share/services/kded @dirrm share/apps/kdesvnpart @dirrm share/apps/kdesvn --- kdesvn.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712232239.lBNMdJoX019869>