diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-11-23 19:41:23 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-11-23 19:41:23 +0000 |
| commit | 8a4b4d3906b5f379a37e92eb6670e573dad7d390 (patch) | |
| tree | 728d7d785662b71b1cbbdc300bbcf57ee4575083 | |
| parent | 5381a161b0d75ba37dc9bc824e38163027b665f5 (diff) | |
| download | ports-8a4b4d3906b5f379a37e92eb6670e573dad7d390.tar.gz ports-8a4b4d3906b5f379a37e92eb6670e573dad7d390.zip | |
- Switch dependency from net-im/ortp to net-im/linphone-base.
- Bump PORTREVISION.
- Add instructions to UPDATING.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=286325
| -rw-r--r-- | UPDATING | 10 | ||||
| -rw-r--r-- | net-im/kopete/Makefile | 4 | ||||
| -rw-r--r-- | net-im/libjingle/Makefile | 3 |
3 files changed, 14 insertions, 3 deletions
@@ -6,6 +6,16 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. 20111123: + AFFECTS: users of net-im/kopete or net-im/libjingle + AUTHOR: kde@FreeBSD.org + + kopete and libjingle are now depending on a newer oRTP from + linphone-base. To correctly switch to the new port, you need to deinstall + ortp prior to the update: + + # pkg_delete -f ortp-\* + +20111123: AFFECTS: users of databases/redis AUTHOR: osa@FreeBSD.org diff --git a/net-im/kopete/Makefile b/net-im/kopete/Makefile index 785e4fb183c9..53aadba1bf73 100644 --- a/net-im/kopete/Makefile +++ b/net-im/kopete/Makefile @@ -7,7 +7,7 @@ PORTNAME= kopete PORTVERSION= 0.12.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= net-im kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/3.5.10/src @@ -21,7 +21,7 @@ COMMENT= KDE multi-protocol instant messenger (IM) RUN_DEPENDS= ${QT_PREFIX}/lib/plugins/crypto/libqca-tls.so:${PORTSDIR}/security/qca-tls LIB_DEPENDS= speex:${PORTSDIR}/audio/speex \ ilbc:${PORTSDIR}/net/ilbc \ - ortp:${PORTSDIR}/net/ortp + ortp.8:${PORTSDIR}/net/linphone-base CONFLICTS= kvirc-[0-9]* diff --git a/net-im/libjingle/Makefile b/net-im/libjingle/Makefile index b0570f008996..7b28814f94b4 100644 --- a/net-im/libjingle/Makefile +++ b/net-im/libjingle/Makefile @@ -7,6 +7,7 @@ PORTNAME= libjingle PORTVERSION= 0.4.0 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= SF @@ -16,7 +17,7 @@ COMMENT= Google Talk's implementation of Jingle and Jingle-Audio BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= speex.1:${PORTSDIR}/audio/speex \ ilbc.0:${PORTSDIR}/net/ilbc \ - ortp.5:${PORTSDIR}/net/ortp \ + ortp.8:${PORTSDIR}/net/linphone-base \ expat.6:${PORTSDIR}/textproc/expat2 CONFLICTS= krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]* srp-[0-9]* \ |