- Switch dependency from net-im/ortp to net-im/linphone-base.

- Bump PORTREVISION.
- Add instructions to UPDATING.

Feature safe:	yes

UPDATING

@@ -5,6 +5,16 @@ they are unavoidable.
 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

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]*
 

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]* \