- Update to 0.3.14.

Approved by:	tabthorpe (mentor)

3 files changed, 64 insertions, 20 deletions

diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index 0d712a6cfdf4..4ec330a13a32 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	telepathy-qt4
-PORTVERSION=	0.3.7
+PORTVERSION=	0.3.14
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -25,13 +25,12 @@ USE_QT_VER=	4
 QT_COMPONENTS=	corelib dbus network xml qtestlib_build \
 		moc_build qmake_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_CMAKE=	yes
 USE_LDCONFIG=	yes
 
-PORTDOCS=	AUTHORS ChangeLog INSTALL NEWS README html
+PORTDOCS=	AUTHORS ChangeLog HACKING NEWS README html
 
-PORTEXAMPLES=	Makefile accounts call extensions \
+PORTEXAMPLES=	Makefile accounts extensions \
 		file-transfer protocols roster
 
 .include <bsd.port.pre.mk>
@@ -41,8 +40,10 @@ BROKEN=		does not build on 6.X
 .endif
 
 pre-configure:
-	${REINPLACE_CMD} -E -e 's:(^pkgconfigdir =).*:\1 ${PREFIX}/libdata/pkgconfig:' \
-		${WRKSRC}/TelepathyQt4/Makefile.in
+	${REINPLACE_CMD} -e '/TelepathyQt4.*\.pc/ s|pkgconfig|../libdata/pkgconfig|' \
+		${WRKSRC}/TelepathyQt4/CMakeLists.txt
+	${REINPLACE_CMD} -e '/$${LIBXML2_INCLUDE_DIR}/ s|$$| ${LOCALBASE}/include|' \
+		${WRKSRC}/TelepathyQt4/Farsight/CMakeLists.txt
 
 pre-install:
 .ifndef(NOPORTDOCS)
@@ -57,8 +58,6 @@ post-install:
 .endfor
 .endif
 .ifndef(NOPORTEXAMPLES)
-	${RM} -r ${WRKSRC}/examples/*/.deps
-	${RM} -r ${WRKSRC}/examples/*/.libs
 	${MKDIR} ${EXAMPLESDIR}
 .for f in ${PORTEXAMPLES}
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} ${f} ${EXAMPLESDIR}
diff --git a/net-im/telepathy-qt4/distinfo b/net-im/telepathy-qt4/distinfo
index f292b4ba9027..49808b9866c2 100644
--- a/net-im/telepathy-qt4/distinfo
+++ b/net-im/telepathy-qt4/distinfo
@@ -1,3 +1,2 @@
-MD5 (telepathy-qt4-0.3.7.tar.gz) = 7c446f7f2777cb8b88d49f92a1af0599
-SHA256 (telepathy-qt4-0.3.7.tar.gz) = 8836fa0884d46bbc074785e6c5a785def204d4a15541015bb020b9d19636966b
-SIZE (telepathy-qt4-0.3.7.tar.gz) = 2427260
+SHA256 (telepathy-qt4-0.3.14.tar.gz) = 79aee942a07191d45a21f280d213acc42ba2b85a392c107a05b2bbd3cbffc806
+SIZE (telepathy-qt4-0.3.14.tar.gz) = 1893325
diff --git a/net-im/telepathy-qt4/pkg-plist b/net-im/telepathy-qt4/pkg-plist
index de926c7728c1..7329f8e1bd6b 100644
--- a/net-im/telepathy-qt4/pkg-plist
+++ b/net-im/telepathy-qt4/pkg-plist
@@ -4,16 +4,22 @@ include/telepathy-1.0/TelepathyQt4/AbstractClientHandler
 include/telepathy-1.0/TelepathyQt4/AbstractClientObserver
 include/telepathy-1.0/TelepathyQt4/AbstractInterface
 include/telepathy-1.0/TelepathyQt4/Account
+include/telepathy-1.0/TelepathyQt4/AccountCapabilityFilter
+include/telepathy-1.0/TelepathyQt4/AccountFactory
 include/telepathy-1.0/TelepathyQt4/AccountInterface
 include/telepathy-1.0/TelepathyQt4/AccountManager
 include/telepathy-1.0/TelepathyQt4/AccountManagerInterface
+include/telepathy-1.0/TelepathyQt4/AccountPropertyFilter
 include/telepathy-1.0/TelepathyQt4/AccountSet
 include/telepathy-1.0/TelepathyQt4/CapabilitiesBase
 include/telepathy-1.0/TelepathyQt4/Channel
