[74338] trunk/dports/kde/kdesvn
michaelld at macports.org
michaelld at macports.org
Mon Dec 13 08:43:06 PST 2010
Revision: 74338
http://trac.macports.org/changeset/74338
Author: michaelld at macports.org
Date: 2010-12-13 08:43:00 -0800 (Mon, 13 Dec 2010)
Log Message:
-----------
kdesvn changes:
* update to version 1.5.5.
* allow for universal building.
* fix inclusion of APR and APU LDFLAGS so-as to both have the correct -L flags as well as include them only right before the corresponding -l flag.
* NOTE: this port does not yet work for me (it might for others though); this checkin is to allow others to see how far they can get & report back.
Modified Paths:
--------------
trunk/dports/kde/kdesvn/Portfile
Added Paths:
-----------
trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff
trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff
trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff
trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff
Removed Paths:
-------------
trunk/dports/kde/kdesvn/files/app-install-and-icon-fix.patch
trunk/dports/kde/kdesvn/files/ignore-apr0-and-apr-util0.patch
trunk/dports/kde/kdesvn/files/no-kdesdk-conflict.patch
Modified: trunk/dports/kde/kdesvn/Portfile
===================================================================
--- trunk/dports/kde/kdesvn/Portfile 2010-12-13 15:04:30 UTC (rev 74337)
+++ trunk/dports/kde/kdesvn/Portfile 2010-12-13 16:43:00 UTC (rev 74338)
@@ -2,10 +2,10 @@
# $Id$
PortSystem 1.0
-PortGroup kde4 1.0
+PortGroup kde4 1.1
name kdesvn
-version 1.5.2
+version 1.5.5
categories kde kde4
maintainers nomaintainer
platforms darwin
@@ -19,24 +19,20 @@
use_bzip2 yes
-checksums md5 75bacc14aff0e0c2bbbf1e4ea02a1316 \
- sha1 e8728c1f6fbf46b7ac2879bfdba152c9be9b9b43 \
- rmd160 5361e0983c6a18afabcb88cc06270fc3fbb595aa
+checksums md5 8f11d31cc55fba408b7971541ee261d0 \
+ sha1 eb9bd624e387b07c215cb4247ec0133399d64604 \
+ rmd160 916d0c6509e68c27dd60c1fc64ef2f8ad4934c72
depends_lib-append port:kdelibs4 \
port:kdebase4-runtime \
port:subversion
patch.dir ${workpath}/${distname}/src
-patchfiles app-install-and-icon-fix.patch \
- ignore-apr0-and-apr-util0.patch \
- no-kdesdk-conflict.patch
+patchfiles patch-app-install-and-icon-fix.diff \
+ patch-ignore-apr0-and-apr-util0.diff \
+ patch-no-kdesdk-conflict.diff \
+ patch-fix-apr_apu-ldflags.diff
-configure.args-append ../${distname}
-
-# kdelibs4 is not universal
-universal_variant no
-
livecheck.type regex
livecheck.url ${homepage}wiki/DownLoads
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
Deleted: trunk/dports/kde/kdesvn/files/app-install-and-icon-fix.patch
===================================================================
--- trunk/dports/kde/kdesvn/files/app-install-and-icon-fix.patch 2010-12-13 15:04:30 UTC (rev 74337)
+++ trunk/dports/kde/kdesvn/files/app-install-and-icon-fix.patch 2010-12-13 16:43:00 UTC (rev 74338)
@@ -1,22 +0,0 @@
---- CMakeLists.txt.orig 2010-03-06 22:24:54.000000000 +0000
-+++ CMakeLists.txt 2010-03-06 23:54:27.000000000 +0000
-@@ -50,7 +50,10 @@
- ADD_SUBDIRECTORY(pics)
- ADD_SUBDIRECTORY(icons)
-
-+KDE4_ADD_APP_ICON(kdesvnsrc "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kdesvn.png")
-+
- KDE4_ADD_EXECUTABLE(kdesvn ${kdesvnsrc})
-+
- KDE_ADD_KPART(kdesvnpart ${partsrc})
-
- SET(QT_LIBRARIES "${QT_QTCORE_LIBRARY}" "${QT_QTGUI_LIBRARY}" )
-@@ -77,7 +80,7 @@
- )
-
- INSTALL(TARGETS kdesvn kdesvnaskpass kdesvnpart
-- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-+ ${INSTALL_TARGETS_DEFAULT_ARGS}
- LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
-
- # the resources
Deleted: trunk/dports/kde/kdesvn/files/ignore-apr0-and-apr-util0.patch
===================================================================
--- trunk/dports/kde/kdesvn/files/ignore-apr0-and-apr-util0.patch 2010-12-13 15:04:30 UTC (rev 74337)
+++ trunk/dports/kde/kdesvn/files/ignore-apr0-and-apr-util0.patch 2010-12-13 16:43:00 UTC (rev 74338)
@@ -1,17 +0,0 @@
---- svnqt/cmakemodules/FindSubversion.cmake.orig 2010-04-02 10:24:51.000000000 -0500
-+++ svnqt/cmakemodules/FindSubversion.cmake 2010-04-02 10:25:29.000000000 -0500
-@@ -60,12 +60,12 @@
- FIND_SUB_LIB(SUBVERSION_RALIB svn_ra-1)
- FIND_SUB_LIB(SUBVERSION_DIFFLIB svn_diff-1)
-
-- FIND_PROGRAM(APR_CONFIG NAMES apr-config apr-1-config
-+ FIND_PROGRAM(APR_CONFIG NAMES apr-1-config
- PATHS
- /usr/local/apr/bin
- )
-
-- FIND_PROGRAM(APU_CONFIG NAMES apu-config apu-1-config
-+ FIND_PROGRAM(APU_CONFIG NAMES apu-1-config
- PATHS
- /usr/local/apr/bin
- )
Deleted: trunk/dports/kde/kdesvn/files/no-kdesdk-conflict.patch
===================================================================
--- trunk/dports/kde/kdesvn/files/no-kdesdk-conflict.patch 2010-12-13 15:04:30 UTC (rev 74337)
+++ trunk/dports/kde/kdesvn/files/no-kdesdk-conflict.patch 2010-12-13 16:43:00 UTC (rev 74338)
@@ -1,11 +0,0 @@
---- kiosvn/CMakeLists.txt.orig 2010-03-07 01:03:23.000000000 +0000
-+++ kiosvn/CMakeLists.txt 2010-03-07 01:03:42.000000000 +0000
-@@ -41,7 +41,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} )
Copied: trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff (from rev 74277, trunk/dports/kde/kdesvn/files/app-install-and-icon-fix.patch)
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff (rev 0)
+++ trunk/dports/kde/kdesvn/files/patch-app-install-and-icon-fix.diff 2010-12-13 16:43:00 UTC (rev 74338)
@@ -0,0 +1,22 @@
+--- CMakeLists.txt.orig 2010-03-06 22:24:54.000000000 +0000
++++ CMakeLists.txt 2010-03-06 23:54:27.000000000 +0000
+@@ -50,7 +50,10 @@
+ ADD_SUBDIRECTORY(pics)
+ ADD_SUBDIRECTORY(icons)
+
++KDE4_ADD_APP_ICON(kdesvnsrc "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kdesvn.png")
++
+ KDE4_ADD_EXECUTABLE(kdesvn ${kdesvnsrc})
++
+ KDE_ADD_KPART(kdesvnpart ${partsrc})
+
+ SET(QT_LIBRARIES "${QT_QTCORE_LIBRARY}" "${QT_QTGUI_LIBRARY}" )
+@@ -77,7 +80,7 @@
+ )
+
+ INSTALL(TARGETS kdesvn kdesvnaskpass kdesvnpart
+- RUNTIME DESTINATION ${BIN_INSTALL_DIR}
++ ${INSTALL_TARGETS_DEFAULT_ARGS}
+ LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ # the resources
Added: trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff (rev 0)
+++ trunk/dports/kde/kdesvn/files/patch-fix-apr_apu-ldflags.diff 2010-12-13 16:43:00 UTC (rev 74338)
@@ -0,0 +1,52 @@
+--- svnqt/CMakeLists.txt.orig 2010-12-10 10:10:56.000000000 -0500
++++ svnqt/CMakeLists.txt 2010-12-10 10:11:38.000000000 -0500
+@@ -197,9 +197,6 @@
+ SOVERSION ${LIB_MAJOR}
+ VERSION ${_soversion})
+
+-SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
+-SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
+-
+ IF(WIN32 OR APPLE)
+ SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+ ELSE(WIN32 OR APPLE)
+--- svnqt/cmakemodules/FindSubversion.cmake.orig 2010-12-10 10:30:20.000000000 -0500
++++ svnqt/cmakemodules/FindSubversion.cmake 2010-12-10 10:31:41.000000000 -0500
+@@ -90,21 +90,31 @@
+
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APR_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ STRING(REGEX REPLACE "^ +" "" APR_LIBS "${APR_LIBS}")
+- MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
+- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
+
+ EXECUTE_PROCESS(COMMAND ${APR_CONFIG} "--ldflags" OUTPUT_VARIABLE APR_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ STRING(REGEX REPLACE "^ +" "" APR_EXTRA_LDFLAGS "${APR_EXTRA_LDFLAGS}")
+- MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
++ #MESSAGE(STATUS "Found apr extra ldflags: ${APR_EXTRA_LDFLAGS}")
+
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--link-ld" "--libs" OUTPUT_VARIABLE APU_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ STRING(REGEX REPLACE "^ +" "" APU_LIBS "${APU_LIBS}")
+- MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
+- SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
+
+ EXECUTE_PROCESS(COMMAND ${APU_CONFIG} "--ldflags" OUTPUT_VARIABLE APU_EXTRA_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+ STRING(REGEX REPLACE "^ +" "" APU_EXTRA_LDFLAGS "${APU_EXTRA_LDFLAGS}")
+- MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LDFLAGS}")
++ #MESSAGE(STATUS "Found apu extra ldflags: ${APU_EXTRA_LDFLAGS}")
++
++ # set APR and APU libs to include extra LDFLAGS for just them.
++ # putting this into "ALL_LINKFLAGS" (as the original did below)
++ # results in those -L flags being first in the search list, which is
++ # undesirable in general. In this way, those -L flags are included
++ # only with the actual libraries (e.g., -lapr), so the placement is
++ # correct.
++ SET(APR_LIBS "${APR_EXTRA_LDFLAGS} ${APR_LIBS}")
++ SET(APU_LIBS "${APU_EXTRA_LDFLAGS} ${APU_LIBS}")
++
++ MESSAGE(STATUS "Found apr libs: ${APR_LIBS}")
++ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APR_LIBS})
++ MESSAGE(STATUS "Found apu libs: ${APU_LIBS}")
++ SET(SUBVERSION_ALL_LIBS ${SUBVERSION_ALL_LIBS} ${APU_LIBS})
+
+ CHECK_INCLUDE_FILES(execinfo.h HAS_BACKTRACE_H)
+
Copied: trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff (from rev 74277, trunk/dports/kde/kdesvn/files/ignore-apr0-and-apr-util0.patch)
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff (rev 0)
+++ trunk/dports/kde/kdesvn/files/patch-ignore-apr0-and-apr-util0.diff 2010-12-13 16:43:00 UTC (rev 74338)
@@ -0,0 +1,17 @@
+--- svnqt/cmakemodules/FindSubversion.cmake.orig 2010-04-02 10:24:51.000000000 -0500
++++ svnqt/cmakemodules/FindSubversion.cmake 2010-04-02 10:25:29.000000000 -0500
+@@ -60,12 +60,12 @@
+ FIND_SUB_LIB(SUBVERSION_RALIB svn_ra-1)
+ FIND_SUB_LIB(SUBVERSION_DIFFLIB svn_diff-1)
+
+- FIND_PROGRAM(APR_CONFIG NAMES apr-config apr-1-config
++ FIND_PROGRAM(APR_CONFIG NAMES apr-1-config
+ PATHS
+ /usr/local/apr/bin
+ )
+
+- FIND_PROGRAM(APU_CONFIG NAMES apu-config apu-1-config
++ FIND_PROGRAM(APU_CONFIG NAMES apu-1-config
+ PATHS
+ /usr/local/apr/bin
+ )
Copied: trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff (from rev 74277, trunk/dports/kde/kdesvn/files/no-kdesdk-conflict.patch)
===================================================================
--- trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff (rev 0)
+++ trunk/dports/kde/kdesvn/files/patch-no-kdesdk-conflict.diff 2010-12-13 16:43:00 UTC (rev 74338)
@@ -0,0 +1,11 @@
+--- kiosvn/CMakeLists.txt.orig 2010-03-07 01:03:23.000000000 +0000
++++ kiosvn/CMakeLists.txt 2010-03-07 01:03:42.000000000 +0000
+@@ -41,7 +41,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} )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101213/7e74ada0/attachment.html>
More information about the macports-changes
mailing list