diff options
| author | fluffy <fluffy@FreeBSD.org> | 2010-05-13 20:35:05 +0800 |
|---|---|---|
| committer | fluffy <fluffy@FreeBSD.org> | 2010-05-13 20:35:05 +0800 |
| commit | 8624c595a20e2d7d753dadcf9e78288421013012 (patch) | |
| tree | c043b4a334d9e2652b15971eacac0f662a86e6cd | |
| parent | 7d84571dd131c24c74028ef743f42f99310f90c3 (diff) | |
| download | freebsd-ports-gnome-8624c595a20e2d7d753dadcf9e78288421013012.tar.gz freebsd-ports-gnome-8624c595a20e2d7d753dadcf9e78288421013012.tar.zst freebsd-ports-gnome-8624c595a20e2d7d753dadcf9e78288421013012.zip | |
- net-im/libmsn: update to 4.1 release and unbroke with ports openssl
PR: 146465
Submitted by: myself, maintainer via mail
Approved by: Shane Bell (maintainer)
| -rw-r--r-- | net-im/libmsn/Makefile | 7 | ||||
| -rw-r--r-- | net-im/libmsn/distinfo | 6 | ||||
| -rw-r--r-- | net-im/libmsn/files/patch-msn__CMakeLists.txt | 10 | ||||
| -rw-r--r-- | net-im/libmsn/files/patch-msntest__msntest.cpp | 17 | ||||
| -rw-r--r-- | net-im/libmsn/pkg-plist | 2 |
5 files changed, 31 insertions, 11 deletions
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile index de6395d80701..a4db361e93af 100644 --- a/net-im/libmsn/Makefile +++ b/net-im/libmsn/Makefile @@ -7,9 +7,9 @@ # PORTNAME= libmsn -DISTVERSION= 4.0-beta8 +DISTVERSION= 4.1 CATEGORIES= net-im -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/4.0%20beta%208 +MASTER_SITES= SF MAINTAINER= decept0@gmail.com COMMENT= A library for connecting to MSN Messenger service @@ -23,5 +23,8 @@ MAKE_JOBS_SAFE= yes post-patch: @${REINPLACE_CMD} -e 's|lib$${LIB_SUFFIX}/pkgconfig|libdata/pkgconfig|g' \ ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|crypto|${OPENSSLLIB}/libcrypto.so|g' -e 's|ssl|${OPENSSLLIB}/libssl.so|g' \ + ${WRKSRC}/msn/CMakeLists.txt \ + ${WRKSRC}/msntest/CMakeLists.txt .include <bsd.port.mk> diff --git a/net-im/libmsn/distinfo b/net-im/libmsn/distinfo index 4bc04520591b..3439f8d12011 100644 --- a/net-im/libmsn/distinfo +++ b/net-im/libmsn/distinfo @@ -1,3 +1,3 @@ -MD5 (libmsn-4.0-beta8.tar.bz2) = 29d110b36402cfb0c3affeb10be8a6c6 -SHA256 (libmsn-4.0-beta8.tar.bz2) = 98f0ddd2388979977cd8ed8720830ec23df093186a5fc64ceaad8f17074a56a2 -SIZE (libmsn-4.0-beta8.tar.bz2) = 299789 +MD5 (libmsn-4.1.tar.bz2) = 769d3cf0e5625263fbc23321c1ddfcb0 +SHA256 (libmsn-4.1.tar.bz2) = ddf1575e26af5760ede1072f6d4e2057a9532118e9bd7692898a60dbe21b6c5c +SIZE (libmsn-4.1.tar.bz2) = 289614 diff --git a/net-im/libmsn/files/patch-msn__CMakeLists.txt b/net-im/libmsn/files/patch-msn__CMakeLists.txt index ec7f3719e6e1..f2b1ea2d09ae 100644 --- a/net-im/libmsn/files/patch-msn__CMakeLists.txt +++ b/net-im/libmsn/files/patch-msn__CMakeLists.txt @@ -1,10 +1,10 @@ --- ./msn/CMakeLists.txt.orig 2008-11-18 18:17:55.000000000 +0300 +++ ./msn/CMakeLists.txt 2008-12-28 22:24:22.000000000 +0300 -@@ -43,7 +43,7 @@ - - add_library(msn SHARED ${msn_STAT_SRCS}) - set_target_properties(msn PROPERTIES VERSION 0.1.0 -- SOVERSION 0.1 +@@ -63,7 +63,7 @@ + ) + add_library(msn SHARED ${msn_STAT_SRCS} ${siren_STAT_SRCS}) + set_target_properties(msn PROPERTIES VERSION 0.3.0 +- SOVERSION 0.3 + SOVERSION 0 ) diff --git a/net-im/libmsn/files/patch-msntest__msntest.cpp b/net-im/libmsn/files/patch-msntest__msntest.cpp new file mode 100644 index 000000000000..b4dff286e5b7 --- /dev/null +++ b/net-im/libmsn/files/patch-msntest__msntest.cpp @@ -0,0 +1,17 @@ +--- msntest/msntest.cpp 2010/01/22 12:45:14 119 ++++ msntest/msntest.cpp 2010/05/03 19:33:50 120 +@@ -259,7 +259,13 @@ + if(mySocketsSsl[i].isSSL && !mySocketsSsl[i].isConnected) + { + BIO *bio_socket_new; +- SSL_METHOD *meth=NULL; ++ ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const SSL_METHOD *meth=NULL; ++#else ++ SSL_METHOD *meth=NULL; ++#endif ++ + meth=SSLv23_client_method(); + SSLeay_add_ssl_algorithms(); + mySocketsSsl[i].ctx = SSL_CTX_new(meth); diff --git a/net-im/libmsn/pkg-plist b/net-im/libmsn/pkg-plist index c7eef601fbd7..564561d991a7 100644 --- a/net-im/libmsn/pkg-plist +++ b/net-im/libmsn/pkg-plist @@ -18,6 +18,6 @@ include/msn/switchboardserver.h include/msn/util.h lib/libmsn.so lib/libmsn.so.0 -lib/libmsn.so.0.1.0 +lib/libmsn.so.0.3.0 libdata/pkgconfig/libmsn.pc @dirrm include/msn |