+include/telepathy-1.0/TelepathyQt4/ChannelClassSpec
+include/telepathy-1.0/TelepathyQt4/ChannelClassSpecList
 include/telepathy-1.0/TelepathyQt4/ChannelDispatchOperation
 include/telepathy-1.0/TelepathyQt4/ChannelDispatchOperationInterface
 include/telepathy-1.0/TelepathyQt4/ChannelDispatcher
 include/telepathy-1.0/TelepathyQt4/ChannelDispatcherInterface
+include/telepathy-1.0/TelepathyQt4/ChannelFactory
 include/telepathy-1.0/TelepathyQt4/ChannelInterface
 include/telepathy-1.0/TelepathyQt4/ChannelInterfaceCallStateInterface
 include/telepathy-1.0/TelepathyQt4/ChannelInterfaceChatStateInterface
@@ -25,7 +31,9 @@ include/telepathy-1.0/TelepathyQt4/ChannelInterfacePasswordInterface
 include/telepathy-1.0/TelepathyQt4/ChannelRequest
 include/telepathy-1.0/TelepathyQt4/ChannelRequestInterface
 include/telepathy-1.0/TelepathyQt4/ChannelTypeContactListInterface
+include/telepathy-1.0/TelepathyQt4/ChannelTypeContactSearchInterface
 include/telepathy-1.0/TelepathyQt4/ChannelTypeRoomListInterface
+include/telepathy-1.0/TelepathyQt4/ChannelTypeServerTLSConnectionInterface
 include/telepathy-1.0/TelepathyQt4/ChannelTypeStreamTubeInterface
 include/telepathy-1.0/TelepathyQt4/ChannelTypeStreamedMediaInterface
 include/telepathy-1.0/TelepathyQt4/ChannelTypeTextInterface
@@ -40,6 +48,7 @@ include/telepathy-1.0/TelepathyQt4/ClientObserverInterface
 include/telepathy-1.0/TelepathyQt4/ClientRegistrar
 include/telepathy-1.0/TelepathyQt4/Connection
 include/telepathy-1.0/TelepathyQt4/ConnectionCapabilities
+include/telepathy-1.0/TelepathyQt4/ConnectionFactory
 include/telepathy-1.0/TelepathyQt4/ConnectionInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceAliasingInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceAnonymityInterface
@@ -47,10 +56,14 @@ include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceAvatarsInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceBalanceInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceCapabilitiesInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceCellularInterface
+include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceClientTypes
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceContactCapabilitiesInterface
+include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceContactGroups
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceContactInfoInterface
+include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceContactList
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceContactsInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceLocationInterface
+include/telepathy-1.0/TelepathyQt4/ConnectionInterfacePowerSaving
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfacePresenceInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceRequestsInterface
 include/telepathy-1.0/TelepathyQt4/ConnectionInterfaceServicePointInterface
@@ -60,11 +73,14 @@ include/telepathy-1.0/TelepathyQt4/ConnectionManagerInterface
 include/telepathy-1.0/TelepathyQt4/Constants
 include/telepathy-1.0/TelepathyQt4/Contact
 include/telepathy-1.0/TelepathyQt4/ContactCapabilities
+include/telepathy-1.0/TelepathyQt4/ContactFactory
 include/telepathy-1.0/TelepathyQt4/ContactLocation
 include/telepathy-1.0/TelepathyQt4/ContactManager
+include/telepathy-1.0/TelepathyQt4/ContactSearchChannel
 include/telepathy-1.0/TelepathyQt4/DBus
 include/telepathy-1.0/TelepathyQt4/DBusDaemonInterface
 include/telepathy-1.0/TelepathyQt4/DBusProxy
+include/telepathy-1.0/TelepathyQt4/DBusProxyFactory
 include/telepathy-1.0/TelepathyQt4/Debug
 include/telepathy-1.0/TelepathyQt4/Farsight/Channel
 include/telepathy-1.0/TelepathyQt4/Farsight/channel.h
@@ -72,6 +88,10 @@ include/telepathy-1.0/TelepathyQt4/Farsight/global.h
 include/telepathy-1.0/TelepathyQt4/Feature
 include/telepathy-1.0/TelepathyQt4/FileTransferChannel
 include/telepathy-1.0/TelepathyQt4/FileTransferChannelCreationProperties
+include/telepathy-1.0/TelepathyQt4/Filter
+include/telepathy-1.0/TelepathyQt4/FixedFeatureFactory
+include/telepathy-1.0/TelepathyQt4/GenericCapabilityFilter
+include/telepathy-1.0/TelepathyQt4/GenericPropertyFilter
 include/telepathy-1.0/TelepathyQt4/Global
 include/telepathy-1.0/TelepathyQt4/IncomingFileTransferChannel
 include/telepathy-1.0/TelepathyQt4/IntrospectableInterface
