From 9ccbe29b3f2ee154e4537c02d2a7f7f42b240fa9 Mon Sep 17 00:00:00 2001 From: Nicola Vitale Date: Tue, 30 Apr 2013 13:44:30 +0000 Subject: [PATCH] - Update to 1.1.1 - Trim Makefile header - Use GitHub as download site - Remove ABI version numbers from LIB_DEPENDS - Add pkgconfig to USES PR: ports/176852 Submitted by: nivit Approved by: Andrey K (maintainer, timeout > 2 weeks) Build log: http://goo.gl/5WD72 --- net-im/libjreen/Makefile | 31 +++++++++++++++++-------------- net-im/libjreen/distinfo | 4 ++-- net-im/libjreen/pkg-descr | 2 +- net-im/libjreen/pkg-plist | 11 ++++++++++- 4 files changed, 30 insertions(+), 18 deletions(-) diff --git a/net-im/libjreen/Makefile b/net-im/libjreen/Makefile index 2753f16d93a7..63e324f7eaf7 100644 --- a/net-im/libjreen/Makefile +++ b/net-im/libjreen/Makefile @@ -1,30 +1,33 @@ -# New ports collection makefile for: libjreen -# Date created: 2012-06-09 -# Whom: Max Brazhnikov -# +# Created by: Max Brazhnikov # $FreeBSD$ -# PORTNAME= libjreen -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= net-im -MASTER_SITES= http://qutim.org/downloads/ MAINTAINER= akuz84@gmail.com COMMENT= Qt4 based jabber library LICENSE= GPLv2 -LIB_DEPENDS= qca.2:${PORTSDIR}/devel/qca \ - speex.1:${PORTSDIR}/audio/speex +LIB_DEPENDS= qca:${PORTSDIR}/devel/qca \ + speex:${PORTSDIR}/audio/speex + +GH_ACCOUNT= euroelessar +GH_COMMIT= 388621f +GH_PROJECT= jreen +GH_TAGNAME= v${PORTVERSION} -USE_BZIP2= yes -USE_QT4= network moc_build qmake_build rcc_build uic_build -USES= cmake -USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes LDFLAGS+= -L${LOCALBASE}/lib +MAKE_JOBS_SAFE= yes + +USE_GITHUB= yes +USE_LDCONFIG= yes +USE_QT4= moc_build qmake_build rcc_build network + +USES= cmake pkgconfig:build + pre-configure: ${REINPLACE_CMD} -e 's,lib.*/pkgconfig,libdata/pkgconfig,' \ ${WRKSRC}/CMakeLists.txt diff --git a/net-im/libjreen/distinfo b/net-im/libjreen/distinfo index 014c2fa59bea..20e804e22763 100644 --- a/net-im/libjreen/distinfo +++ b/net-im/libjreen/distinfo @@ -1,2 +1,2 @@ -SHA256 (libjreen-1.1.0.tar.bz2) = 2f9e94ee51d1e76cb8cfe00114a3246b3f46432fb7bb35b73767027a7ebe1ec6 -SIZE (libjreen-1.1.0.tar.bz2) = 223095 +SHA256 (libjreen-1.1.1.tar.gz) = 7ecd2e4960caa47ca0632efbe234b3623865a7dd128040aaa448dd0747b5e439 +SIZE (libjreen-1.1.1.tar.gz) = 292173 diff --git a/net-im/libjreen/pkg-descr b/net-im/libjreen/pkg-descr index fdcff8a27be8..376e99e9ebd0 100644 --- a/net-im/libjreen/pkg-descr +++ b/net-im/libjreen/pkg-descr @@ -1,3 +1,3 @@ Qt4 based jabber library from qutim.org project. -WWW: http://qutim.org/jreen +WWW: http://qutim.org/jreen diff --git a/net-im/libjreen/pkg-plist b/net-im/libjreen/pkg-plist index 51d6dd7d807a..c92b5d5ddd67 100644 --- a/net-im/libjreen/pkg-plist +++ b/net-im/libjreen/pkg-plist @@ -1,5 +1,6 @@ include/jreen/abstractroster.h include/jreen/activity.h +include/jreen/attention.h include/jreen/bitsofbinary.h include/jreen/bookmark.h include/jreen/bookmarkstorage.h @@ -17,6 +18,13 @@ include/jreen/directconnection.h include/jreen/disco.h include/jreen/entitytime.h include/jreen/error.h +include/jreen/experimental/iristransport.h +include/jreen/experimental/jingleaudiocontent.h +include/jreen/experimental/jingleaudiopayload.h +include/jreen/experimental/jinglecontent.h +include/jreen/experimental/jinglemanager.h +include/jreen/experimental/jinglesession.h +include/jreen/experimental/jingletransport.h include/jreen/forwarded.h include/jreen/iq.h include/jreen/iqreply.h @@ -56,6 +64,7 @@ include/jreen/vcardmanager.h include/jreen/vcardupdate.h lib/libjreen.so lib/libjreen.so.1 -lib/libjreen.so.1.1.0 +lib/libjreen.so.1.1.1 libdata/pkgconfig/libjreen.pc +@dirrm include/jreen/experimental @dirrm include/jreen