- Utilize USE_QT4 instead of oldskool USE_QT_VER/QT_COMPONENTS

- Sort pkg-plist [1]

Also noticed by:	makc [1]
Pointy hat to:		yours truly

2 files changed, 59 insertions, 60 deletions

diff --git a/net-im/qxmpp-leechcraft/Makefile b/net-im/qxmpp-leechcraft/Makefile
index 7544e0c67d46..cbe3b22d3373 100644
--- a/net-im/qxmpp-leechcraft/Makefile
+++ b/net-im/qxmpp-leechcraft/Makefile
@@ -20,8 +20,7 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	speex:${PORTSDIR}/audio/speex
 
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	gui moc_build network qmake_build rcc_build uic_build xml
+USE_QT4=	gui moc_build network qmake_build rcc_build uic_build xml
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/net-im/qxmpp-leechcraft/pkg-plist b/net-im/qxmpp-leechcraft/pkg-plist
index 834acee0c479..77a6b554d0b5 100644
--- a/net-im/qxmpp-leechcraft/pkg-plist
+++ b/net-im/qxmpp-leechcraft/pkg-plist
@@ -1,75 +1,75 @@
-lib/libqxmpp-lc.a
+include/qxmpp-lc/QXmppActivityItem.h
+include/qxmpp-lc/QXmppAnnotationsIq.h
+include/qxmpp-lc/QXmppAnnotationsManager.h
+include/qxmpp-lc/QXmppArchiveIq.h
 include/qxmpp-lc/QXmppArchiveManager.h
-include/qxmpp-lc/QXmppCallManager.h
-include/qxmpp-lc/QXmppVersionIq.h
-include/qxmpp-lc/QXmppStreamFeatures.h
-include/qxmpp-lc/QXmppEntityTimeManager.h
-include/qxmpp-lc/QXmppRpcIq.h
-include/qxmpp-lc/QXmppDeliveryReceiptsManager.h
-include/qxmpp-lc/QXmppBobIq.h
-include/qxmpp-lc/QXmppNonSASLAuth.h
-include/qxmpp-lc/QXmppTransferManager.h
-include/qxmpp-lc/QXmppSocks.h
-include/qxmpp-lc/QXmppStreamInitiationIq.h
-include/qxmpp-lc/QXmppOutgoingServer.h
-include/qxmpp-lc/QXmppDialback.h
 include/qxmpp-lc/QXmppBindIq.h
-include/qxmpp-lc/QXmppRosterIq.h
-include/qxmpp-lc/QXmppGlobal.h
-include/qxmpp-lc/QXmppJingleIq.h
-include/qxmpp-lc/QXmppCaptchaIq.h
+include/qxmpp-lc/QXmppBobIq.h
+include/qxmpp-lc/QXmppBobManager.h
+include/qxmpp-lc/QXmppBookmarkManager.h
+include/qxmpp-lc/QXmppBookmarkSet.h
 include/qxmpp-lc/QXmppByteStreamIq.h
-include/qxmpp-lc/QXmppSessionIq.h
-include/qxmpp-lc/QXmppDataForm.h
+include/qxmpp-lc/QXmppCallManager.h
+include/qxmpp-lc/QXmppCaptchaIq.h
 include/qxmpp-lc/QXmppCaptchaManager.h
-include/qxmpp-lc/QXmppBookmarkManager.h
-include/qxmpp-lc/QXmppAnnotationsManager.h
-include/qxmpp-lc/QXmppPingIq.h
-include/qxmpp-lc/QXmppEntityTimeIq.h
-include/qxmpp-lc/QXmppVCardManager.h
-include/qxmpp-lc/QXmppReconnectionManager.h
+include/qxmpp-lc/QXmppClient.h
+include/qxmpp-lc/QXmppClientExtension.h
+include/qxmpp-lc/QXmppCodec.h
+include/qxmpp-lc/QXmppConfiguration.h
 include/qxmpp-lc/QXmppConstants.h
-include/qxmpp-lc/QXmppStun.h
+include/qxmpp-lc/QXmppDataForm.h
+include/qxmpp-lc/QXmppDeliveryReceiptsManager.h
+include/qxmpp-lc/QXmppDialback.h
+include/qxmpp-lc/QXmppDiscoveryIq.h
+include/qxmpp-lc/QXmppDiscoveryManager.h
+include/qxmpp-lc/QXmppElement.h
+include/qxmpp-lc/QXmppEntityTimeIq.h
+include/qxmpp-lc/QXmppEntityTimeManager.h
+include/qxmpp-lc/QXmppGlobal.h
+include/qxmpp-lc/QXmppIbbIq.h
 include/qxmpp-lc/QXmppIncomingClient.h