@@ -101,16 +121,23 @@ include/telepathy-1.0/TelepathyQt4/PendingReady
 include/telepathy-1.0/TelepathyQt4/PendingStringList
 include/telepathy-1.0/TelepathyQt4/PendingSuccess
 include/telepathy-1.0/TelepathyQt4/PendingVariant
+include/telepathy-1.0/TelepathyQt4/PendingVariantMap
 include/telepathy-1.0/TelepathyQt4/PendingVoid
+include/telepathy-1.0/TelepathyQt4/Presence
+include/telepathy-1.0/TelepathyQt4/Profile
+include/telepathy-1.0/TelepathyQt4/ProfileManager
 include/telepathy-1.0/TelepathyQt4/Properties
 include/telepathy-1.0/TelepathyQt4/PropertiesInterface
 include/telepathy-1.0/TelepathyQt4/PropertiesInterfaceInterface
+include/telepathy-1.0/TelepathyQt4/ProtocolInfo
+include/telepathy-1.0/TelepathyQt4/ProtocolParameter
 include/telepathy-1.0/TelepathyQt4/ReadinessHelper
 include/telepathy-1.0/TelepathyQt4/ReadyObject
 include/telepathy-1.0/TelepathyQt4/ReceivedMessage
 include/telepathy-1.0/TelepathyQt4/RefCounted
 include/telepathy-1.0/TelepathyQt4/ReferencedHandles
 include/telepathy-1.0/TelepathyQt4/ReferencedHandlesIterator
+include/telepathy-1.0/TelepathyQt4/RequestableChannelClassSpec
 include/telepathy-1.0/TelepathyQt4/RoomListChannel
 include/telepathy-1.0/TelepathyQt4/SharedPtr
 include/telepathy-1.0/TelepathyQt4/StatefulDBusProxy
@@ -118,6 +145,7 @@ include/telepathy-1.0/TelepathyQt4/StatelessDBusProxy
 include/telepathy-1.0/TelepathyQt4/StreamedMediaChannel
 include/telepathy-1.0/TelepathyQt4/TextChannel
 include/telepathy-1.0/TelepathyQt4/Types
+include/telepathy-1.0/TelepathyQt4/Utils
 include/telepathy-1.0/TelepathyQt4/WeakPtr
 include/telepathy-1.0/TelepathyQt4/_gen/cli-account-manager.h
 include/telepathy-1.0/TelepathyQt4/_gen/cli-account.h
@@ -133,34 +161,49 @@ include/telepathy-1.0/TelepathyQt4/_gen/cli-media-session-handler.h
 include/telepathy-1.0/TelepathyQt4/_gen/cli-media-stream-handler.h
 include/telepathy-1.0/TelepathyQt4/_gen/cli-properties.h
 include/telepathy-1.0/TelepathyQt4/_gen/constants.h
+include/telepathy-1.0/TelepathyQt4/_gen/future-channel.h
+include/telepathy-1.0/TelepathyQt4/_gen/future-constants.h
+include/telepathy-1.0/TelepathyQt4/_gen/future-misc.h
+include/telepathy-1.0/TelepathyQt4/_gen/future-types.h
 include/telepathy-1.0/TelepathyQt4/_gen/types.h
 include/telepathy-1.0/TelepathyQt4/abstract-client.h
 include/telepathy-1.0/TelepathyQt4/abstract-interface.h
+include/telepathy-1.0/TelepathyQt4/account-factory.h
 include/telepathy-1.0/TelepathyQt4/account-manager.h
+include/telepathy-1.0/TelepathyQt4/account-property-filter.h
 include/telepathy-1.0/TelepathyQt4/account-set.h
 include/telepathy-1.0/TelepathyQt4/account.h
 include/telepathy-1.0/TelepathyQt4/capabilities-base.h
+include/telepathy-1.0/TelepathyQt4/channel-class-spec.h
 include/telepathy-1.0/TelepathyQt4/channel-dispatch-operation.h
 include/telepathy-1.0/TelepathyQt4/channel-dispatcher.h
+include/telepathy-1.0/TelepathyQt4/channel-factory.h
 include/telepathy-1.0/TelepathyQt4/channel-request.h
 include/telepathy-1.0/TelepathyQt4/channel.h
 include/telepathy-1.0/TelepathyQt4/client-registrar.h
 include/telepathy-1.0/TelepathyQt4/client.h
 include/telepathy-1.0/TelepathyQt4/connection-capabilities.h
