Date: Mon, 5 Dec 2016 20:26:36 +0000 (UTC) From: Pawel Pekala <pawel@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r427921 - in head/net-im: . qxmpp qxmpp-qt5 Message-ID: <201612052026.uB5KQagW073240@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pawel Date: Mon Dec 5 20:26:36 2016 New Revision: 427921 URL: https://svnweb.freebsd.org/changeset/ports/427921 Log: Add qxmpp Qt5 slave port needed for polish/kadu update PR: 214547 Submitted by: myself Approved by: maintainer timeout Added: head/net-im/qxmpp-qt5/ head/net-im/qxmpp-qt5/Makefile (contents, props changed) Modified: head/net-im/Makefile head/net-im/qxmpp/Makefile head/net-im/qxmpp/pkg-plist Modified: head/net-im/Makefile ============================================================================== --- head/net-im/Makefile Mon Dec 5 20:23:19 2016 (r427920) +++ head/net-im/Makefile Mon Dec 5 20:26:36 2016 (r427921) @@ -148,6 +148,7 @@ SUBDIR += qwit SUBDIR += qwit-devel SUBDIR += qxmpp + SUBDIR += qxmpp-qt5 SUBDIR += ramblercontacts SUBDIR += ricochet SUBDIR += ring-daemon Added: head/net-im/qxmpp-qt5/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/qxmpp-qt5/Makefile Mon Dec 5 20:26:36 2016 (r427921) @@ -0,0 +1,10 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -qt5 + +CONFLICTS= qxmpp-[0-9]* + +QXMPP_SLAVE= yes +MASTERDIR= ${.CURDIR}/../../net-im/qxmpp + +.include "${MASTERDIR}/Makefile" Modified: head/net-im/qxmpp/Makefile ============================================================================== --- head/net-im/qxmpp/Makefile Mon Dec 5 20:23:19 2016 (r427920) +++ head/net-im/qxmpp/Makefile Mon Dec 5 20:26:36 2016 (r427921) @@ -12,15 +12,23 @@ COMMENT= QXmpp is an xmpp client library LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/LICENSE.LGPL +CONFLICTS?= ${PORTNAME}-qt5-[0-9]* + USES= qmake pathfix pkgconfig libtool -USE_QT4= gui network qtestlib xml uic_build moc_build \ +.if defined(QXMPP_SLAVE) +USE_QT5= core gui network xml buildtools_build +PLIST_SUB= QDNS="@comment " +.else +USE_QT4= corelib gui network qtestlib xml uic_build moc_build \ rcc_build +PLIST_SUB= QDNS="" +.endif QMAKE_ARGS= QXMPP_NO_TESTS=1 USE_GITHUB= yes GH_ACCOUNT= qxmpp-project -PLIST_SUB= VERSION=${PORTVERSION} VERSION_MAJOR=${PORTVERSION:R} +PLIST_SUB+= VERSION=${PORTVERSION} VERSION_MAJOR=${PORTVERSION:R} pre-configure: ${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|g' \ Modified: head/net-im/qxmpp/pkg-plist ============================================================================== --- head/net-im/qxmpp/pkg-plist Mon Dec 5 20:23:19 2016 (r427920) +++ head/net-im/qxmpp/pkg-plist Mon Dec 5 20:26:36 2016 (r427921) @@ -61,8 +61,8 @@ include/qxmpp/QXmppVCardIq.h include/qxmpp/QXmppVCardManager.h include/qxmpp/QXmppVersionIq.h include/qxmpp/QXmppVersionManager.h -include/qxmpp/qdnslookup.h -include/qxmpp/qdnslookup_p.h +%%QDNS%%include/qxmpp/qdnslookup.h +%%QDNS%%include/qxmpp/qdnslookup_p.h lib/libqxmpp.so lib/libqxmpp.so.0 lib/libqxmpp.so.%%VERSION_MAJOR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612052026.uB5KQagW073240>