-include/qxmpp-lc/QXmppServer.h
-include/qxmpp-lc/QXmppRtpChannel.h
+include/qxmpp-lc/QXmppIncomingServer.h
+include/qxmpp-lc/QXmppInvokable.h
 include/qxmpp-lc/QXmppIq.h
-include/qxmpp-lc/QXmppRosterManager.h
-include/qxmpp-lc/QXmppUtils.h
-include/qxmpp-lc/QXmppElement.h
+include/qxmpp-lc/QXmppJingleIq.h
+include/qxmpp-lc/QXmppLogger.h
+include/qxmpp-lc/QXmppMessage.h
 include/qxmpp-lc/QXmppMucIq.h
+include/qxmpp-lc/QXmppMucManager.h
+include/qxmpp-lc/QXmppNonSASLAuth.h
+include/qxmpp-lc/QXmppOutgoingClient.h
+include/qxmpp-lc/QXmppOutgoingServer.h
+include/qxmpp-lc/QXmppPacket.h
+include/qxmpp-lc/QXmppPasswordChecker.h
+include/qxmpp-lc/QXmppPingIq.h
+include/qxmpp-lc/QXmppPresence.h
 include/qxmpp-lc/QXmppPubSubIq.h
-include/qxmpp-lc/QXmppInvokable.h
-include/qxmpp-lc/QXmppServerExtension.h
-include/qxmpp-lc/QXmppIncomingServer.h
-include/qxmpp-lc/QXmppIbbIq.h
-include/qxmpp-lc/QXmppStanza.h
-include/qxmpp-lc/QXmppClient.h
+include/qxmpp-lc/QXmppPubSubManager.h
+include/qxmpp-lc/QXmppReconnectionManager.h
 include/qxmpp-lc/QXmppRemoteMethod.h
-include/qxmpp-lc/QXmppPresence.h
-include/qxmpp-lc/QXmppVersionManager.h
-include/qxmpp-lc/QXmppActivityItem.h
+include/qxmpp-lc/QXmppRosterIq.h
+include/qxmpp-lc/QXmppRosterManager.h
+include/qxmpp-lc/QXmppRpcIq.h
 include/qxmpp-lc/QXmppRpcManager.h
-include/qxmpp-lc/QXmppConfiguration.h
-include/qxmpp-lc/QXmppVCardIq.h
-include/qxmpp-lc/QXmppDiscoveryIq.h
-include/qxmpp-lc/QXmppCodec.h
+include/qxmpp-lc/QXmppRtpChannel.h
 include/qxmpp-lc/QXmppSaslAuth.h
-include/qxmpp-lc/QXmppMessage.h
-include/qxmpp-lc/QXmppArchiveIq.h
-include/qxmpp-lc/QXmppAnnotationsIq.h
-include/qxmpp-lc/QXmppPasswordChecker.h
+include/qxmpp-lc/QXmppServer.h
+include/qxmpp-lc/QXmppServerExtension.h
 include/qxmpp-lc/QXmppServerPlugin.h
+include/qxmpp-lc/QXmppSessionIq.h
+include/qxmpp-lc/QXmppSocks.h
 include/qxmpp-lc/QXmppSrvInfo.h
-include/qxmpp-lc/QXmppLogger.h
-include/qxmpp-lc/QXmppBookmarkSet.h
-include/qxmpp-lc/QXmppClientExtension.h
-include/qxmpp-lc/QXmppBobManager.h
-include/qxmpp-lc/QXmppDiscoveryManager.h
-include/qxmpp-lc/QXmppPubSubManager.h
+include/qxmpp-lc/QXmppStanza.h
 include/qxmpp-lc/QXmppStream.h
-include/qxmpp-lc/QXmppPacket.h
-include/qxmpp-lc/QXmppOutgoingClient.h
-include/qxmpp-lc/QXmppMucManager.h
+include/qxmpp-lc/QXmppStreamFeatures.h
+include/qxmpp-lc/QXmppStreamInitiationIq.h
+include/qxmpp-lc/QXmppStun.h
+include/qxmpp-lc/QXmppTransferManager.h
+include/qxmpp-lc/QXmppUtils.h
+include/qxmpp-lc/QXmppVCardIq.h
+include/qxmpp-lc/QXmppVCardManager.h
+include/qxmpp-lc/QXmppVersionIq.h
+include/qxmpp-lc/QXmppVersionManager.h
+lib/libqxmpp-lc.a
 libdata/pkgconfig/qxmpp-lc.pc
 @dirrm include/qxmpp-lc