From c3f11c731983daa9211b8b586bff5041b7dcff9b Mon Sep 17 00:00:00 2001 From: makc Date: Sun, 25 Apr 2010 12:02:16 +0000 Subject: Update to 0.6.1 --- irc/quassel/Makefile | 9 ++++----- irc/quassel/distinfo | 6 +++--- irc/quassel/files/patch-src__common__CMakeLists.txt | 15 --------------- 3 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 irc/quassel/files/patch-src__common__CMakeLists.txt diff --git a/irc/quassel/Makefile b/irc/quassel/Makefile index bcb057012e7d..e33d873c3990 100644 --- a/irc/quassel/Makefile +++ b/irc/quassel/Makefile @@ -6,8 +6,7 @@ # PORTNAME= quassel -PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTVERSION= 0.6.1 CATEGORIES= irc MASTER_SITES= http://www.quassel-irc.org/pub/ @@ -21,7 +20,7 @@ USE_CMAKE= yes USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build CMAKE_USE_PTHREAD= yes -MAKE_JOBS_UNSAFE= yes +MAKE_JOBS_SAFE= yes OPTIONS= MONO "Quassel standalone client" on \ CORE "Quassel core" on \ @@ -32,7 +31,7 @@ CMAKE_ARGS+= -DWANT_MONO=${QUASSEL_MONO} \ -DWANT_QTCLIENT=${QUASSEL_CLIENT} \ -DWITH_LIBINDICATE=OFF -.include +.include .if defined(WITHOUT_MONO) && defined(WITHOUT_CORE) && defined(WITHOUT_CLIENT) IGNORE= needs at least one Quassel component. Please, rerun 'make config' @@ -81,4 +80,4 @@ pre-configure: ${WRKSRC}/CMakeLists.txt .endif -.include +.include diff --git a/irc/quassel/distinfo b/irc/quassel/distinfo index b93d64359569..59c2fa7648e4 100644 --- a/irc/quassel/distinfo +++ b/irc/quassel/distinfo @@ -1,3 +1,3 @@ -MD5 (quassel-0.5.2.tar.bz2) = b94cbd1f63db8e22f53360b32bb955b7 -SHA256 (quassel-0.5.2.tar.bz2) = 9c98dcefa4b1655ae92b0204ef30594c9043701fb66350c5e69beafa86b88c8a -SIZE (quassel-0.5.2.tar.bz2) = 3307109 +MD5 (quassel-0.6.1.tar.bz2) = 569d310d06f124952009704d55a98100 +SHA256 (quassel-0.6.1.tar.bz2) = e01b5a91359ca37b3db2849b3b1db32f768c865f698d0a4f3ef679f722edb5ec +SIZE (quassel-0.6.1.tar.bz2) = 2531035 diff --git a/irc/quassel/files/patch-src__common__CMakeLists.txt b/irc/quassel/files/patch-src__common__CMakeLists.txt deleted file mode 100644 index f117fdbfe846..000000000000 --- a/irc/quassel/files/patch-src__common__CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- ./src/common/CMakeLists.txt.orig 2010-01-19 02:52:02.000000000 +0300 -+++ ./src/common/CMakeLists.txt 2010-02-13 11:11:27.822966933 +0300 -@@ -77,11 +77,4 @@ - target_link_libraries(mod_common "-framework CoreServices" "-framework CoreFoundation") - endif(APPLE) - --if(CMAKE_HOST_UNIX) -- find_library(libdl dl) -- if (libdl-NOTFOUND) -- message(FATAL_ERROR "Cannot find required library: libdl") -- endif (libdl-NOTFOUND) -- -- target_link_libraries(mod_common ${libdl}) --endif(CMAKE_HOST_UNIX) -+target_link_libraries(mod_common ${CMAKE_DL_LIBS}) -- cgit