+include/telepathy-1.0/TelepathyQt4/connection-factory.h
 include/telepathy-1.0/TelepathyQt4/connection-manager.h
 include/telepathy-1.0/TelepathyQt4/connection.h
 include/telepathy-1.0/TelepathyQt4/constants.h
 include/telepathy-1.0/TelepathyQt4/contact-capabilities.h
+include/telepathy-1.0/TelepathyQt4/contact-factory.h
 include/telepathy-1.0/TelepathyQt4/contact-location.h
-include/telepathy-1.0/TelepathyQt4/contact-manager-internal.h
 include/telepathy-1.0/TelepathyQt4/contact-manager.h
+include/telepathy-1.0/TelepathyQt4/contact-search-channel.h
 include/telepathy-1.0/TelepathyQt4/contact.h
+include/telepathy-1.0/TelepathyQt4/dbus-proxy-factory.h
 include/telepathy-1.0/TelepathyQt4/dbus-proxy.h
 include/telepathy-1.0/TelepathyQt4/dbus.h
 include/telepathy-1.0/TelepathyQt4/debug.h
 include/telepathy-1.0/TelepathyQt4/feature.h
 include/telepathy-1.0/TelepathyQt4/file-transfer-channel-creation-properties.h
 include/telepathy-1.0/TelepathyQt4/file-transfer-channel.h
+include/telepathy-1.0/TelepathyQt4/filter.h
+include/telepathy-1.0/TelepathyQt4/fixed-feature-factory.h
+include/telepathy-1.0/TelepathyQt4/generic-capability-filter.h
+include/telepathy-1.0/TelepathyQt4/generic-property-filter.h
 include/telepathy-1.0/TelepathyQt4/global.h
 include/telepathy-1.0/TelepathyQt4/incoming-file-transfer-channel.h
 include/telepathy-1.0/TelepathyQt4/key-file.h
@@ -182,26 +225,29 @@ include/telepathy-1.0/TelepathyQt4/pending-handles.h
 include/telepathy-1.0/TelepathyQt4/pending-operation.h
 include/telepathy-1.0/TelepathyQt4/pending-ready.h
 include/telepathy-1.0/TelepathyQt4/pending-string-list.h
+include/telepathy-1.0/TelepathyQt4/pending-variant-map.h
 include/telepathy-1.0/TelepathyQt4/pending-variant.h
+include/telepathy-1.0/TelepathyQt4/presence.h
+include/telepathy-1.0/TelepathyQt4/profile-manager.h
+include/telepathy-1.0/TelepathyQt4/profile.h
 include/telepathy-1.0/TelepathyQt4/properties.h
 include/telepathy-1.0/TelepathyQt4/readiness-helper.h
 include/telepathy-1.0/TelepathyQt4/ready-object.h
 include/telepathy-1.0/TelepathyQt4/referenced-handles.h
+include/telepathy-1.0/TelepathyQt4/requestable-channel-class-spec.h
 include/telepathy-1.0/TelepathyQt4/room-list-channel.h
 include/telepathy-1.0/TelepathyQt4/shared-ptr.h
 include/telepathy-1.0/TelepathyQt4/simple-pending-operations.h
-include/telepathy-1.0/TelepathyQt4/streamed-media-channel-internal.h
 include/telepathy-1.0/TelepathyQt4/streamed-media-channel.h
 include/telepathy-1.0/TelepathyQt4/text-channel.h
 include/telepathy-1.0/TelepathyQt4/types.h
-lib/libtelepathy-qt4-farsight.a
-lib/libtelepathy-qt4-farsight.la
+include/telepathy-1.0/TelepathyQt4/utils.h
 lib/libtelepathy-qt4-farsight.so
-lib/libtelepathy-qt4-farsight.so.8
-lib/libtelepathy-qt4.a
-lib/libtelepathy-qt4.la
+lib/libtelepathy-qt4-farsight.so.0
+lib/libtelepathy-qt4-farsight.so.0.99.0.3.14
 lib/libtelepathy-qt4.so
-lib/libtelepathy-qt4.so.8
+lib/libtelepathy-qt4.so.0
+lib/libtelepathy-qt4.so.0.99.0.3.14
 libdata/pkgconfig/TelepathyQt4.pc
 libdata/pkgconfig/TelepathyQt4Farsight.pc
 @dirrm include/telepathy-1.0/TelepathyQt4/_gen