From owner-svn-ports-head@FreeBSD.ORG Mon Jan 6 16:21:06 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F8CFC12; Mon, 6 Jan 2014 16:21:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 01F3C1247; Mon, 6 Jan 2014 16:21:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06GL530032579; Mon, 6 Jan 2014 16:21:05 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06GL5LN032578; Mon, 6 Jan 2014 16:21:05 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201401061621.s06GL5LN032578@svn.freebsd.org> From: Max Brazhnikov Date: Mon, 6 Jan 2014 16:21:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338905 - head/devel/qtcreator X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jan 2014 16:21:06 -0000 Author: makc Date: Mon Jan 6 16:21:05 2014 New Revision: 338905 URL: http://svnweb.freebsd.org/changeset/ports/338905 Log: merge from area51 repo: - Convert to new LIB_DEPENDS syntax - Simplify by using out-of-source build provided by USES=qmake - Add explicit dependencies on Qt4 corelib and testlib Modified: head/devel/qtcreator/Makefile Modified: head/devel/qtcreator/Makefile ============================================================================== --- head/devel/qtcreator/Makefile Mon Jan 6 16:18:18 2014 (r338904) +++ head/devel/qtcreator/Makefile Mon Jan 6 16:21:05 2014 (r338905) @@ -17,16 +17,16 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= C++ and QML IDE for Qt development -LIB_DEPENDS= Imath:${PORTSDIR}/graphics/ilmbase \ - IlmImf:${PORTSDIR}/graphics/OpenEXR \ - jasper:${PORTSDIR}/graphics/jasper \ - jpeg:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= libImath.so:${PORTSDIR}/graphics/ilmbase \ + libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ + libjasper.so:${PORTSDIR}/graphics/jasper \ + libjpeg.so:${PORTSDIR}/graphics/jpeg -USES= qmake USE_QT4= moc_build rcc_build uic_build \ linguist_build assistant_run qt3support \ dbus designer gui help-tools_build network script \ - sql svg xml webkit qdoc3_build + corelib sql svg testlib xml webkit qdoc3_build +USES= qmake:outsource MAKE_JOBS_UNSAFE= yes ALL_TARGET= all docs INSTALL_TARGET= install install_docs @@ -34,7 +34,6 @@ MAKE_ENV= XDG_CONFIG_HOME=/dev/null USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} QMAKE_ARGS= CONFIG+="configure" QTC_PREFIX=${PREFIX} -QMAKE_SOURCE_PATH= ${WRKSRC} # Build Qt Quick Designer (requires update on every Qt update). QT_DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} @@ -45,12 +44,8 @@ EXTRACT_AFTER_ARGS+= --exclude '${QT_DIS .endfor QMAKE_ARGS+= QT_PRIVATE_HEADERS="${WRKDIR}/${QT_DISTNAME}/include" -CONFIGURE_WRKSRC= ${WRKDIR}/build -BUILD_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} - -DESKTOP_ENTRIES= "Qt Creator" "${COMMENT}" "QtProject-qtcreator" \ - "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true +DESKTOP_ENTRIES="Qt Creator" "" "QtProject-qtcreator" \ + "${PREFIX}/bin/${PORTNAME}" "Development;Qt;" true post-patch: ${REINPLACE_CMD} -e 's|lrelease|lrelease-qt4|' \ @@ -61,10 +56,6 @@ post-patch: ${WRKSRC}/share/qtcreator/dumper/gbridge.py ${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/ant|' \ ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp - ${RM} ${WRKSRC}/share/qtcreator/dumper/gbridge.py.bak -pre-configure: - ${MKDIR} ${CONFIGURE_WRKSRC} - .include