svn commit: r338905 - head/devel/qtcreator
Max Brazhnikov
makc at FreeBSD.org
Mon Jan 6 16:21:06 UTC 2014
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 at 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 <bsd.port.mk>
More information about the svn-ports-all
mailing list